Revert "Themes: Expose manifest styles for themes"

This reverts commit 62e6a40dde762251e1f26c43fff319673df54722.

Change-Id: Ibd05eef61176fc64ad0732a9c929e1dfa7e11912

2 files changed, 8 insertions, 45 deletions

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1610ced..50a4b38 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2815,7 +2815,7 @@
                 android:label="@string/managed_profile_label">
         </activity-alias>
         <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
-                android:theme="@style/HeavyWeightSwitcherActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog"
                 android:label="@string/heavy_weight_switcher_title"
                 android:finishOnCloseSystemDialogs="true"
                 android:excludeFromRecents="true"
@@ -2848,7 +2848,7 @@
         <activity android:name="android.accounts.ChooseAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/ChooseAccountActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
@@ -2856,14 +2856,14 @@
         <activity android:name="android.accounts.ChooseTypeAndAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/ChooseTypeAndAccountActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.accounts.ChooseAccountTypeActivity"
                 android:excludeFromRecents="true"
-                android:theme="@style/ChooseAccountTypeActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
@@ -2871,19 +2871,19 @@
         <activity android:name="android.accounts.CantAddAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/CantAddAccountActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.accounts.GrantCredentialsPermissionActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/GrantCredentialsPermissionActivityTheme"
+                android:theme="@style/Theme.Material.Light.DialogWhenLarge"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.content.SyncActivityTooManyDeletes"
-               android:theme="@style/SyncActivityTooManyDeletesTheme"
+               android:theme="@style/Theme.Material.Light.Dialog"
                android:label="@string/sync_too_many_deletes"
                android:process=":ui">
         </activity>
@@ -2903,7 +2903,7 @@
         </activity>
 
         <activity android:name="com.android.internal.app.NetInitiatedActivity"
-                android:theme="@style/NetInitiatedActivityTheme"
+                android:theme="@style/Theme.Material.Light.Dialog.Alert"
                 android:excludeFromRecents="true"
                 android:process=":ui">
         </activity>
diff --git a/core/res/res/values/cm_styles.xml b/core/res/res/values/cm_styles.xml
deleted file mode 100644
index 709041c..0000000
--- a/core/res/res/values/cm_styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-
-    <!-- Exposed manifest styles -->
-
-    <style name="HeavyWeightSwitcherActivityTheme" parent="Theme.Material.Light.Dialog" />
-
-    <style name="ChooseAccountActivityTheme" parent="Theme.Material.Light.Dialog" />
-
-    <style name="ChooseTypeAndAccountActivityTheme" parent="Theme.Material.Light.Dialog" />
-
-    <style name="ChooseAccountTypeActivityTheme" parent="Theme.Material.Light.Dialog" />
-
-    <style name="CantAddAccountActivityTheme" parent="Theme.Material.Light.Dialog.NoActionBar" />
-
-    <style name="GrantCredentialsPermissionActivityTheme" parent="Theme.Material.Light.DialogWhenLarge" />
-
-    <style name="SyncActivityTooManyDeletesTheme" parent="Theme.Material.Light.Dialog" />
-
-    <style name="NetInitiatedActivityTheme" parent="Theme.Material.Light.Dialog.Alert" />
-
-</resources>