diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-05-18 16:56:22 -0700 |
|---|---|---|
| committer | Akshay Thakker <aksh@google.com> | 2016-05-23 20:01:51 +0000 |
| commit | 92d61dd68902178b5791762771606c4214f97d52 (patch) | |
| tree | e48328eec59552ca8cc5397f236c25efb775b8f9 /res | |
| parent | b431433dabd769d0e1688a49dad100b7b65ff66b (diff) | |
| download | android_packages_apps_PackageInstaller-92d61dd68902178b5791762771606c4214f97d52.tar.gz android_packages_apps_PackageInstaller-92d61dd68902178b5791762771606c4214f97d52.tar.bz2 android_packages_apps_PackageInstaller-92d61dd68902178b5791762771606c4214f97d52.zip | |
[DO NOT MERGE] Bring back overlay warning in permissions UI.
The package installer has a special event handling when
the user tries to interact with it and an overlay window
intersects the installer one. We show a warning that an
overlay was detected and point the user to settings. This
regressed and nothing happened when the users click the
allow button.
bug:28572707
bug:26677796
Change-Id: I617595e7cd5277576ccb9915946b77082a1c2b9e
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index fe6389fe..463f0ccd 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -91,14 +91,14 @@ android:text="@string/grant_dialog_button_deny" > </Button> - <com.android.packageinstaller.permission.ui.SecureButtonView + <Button android:id="@+id/permission_allow_button" android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" android:layout_marginStart="8dip" android:text="@string/grant_dialog_button_allow" > - </com.android.packageinstaller.permission.ui.SecureButtonView> + </Button> </LinearLayout> |