diff options
| author | Michael Wright <michaelwr@google.com> | 2016-05-16 13:56:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-16 13:56:44 +0000 |
| commit | 968c3f1550613e71fa323389bf758880dffe9ad3 (patch) | |
| tree | 38a96262bec41cf8b9f06717518fb7bcc0e5156b /res | |
| parent | 94469b4ac624e457c6827ff7aa3142d06a92511c (diff) | |
| parent | 1be5a77aaa3bfba81063cbba38422dfe30c4ce40 (diff) | |
| download | android_packages_apps_PackageInstaller-968c3f1550613e71fa323389bf758880dffe9ad3.tar.gz android_packages_apps_PackageInstaller-968c3f1550613e71fa323389bf758880dffe9ad3.tar.bz2 android_packages_apps_PackageInstaller-968c3f1550613e71fa323389bf758880dffe9ad3.zip | |
Merge "Take advantage of new MotionEvent flag to prevent tapjacking." into nyc-dev
am: 1be5a77aaa
* commit '1be5a77aaa3bfba81063cbba38422dfe30c4ce40':
Take advantage of new MotionEvent flag to prevent tapjacking.
Change-Id: I416339e7bb12371480432699499871cf3c43bcab
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 dfbfb47f..19ec5a80 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -97,13 +97,13 @@ android:text="@string/grant_dialog_button_deny" > </Button> - <Button + <com.android.packageinstaller.permission.ui.SecureButtonView android:id="@+id/permission_allow_button" android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" android:text="@string/grant_dialog_button_allow" > - </Button> + </com.android.packageinstaller.permission.ui.SecureButtonView> </com.android.packageinstaller.permission.ui.ButtonBarLayout> |