summaryrefslogtreecommitdiffstats
path: root/res/layout/grant_permissions.xml
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2016-05-18 23:56:22 (GMT)
committerZach Jang <zachjang@google.com>2016-05-25 22:17:33 (GMT)
commit16c392f4ba6156fef978d6630c952f60a2ade65e (patch)
treef71860c96436cee0533b75160ead7e24e2d6d163 /res/layout/grant_permissions.xml
parent2068c7997265011ddc5e4dfa3418407881f7f81e (diff)
downloadandroid_packages_apps_PackageInstaller-16c392f4ba6156fef978d6630c952f60a2ade65e.zip
android_packages_apps_PackageInstaller-16c392f4ba6156fef978d6630c952f60a2ade65e.tar.gz
android_packages_apps_PackageInstaller-16c392f4ba6156fef978d6630c952f60a2ade65e.tar.bz2
[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 Resolution to mnc-mr2-release when CP'ing ag/1065580
Diffstat (limited to 'res/layout/grant_permissions.xml')
-rw-r--r--res/layout/grant_permissions.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index ffbd276..0f324e5 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -80,15 +80,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonBarButtonStyle"
- android:text="@string/grant_dialog_button_deny" />
+ 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" />
+ android:text="@string/grant_dialog_button_allow" >
+ </Button>
</com.android.internal.widget.ButtonBarLayout>