summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorBryan Owens <djbryan3540@gmail.com>2016-05-05 17:23:16 -0500
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-05 15:47:36 -0700
commit62e6a40dde762251e1f26c43fff319673df54722 (patch)
tree1bf4341c8d6b04eefd524eb7a369bb8aca844ec3 /core/res
parentaec68c495fc5e0c43005356b63948c864908e9a8 (diff)
downloadframeworks_base-62e6a40dde762251e1f26c43fff319673df54722.zip
frameworks_base-62e6a40dde762251e1f26c43fff319673df54722.tar.gz
frameworks_base-62e6a40dde762251e1f26c43fff319673df54722.tar.bz2
Themes: Expose manifest styles for themes
Change-Id: I5c706654538a435738419f69d4909d205d26abb8 Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml16
-rw-r--r--core/res/res/values/cm_styles.xml37
2 files changed, 45 insertions, 8 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 50a4b38..1610ced 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/Theme.Material.Light.Dialog"
+ android:theme="@style/HeavyWeightSwitcherActivityTheme"
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/Theme.Material.Light.Dialog"
+ android:theme="@style/ChooseAccountActivityTheme"
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/Theme.Material.Light.Dialog"
+ android:theme="@style/ChooseTypeAndAccountActivityTheme"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
<activity android:name="android.accounts.ChooseAccountTypeActivity"
android:excludeFromRecents="true"
- android:theme="@style/Theme.Material.Light.Dialog"
+ android:theme="@style/ChooseAccountTypeActivityTheme"
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/Theme.Material.Light.Dialog.NoActionBar"
+ android:theme="@style/CantAddAccountActivityTheme"
android:process=":ui">
</activity>
<activity android:name="android.accounts.GrantCredentialsPermissionActivity"
android:excludeFromRecents="true"
android:exported="true"
- android:theme="@style/Theme.Material.Light.DialogWhenLarge"
+ android:theme="@style/GrantCredentialsPermissionActivityTheme"
android:process=":ui">
</activity>
<activity android:name="android.content.SyncActivityTooManyDeletes"
- android:theme="@style/Theme.Material.Light.Dialog"
+ android:theme="@style/SyncActivityTooManyDeletesTheme"
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/Theme.Material.Light.Dialog.Alert"
+ android:theme="@style/NetInitiatedActivityTheme"
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
new file mode 100644
index 0000000..709041c
--- /dev/null
+++ b/core/res/res/values/cm_styles.xml
@@ -0,0 +1,37 @@
+<?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>