diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:37:38 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:37:38 -0700 |
| commit | b277701816240ceb13425e38b515b790ffd2f864 (patch) | |
| tree | be7055a29b2dc239fde191a8e6d4d95159531851 /res | |
| parent | 9627774ae259215939e839f5e193a492d58ff7ee (diff) | |
| parent | 2068c7997265011ddc5e4dfa3418407881f7f81e (diff) | |
| download | android_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.tar.gz android_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.tar.bz2 android_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.zip | |
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46
Change-Id: Ie2b11a3416c1719374f06c8048b29f27ab8414a7
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index 463f0ccd..ab71e20c 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -91,14 +91,13 @@ android:text="@string/grant_dialog_button_deny" > </Button> - <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" > - </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:layout_marginStart="8dip" + android:text="@string/grant_dialog_button_allow" /> </LinearLayout> |