summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-01 16:26:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-01 16:26:05 +0000
commit75caa566d9b0f99dc0e9ab1016e26701c4eac425 (patch)
treeee9d808525e7fac93d7bf547e8ddc8ca51a29d98
parent2941730e71d9453c7a609d3d389f83c021c3d999 (diff)
parent450de4e9d91fbba88ba109fde0c3aae0efd661e6 (diff)
downloadandroid_packages_apps_PackageInstaller-75caa566d9b0f99dc0e9ab1016e26701c4eac425.tar.gz
android_packages_apps_PackageInstaller-75caa566d9b0f99dc0e9ab1016e26701c4eac425.tar.bz2
android_packages_apps_PackageInstaller-75caa566d9b0f99dc0e9ab1016e26701c4eac425.zip
Merge "Allow dark theme in permission grant dialog"
-rw-r--r--res/layout/grant_permissions.xml2
-rw-r--r--res/layout/grant_permissions_content.xml2
-rw-r--r--res/values/themes.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index f2a041fd..69740373 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -44,7 +44,7 @@
<LinearLayout
android:layout_height="wrap_content"
android:orientation="vertical"
- android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.PermissionGrant"
+ android:theme="@*android:style/Theme.DeviceDefault.PermissionGrant"
style="@*android:style/PermissionGrantDialog">
<FrameLayout
diff --git a/res/layout/grant_permissions_content.xml b/res/layout/grant_permissions_content.xml
index caa1d766..2305de80 100644
--- a/res/layout/grant_permissions_content.xml
+++ b/res/layout/grant_permissions_content.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.PermissionGrant">
+ android:theme="@*android:style/Theme.DeviceDefault.PermissionGrant">
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index cd76ea60..0025cbf7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -32,7 +32,7 @@
</style>
<style name="GrantPermissions"
- parent="@*android:style/Theme.DeviceDefault.Light.Panel.PermissionGrantApp">
+ parent="@*android:style/Theme.DeviceDefault.PermissionGrantApp">
<!-- The following attributes change the behavior of the dialog, hence they should not be
themed -->
<item name="android:windowIsTranslucent">true</item>