commit a122be1c353d1f52ae6244843d143786ce4baf52
author Fan Zhang <zhfan@google.com> Mon Jul 16 16:28:37 2018 -0700
committer Fan Zhang <zhfan@google.com> Mon Jul 16 17:59:07 2018 -0700
tree 599f3ae852a7f95a58e4c880891d3fc1c3fb7758
parent dec6b8cd3836e9bdd8684f787573995b23b58e10

Move non-theme styles to styles.xml

1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources

Bug: 111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b666881..d3acd13 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1923,7 +1923,7 @@
         <activity android:name=".bluetooth.RequestPermissionActivity"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@style/BluetoothPermission">
+                  android:theme="@style/Theme.BluetoothPermission">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
                 <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -2520,9 +2520,6 @@
                 <action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="150">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>