diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 18:40:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 18:40:32 +0000 |
| commit | 0c5d3ddf25ca46bf610608f2db8ae8f7371ba318 (patch) | |
| tree | f6965edcf171365ef0d9f0831119a07dff4fb26c /res/values | |
| parent | 51fc8c6e93aaa6e5c33a65a82a7c2dfd8de75caa (diff) | |
| parent | 5c07dcb0698725e7949b030665d21f96c916f3b8 (diff) | |
| download | android_packages_apps_PackageInstaller-0c5d3ddf25ca46bf610608f2db8ae8f7371ba318.tar.gz android_packages_apps_PackageInstaller-0c5d3ddf25ca46bf610608f2db8ae8f7371ba318.tar.bz2 android_packages_apps_PackageInstaller-0c5d3ddf25ca46bf610608f2db8ae8f7371ba318.zip | |
Merge "Show warning when touches are being blocked by overlays" into mnc-dev
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/themes.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 6d772910..9c166971 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -24,7 +24,7 @@ <item name="android:backgroundDimEnabled">true</item> </style> - <style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings"> + <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings"> </style> <style name="PreferenceThemeOverlay.v14.Permissions"> diff --git a/res/values/themes.xml b/res/values/themes.xml index 3f8f59d9..2f9c2b55 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,11 +16,11 @@ --> <resources> - <style name="Settings" parent="@android:style/Theme.Material.Settings"> + <style name="Settings" parent="@android:style/Theme.DeviceDefault.Settings"> <item name="android:actionBarStyle">@style/ActionBar</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item> </style> <style name="GrantPermissions" - parent="@android:style/Theme.Material.Light.Dialog.NoActionBar" /> + parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" /> </resources> |