Merge "Fix LaunchAppShowImeAndDialogThemeAppTest flakiness"

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt

@@ -67,10 +67,9 @@ class ImeAppAutoFocusHelper @JvmOverloads constructor(
         val dialog = uiDevice.wait(
                 Until.findObject(By.text("Dialog for test")), FIND_TIMEOUT)
 
-        // Tapping outside of the dialog to dismiss
+        // Pressing back key to dismiss the dialog
         if (dialog != null) {
-            val dialogBounds = dialog.visibleBounds
-            uiDevice.click(dialogBounds.left, dialogBounds.top - 300)
+            uiDevice.pressBack()
             wmHelper.waitForAppTransitionIdle()
         }
     }

tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml

@@ -36,5 +36,6 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowSoftInputMode">stateUnchanged</item>
     </style>
 </resources>