Snap for 7625910 from 4d34ed3eb250ec524f2b46ca5140715b71c5bc56 to sc-release

Change-Id: If7e848d5f76821e8d62e1f5dd6c1a40afe9b67ba

4 files changed, 23 insertions, 7 deletions

diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
index 652da21a7..a6fee5833 100644
--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
@@ -121,7 +121,7 @@
         <activity android:name="com.android.permissioncontroller.permission.ui.ManagePermissionsActivity"
                   android:configChanges="orientation|keyboardHidden|screenSize"
                   android:label="@string/app_permissions"
-                  android:theme="@style/Settings.FilterTouches"
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches"
                   android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_APP_PERMISSIONS" />
@@ -148,7 +148,7 @@
 
         <activity android:name="com.android.permissioncontroller.permission.ui.legacy.AppPermissionActivity"
                   android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:theme="@style/Settings.FilterTouches"
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches"
                   android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
         </activity>
 
@@ -210,7 +210,7 @@
 
         <activity android:name="com.android.permissioncontroller.role.ui.DefaultAppListActivity"
                   android:label="@string/default_apps"
-                  android:theme="@style/Settings.FilterTouches">
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
             <intent-filter android:priority="2">
                 <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -219,7 +219,7 @@
 
         <activity android:name="com.android.permissioncontroller.role.ui.DefaultAppActivity"
                   android:permission="android.permission.MANAGE_ROLE_HOLDERS"
-                  android:theme="@style/Settings.FilterTouches">
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_DEFAULT_APP" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -239,7 +239,7 @@
         <activity android:name="com.android.permissioncontroller.role.ui.SpecialAppAccessListActivity"
                   android:label="@string/special_app_access"
                   android:permission="android.permission.MANAGE_ROLE_HOLDERS"
-                  android:theme="@style/Settings.FilterTouches">
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_SPECIAL_APP_ACCESSES" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -248,7 +248,7 @@
 
         <!-- TODO: Override other Settings intents when we've done migrating them. -->
         <activity android:name="com.android.permissioncontroller.role.ui.SpecialAppAccessActivity"
-                  android:theme="@style/Settings.FilterTouches" />
+                  android:theme="@style/Theme.PermissionController.Settings.FilterTouches" />
 
         <activity android:name="com.android.permissioncontroller.role.ui.RoleSearchTrampolineActivity"
                   android:excludeFromRecents="true"
diff --git a/PermissionController/res/values-television/themes.xml b/PermissionController/res/values-television/themes.xml
index 333eb6565..12d03b284 100644
--- a/PermissionController/res/values-television/themes.xml
+++ b/PermissionController/res/values-television/themes.xml
@@ -24,6 +24,8 @@
         <item name="android:backgroundDimAmount">0.8</item>
     </style>
 
+    <style name="Theme.PermissionController.Settings" parent="Settings" />
+
     <style name="GrantPermissions" parent="Theme.Leanback">
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@style/Animation.Snackbar</item>
diff --git a/PermissionController/res/values-watch/themes.xml b/PermissionController/res/values-watch/themes.xml
index a8186dd9f..0e9b7a919 100644
--- a/PermissionController/res/values-watch/themes.xml
+++ b/PermissionController/res/values-watch/themes.xml
@@ -18,6 +18,8 @@
 <resources>
     <style name="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar" />
 
+    <style name="Theme.PermissionController.Settings" parent="Settings" />
+
     <style name="GrantPermissions" parent="@android:style/Theme.DeviceDefault.NoActionBar">
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
diff --git a/PermissionController/res/values/themes.xml b/PermissionController/res/values/themes.xml
index 236cff6f2..04265a314 100644
--- a/PermissionController/res/values/themes.xml
+++ b/PermissionController/res/values/themes.xml
@@ -17,10 +17,21 @@
 
 <resources>
 
+    <!--
+      ~ This theme should have been named SettingsBase, but it is exposed as overlayable to OEMs and
+      ~ cannot be renamed now.
+      -->
     <style name="Settings" parent="Theme.SubSettingsBase">
         <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item>
     </style>
 
+    <!-- This theme should contain attributes that should always be set despite OEM overlays. -->
+    <style name="Theme.PermissionController.Settings" parent="Settings">
+        <!-- These two attributes are required when using Toolbar as ActionBar. -->
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
     <style name="TextAppearance.CategoryTitle"
            parent="@android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textAllCaps">true</item>
@@ -46,6 +57,7 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
+    <!-- Unused since R but exposed as overlayable. -->
     <style name="Header.Settings"
             parent="@android:style/Theme.DeviceDefault.Settings">
     </style>
@@ -94,7 +106,7 @@
         <item name="android:filterTouchesWhenObscured">true</item>
     </style>
 
-    <style name="Settings.FilterTouches">
+    <style name="Theme.PermissionController.Settings.FilterTouches">
         <item name="android:filterTouchesWhenObscured">true</item>
     </style>