diff options
| author | Michael Wright <michaelwr@google.com> | 2016-03-22 15:17:35 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-04-21 19:27:39 -0700 |
| commit | 2068c7997265011ddc5e4dfa3418407881f7f81e (patch) | |
| tree | ddbcaf717c54b25306d374293b02635979f23f34 /res | |
| parent | 6986f29bb93a6aaaeaaddcab081d0e0afd7082e8 (diff) | |
| download | android_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.tar.gz android_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.tar.bz2 android_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.zip | |
DO NOT MERGE Take advantage of new MotionEvent flag to prevent tapjacking.
Bug: 26677796
Change-Id: I563541f0a42564b854af0f8037c1d4741c79a2ac
Fix merge conflict when cp'ing ag/903239 to mnc-mr1-release
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index b3565240..ffbd276b 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" > + <LinearLayout android:id="@+id/dialog_container" android:layout_width="fill_parent" @@ -81,7 +82,7 @@ style="?android:attr/buttonBarButtonStyle" android:text="@string/grant_dialog_button_deny" /> - <Button + <com.android.packageinstaller.permission.ui.SecureButtonView android:id="@+id/permission_allow_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -92,4 +93,5 @@ </com.android.internal.widget.ButtonBarLayout> </LinearLayout> + </com.android.packageinstaller.permission.ui.ManualLayoutFrame> |