diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:00:11 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:02:19 -0800 |
| commit | ef861375eebd9ac6cce7c0bb163380ab1c951063 (patch) | |
| tree | 870ae89605e49658de3e5abca2797b68c5efbb26 /res/values/themes.xml | |
| parent | 9c78316fe6baa4f7fd7d5108349ecf8a2532b047 (diff) | |
| download | android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.gz android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.bz2 android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
Diffstat (limited to 'res/values/themes.xml')
| -rw-r--r-- | res/values/themes.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/res/values/themes.xml b/res/values/themes.xml index 2f9c2b55..026c77fa 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,11 +16,13 @@ --> <resources> - <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 name="Settings" + parent="@android:style/Theme.DeviceDefault.Settings"> </style> <style name="GrantPermissions" - parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" /> + parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + </style> + </resources> |