diff options
| author | Todd Volkert <tvolkert@google.com> | 2015-06-25 15:15:15 -0700 |
|---|---|---|
| committer | Todd Volkert <tvolkert@google.com> | 2015-07-01 13:24:37 -0700 |
| commit | f2736bd4fb3df44ac03385162b9f8d1bf4cb9b61 (patch) | |
| tree | cfdd2b8ee8fe19cd6329442f1cb76dff456f331e /res/values | |
| parent | 1cc22115a4d3862bef9ddef140a20dc968e3909a (diff) | |
| download | android_packages_apps_PackageInstaller-f2736bd4fb3df44ac03385162b9f8d1bf4cb9b61.tar.gz android_packages_apps_PackageInstaller-f2736bd4fb3df44ac03385162b9f8d1bf4cb9b61.tar.bz2 android_packages_apps_PackageInstaller-f2736bd4fb3df44ac03385162b9f8d1bf4cb9b61.zip | |
Migrate package installer permissions fragments to preference support lib.
In order to allow for TV-friendly layouts, this migrates the permissions
fragments to the preference support lib, and modifies the necessary layouts
and themes to make them work on TV.
b/22043727
b/22045650
b/22044940
Change-Id: Ic862effe2c126da78c304983fd06e017c3ee4472
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" |