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

5 files changed, 19 insertions, 6 deletions

diff --git a/res/layout/preference.xml b/res/layout/preference_permissions.xml
index 4f941f79..536a8f3c 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference_permissions.xml
@@ -24,7 +24,8 @@
     android:gravity="center_vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/activatedBackgroundIndicator"
+    android:background="?android:attr/selectableItemBackground"
+    android:focusable="true"
     android:clipToPadding="false">
 
     <LinearLayout
diff --git a/res/layout/preference_app.xml b/res/layout/preference_permissions_switch.xml
index 8dc8464e..cf444d96 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_permissions_switch.xml
@@ -24,7 +24,8 @@
     android:gravity="center_vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/activatedBackgroundIndicator"
+    android:background="?android:attr/selectableItemBackground"
+    android:focusable="true"
     android:clipToPadding="false">
 
     <LinearLayout
diff --git a/res/values-television/themes.xml b/res/values-television/themes.xml
index de4ff092..f6946f68 100644
--- a/res/values-television/themes.xml
+++ b/res/values-television/themes.xml
@@ -16,7 +16,9 @@
   -->
 
 <resources>
-    <style name="Settings" parent="Theme.Leanback" />
+    <style name="Settings" parent="Theme.Leanback">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
+    </style>
 
     <style name="GrantPermissions" parent="Theme.Leanback">
         <item name="android:windowIsFloating">true</item>
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"