diff options
| author | Todd Volkert <tvolkert@google.com> | 2015-07-02 01:02:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-02 01:02:44 +0000 |
| commit | 7da1106dc725edc3ecefc9cb1a6e456591317c14 (patch) | |
| tree | f152695f54c3410885a34b1f4a544888de72de40 /res/values | |
| parent | 41c456a2d93c6a3eb4b5d2bdc220b24f411ee887 (diff) | |
| parent | 39d136a0c90da67e04e98dcd54b46543d61ee85a (diff) | |
| download | android_packages_apps_PackageInstaller-7da1106dc725edc3ecefc9cb1a6e456591317c14.tar.gz android_packages_apps_PackageInstaller-7da1106dc725edc3ecefc9cb1a6e456591317c14.tar.bz2 android_packages_apps_PackageInstaller-7da1106dc725edc3ecefc9cb1a6e456591317c14.zip | |
am 39d136a0: am 6a50ff8e: Merge "Migrate package installer permissions fragments to preference support lib." into mnc-dev
* commit '39d136a0c90da67e04e98dcd54b46543d61ee85a':
Migrate package installer permissions fragments to preference support lib.
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/styles.xml | 13 | ||||
| -rw-r--r-- | res/values/themes.xml | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 888f9d02..e800b56f 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,8 +27,17 @@ <style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings"> </style> - <style name="Preference"> - <item name="android:layout">@layout/preference</item> + <style name="PreferenceThemeOverlay.v14.Permissions"> + <item name="preferenceStyle">@style/Preference.Permissions</item> + <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item> + </style> + + <style name="Preference.Permissions"> + <item name="layout">@layout/preference_permissions</item> + </style> + + <style name="Preference.SwitchPreference.Permissions"> + <item name="layout">@layout/preference_permissions_switch</item> </style> <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid"> diff --git a/res/values/themes.xml b/res/values/themes.xml index 2dbb2818..3f8f59d9 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -18,7 +18,7 @@ <resources> <style name="Settings" parent="@android:style/Theme.Material.Settings"> <item name="android:actionBarStyle">@style/ActionBar</item> - <item name="@*android:preferenceStyle">@style/Preference</item> + <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item> </style> <style name="GrantPermissions" |