Merge "PackageInstaller: Initial focus in non-touch mode on Cancel" into rvc-dev am: aef65ab07b am: 50f74aa0f8 am: 5c03376780

Change-Id: I912eed7b30b83549f6c949b8b9eec929f3ebad04
2020-03-26 09:58:40 +00:00
parent 7db6fcb8fb 5c03376780
commit 41fb01a203
1 changed files with 4 additions and 0 deletions
--- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -406,6 +406,10 @@ public class PackageInstallerActivity extends AlertActivity {

        mOk = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
        mOk.setEnabled(false);
+
+        if (!mOk.isInTouchMode()) {
+            mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).requestFocus();
+        }
    }

    /**