summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:11:40 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:37:49 -0700
commit96f551c4ffbf3760f01621b4373ef284a559fef6 (patch)
treea5cf61c5dcbf5f2a6c1aa8f2b903cebe63c8d96c /res
parent97c5c800f8f658e7aae78f16abaa40a424f39453 (diff)
parent16c392f4ba6156fef978d6630c952f60a2ade65e (diff)
downloadandroid_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.tar.gz
android_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.tar.bz2
android_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.zip
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic775ddf31a2f5c391898e83bed469041849f8903
Diffstat (limited to 'res')
-rw-r--r--res/layout/grant_permissions.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index ab71e20c..5ad4ccff 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -91,13 +91,14 @@
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>
</LinearLayout>