diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 19:39:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 19:39:55 +0000 |
| commit | 4941304f530976383aa96af015d9af480d09024b (patch) | |
| tree | f8dacb7a0a4be12215c0dcbb27af73ecfa2ceec6 /res/values | |
| parent | edd51396440443db0c091cb89f8abc80d9b39a0e (diff) | |
| parent | 2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5 (diff) | |
| download | android_packages_apps_PackageInstaller-4941304f530976383aa96af015d9af480d09024b.tar.gz android_packages_apps_PackageInstaller-4941304f530976383aa96af015d9af480d09024b.tar.bz2 android_packages_apps_PackageInstaller-4941304f530976383aa96af015d9af480d09024b.zip | |
am 2b35ed61: am 0ac52fc3: am 14595d69: am 0c5d3ddf: Merge "Show warning when touches are being blocked by overlays" into mnc-dev
* commit '2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5':
Show warning when touches are being blocked by overlays
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> |