Release 200924

Merged PR 191: Release 200924
microsoft · Sep 25, 2020 · 3e419fc · 3e419fc
2 parents 1e06f27 + 683394b
commit 3e419fc
Show file tree

Hide file tree

Showing 128 changed files with 1,065 additions and 994 deletions.
diff --git a/CompanionPane/build.gradle b/CompanionPane/build.gradle
@@ -13,7 +13,7 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.microsoft.device.display.samples.complementarycontext"
+        applicationId "com.microsoft.device.display.samples.companionpane"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
@@ -27,15 +27,15 @@ dependencies {
     implementation kotlinDependencies.kotlinStdlib
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.constraintLayout
-    implementation androidxDependencies.recyclerView
-    implementation androidxDependencies.cardView
-    implementation androidxDependencies.viewPager2
     implementation androidxDependencies.ktxCore
     implementation androidxDependencies.ktxFragment
 
     implementation microsoftDependencies.dualScreenLayout
 
     testImplementation testDependencies.junit
+
     androidTestImplementation instrumentationTestDependencies.junit
     androidTestImplementation instrumentationTestDependencies.espressoCore
+    androidTestImplementation instrumentationTestDependencies.uiAutomator
+    androidTestImplementation instrumentationTestDependencies.testRules
 }
diff --git a/...roidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt b/...roidTest/java/com/microsoft/device/display/samples/companionpane/LayoutOrientationTest.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.microsoft.device.display.samples.companionpane
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import org.junit.After
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class LayoutOrientationTest {
+
+    private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+    @get:Rule
+    val activityRule = ActivityTestRule<MainActivity>(MainActivity::class.java)
+
+    @After
+    fun resetOrientation() {
+        device.setOrientationNatural()
+        device.unfreezeRotation()
+    }
+
+    @Test
+    fun shouldFindLayout_whenInSinglePortrait() {
+        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.single_screen_layout_port)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun shouldFindLayout_whenInSingleLandscape() {
+        rotateDevice()
+
+        onView(withId(R.id.single_screen_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.single_screen_layout_land)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun shouldFindLayouts_whenInDoublePortrait() {
+        spanApplication()
+
+        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.tools_dual_layout_land)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun shouldFindLayouts_whenInDoubleLandscape() {
+        spanApplication()
+        rotateDevice()
+
+        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.tools_dual_layout_port)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun shouldFindLayouts_whenSpanningInDoubleLandscape() {
+        rotateDevice()
+        spanLandscapeApplication()
+
+        onView(withId(R.id.dual_screen_start_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.picture_dual_layout)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.dual_screen_end_container_id)).check(matches(isDisplayed()))
+        onView(withId(R.id.tools_dual_layout_port)).check(matches(isDisplayed()))
+    }
+
+    private fun spanApplication() {
+        device.swipe(675, 1780, 1350, 900, 400)
+    }
+
+    private fun spanLandscapeApplication() {
+        device.swipe(1780, 2100, 1350, 1500, 400)
+    }
+
+    private fun rotateDevice() {
+        device.setOrientationLeft()
+    }
+}
diff --git a/...java/com/microsoft/device/display/samples/complementarycontext/ExampleInstrumentedTest.kt b/...java/com/microsoft/device/display/samples/complementarycontext/ExampleInstrumentedTest.kt
diff --git a/CompanionPane/src/main/AndroidManifest.xml b/CompanionPane/src/main/AndroidManifest.xml
@@ -6,19 +6,16 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.microsoft.device.display.samples.complementarycontext"
-    tools:ignore="GoogleAppIndexingWarning">
+    package="com.microsoft.device.display.samples.companionpane">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup">
-        <activity android:name=".MainActivity">
+        android:theme="@style/AppTheme">
+        <activity android:name="com.microsoft.device.display.samples.companionpane.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/...omplementarycontextlevel2/MainActivity.kt → ...lay/samples/companionpane/MainActivity.kt b/...omplementarycontextlevel2/MainActivity.kt → ...lay/samples/companionpane/MainActivity.kt
@@ -4,7 +4,7 @@
  *
  */
 
-package com.microsoft.device.display.samples.complementarycontextlevel2
+package com.microsoft.device.display.samples.companionpane
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

diff --git a/...e/src/main/java/com/microsoft/device/display/samples/complementarycontext/MainActivity.kt b/...e/src/main/java/com/microsoft/device/display/samples/complementarycontext/MainActivity.kt
diff --git a/...ain/java/com/microsoft/device/display/samples/complementarycontext/adapters/Comparator.kt b/...ain/java/com/microsoft/device/display/samples/complementarycontext/adapters/Comparator.kt
diff --git a/...n/java/com/microsoft/device/display/samples/complementarycontext/adapters/NotesAdapter.kt b/...n/java/com/microsoft/device/display/samples/complementarycontext/adapters/NotesAdapter.kt
diff --git a/.../java/com/microsoft/device/display/samples/complementarycontext/adapters/SlidesAdapter.kt b/.../java/com/microsoft/device/display/samples/complementarycontext/adapters/SlidesAdapter.kt