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

Change-Id: I3e4a590eccd67f57f8cf3627e4179135ec6da2da
2020-03-26 09:42:01 +00:00
parent 8ade43a084 50f74aa0f8
commit 5c03376780
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();
+        }
    }

    /**