From 16c392f4ba6156fef978d6630c952f60a2ade65e Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Wed, 18 May 2016 16:56:22 -0700
Subject: [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
---
 res/layout/grant_permissions.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'res/layout/grant_permissions.xml')

diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index ffbd276b..0f324e5c 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>
 
-- 
cgit v1.2.3