diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
commit | e002f536cba85cb90655e44e15497054c1a5651a (patch) | |
tree | 82ced13a5969a87673836a935a0f67d3cf16d5b5 /res/values/styles.xml | |
parent | cb079ef38ce9881687ab9c89e1c321ded722c1b3 (diff) | |
parent | b145bb2c34c495a51b83bf755e560d7b931ea8f7 (diff) | |
download | android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.gz android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.bz2 android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'res/values/styles.xml')
-rwxr-xr-x | res/values/styles.xml | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 9c166971..7f6a4693 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,37 +15,22 @@ --> <resources> - <style name="padded"> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - </style> - <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"/> - <style name="Theme.AlertDialogActivity" parent="@android:style/Theme.DeviceDefault.Light.Panel"> - <item name="android:backgroundDimEnabled">true</item> - </style> - - <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings"> - </style> - <style name="PreferenceThemeOverlay.v14.Permissions"> - <item name="preferenceStyle">@style/Preference.Permissions</item> - <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item> - <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item> + <style name="Theme.DialogWhenLarge" + parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"> </style> - <style name="Preference.Permissions"> - <item name="layout">@layout/preference_permissions</item> - </style> - - <style name="Preference.Category.Permissions"> - <item name="layout">@layout/preference_category_material</item> + <style name="Theme.AlertDialogActivity" + parent="@android:style/Theme.DeviceDefault.Light.Panel"> + <item name="android:backgroundDimEnabled">true</item> </style> - <style name="Preference.SwitchPreference.Permissions"> - <item name="layout">@layout/preference_permissions_switch</item> + <style name="Theme.Header.Settings" + parent="@android:style/Theme.DeviceDefault.Settings"> </style> <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid"> <item name="android:contentInsetStart">72dp</item> </style> + </resources> |