diff options
| author | Bart Sears <bsears@google.com> | 2015-08-07 18:15:33 -0700 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2015-08-07 18:15:33 -0700 |
| commit | 20ca27fb9b6b315e2698cb62b6a9bcf24d025677 (patch) | |
| tree | 2e9c339717afaa4625efa79f212eb91fdf6f4f62 /res/values | |
| parent | e3872b1336d3c3486e1b3a41d5efd864cf03d58f (diff) | |
| parent | 4941304f530976383aa96af015d9af480d09024b (diff) | |
| download | android_packages_apps_PackageInstaller-20ca27fb9b6b315e2698cb62b6a9bcf24d025677.tar.gz android_packages_apps_PackageInstaller-20ca27fb9b6b315e2698cb62b6a9bcf24d025677.tar.bz2 android_packages_apps_PackageInstaller-20ca27fb9b6b315e2698cb62b6a9bcf24d025677.zip | |
resolved conflicts for merge of 4941304f to master
Change-Id: I4c7249a1d38793248e16682b49dce70ad2cba408
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 2a063002..b9db0769 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.DayNight.Dialog.NoActionBar" /> + parent="@android:style/Theme.DeviceDefault.DayNight.Dialog.NoActionBar" /> </resources> |