Add new light theme to Phone settings
Change-Id: Iede2c2053e81acb404b453cdec35df3d62723e3d
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 04f4b8b..aad9143 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -140,7 +140,9 @@
</intent-filter>
</activity>
- <activity android:name="FdnList" android:label="@string/fdnListLabel">
+ <activity android:name="FdnList"
+ android:label="@string/fdnListLabel"
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -291,7 +293,7 @@
<activity android:name="GsmUmtsOptions"
android:label="@string/gsm_umts_options"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -299,7 +301,7 @@
<activity android:name="CdmaOptions"
android:label="@string/cdma_options"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -307,7 +309,7 @@
<activity android:name="GsmUmtsCallOptions"
android:label="@string/gsm_umts_options"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -315,7 +317,7 @@
<activity android:name="CdmaCallOptions"
android:label="@string/cdma_options"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -324,7 +326,7 @@
<activity android:name="GsmUmtsCallForwardOptions"
android:label="@string/labelCF"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -333,7 +335,7 @@
<activity android:name="GsmUmtsAdditionalCallOptions"
android:label="@string/labelGSMMore"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -350,7 +352,7 @@
<!-- fdn setting -->
<activity android:name="FdnSetting"
android:label="@string/fdn"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@@ -358,13 +360,13 @@
<activity android:name="EnableFdnScreen"
android:label=""
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
</activity>
<!-- SIM PIN setting -->
<activity android:name="EnableIccPinScreen"
android:label="@string/enable_pin"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -373,7 +375,7 @@
<activity android:name="ChangeIccPinScreen"
android:label="@string/change_pin"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -382,16 +384,18 @@
<activity android:name="GetPin2Screen"
android:label="@string/get_pin2"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+ android:theme="@style/SettingsLight"
android:windowSoftInputMode="stateVisible">
</activity>
<activity android:name="EditFdnContactScreen"
- android:windowSoftInputMode="stateVisible">
+ android:theme="@style/SettingsLight"
+ android:windowSoftInputMode="stateVisible">
</activity>
<activity android:name="DeleteFdnContactScreen"
- android:label="@string/delete_fdn_contact">
+ android:theme="@style/SettingsLight"
+ android:label="@string/delete_fdn_contact">
</activity>
<activity android:name="DataRoamingReenable" android:label="@string/android:dialog_alert_title"
@@ -414,7 +418,7 @@
<activity android:name="CallFeaturesSetting"
android:label="@string/call_settings"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" />
@@ -468,7 +472,7 @@
<activity android:label="Sip Settings"
android:name=".sip.SipSettings"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+ android:theme="@style/SettingsLight"
android:launchMode="singleTop"
android:configChanges="orientation|screenSize|keyboardHidden"
android:uiOptions="splitActionBarWhenNarrow">
@@ -478,7 +482,7 @@
</intent-filter>
</activity>
<activity android:name=".sip.SipEditor"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+ android:theme="@style/SettingsLight"
android:configChanges="orientation|screenSize|keyboardHidden"
android:uiOptions="splitActionBarWhenNarrow">
</activity>
@@ -491,7 +495,7 @@
<activity android:name="RespondViaSmsManager$Settings"
android:label="@string/respond_via_sms_setting_title"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/SettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4ccfc1a..f0a3e9f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,4 +33,8 @@
<!-- Used with some smaller texts in manage conference screen. -->
<color name="manage_conference_secondary_text_color">#888888</color>
+
+ <!-- Settings screen should use the same colors as the Dialer -->
+ <color name="phone_settings_background_color">#f5f5f5</color>
+ <color name="phone_settings_actionbar_color">#e6e6e6</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 88044b9..d7b010d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -64,7 +64,7 @@
<!-- OTA Call Card styles -->
<style name="ccOtaButtonBar">
<!-- TODO: change height to 'wrap_content' when layout bug is fixed -->
- <item name="android:layout_height">60dip</item>
+ <item name="android:layout_height">60dip</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@android:drawable/bottom_bar</item>
</style>
@@ -160,6 +160,11 @@
<item name="android:windowCloseOnTouchOutside">true</item>
</style>
+ <style name="SettingsLight" parent="@android:style/Theme.Holo.Light.DialogWhenLarge">
+ <item name="android:windowBackground">@color/phone_settings_background_color</item>
+ <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
+ </style>
+
<style name="InCallAnimationStyle" parent="@*android:style/Animation.Holo.Activity">
<!-- Suppress task-to-task animation happening during the transition from
OutgoingCallBroadcaster (and SipOptionHandler) to InCallScreen.
@@ -211,6 +216,11 @@
<item name="android:backgroundStacked">@color/people_app_theme_color</item>
</style>
+ <style name="DialtactsActionBarStyle"
+ parent="@android:style/Widget.Holo.Light.ActionBar">
+ <item name="android:background">@color/phone_settings_actionbar_color</item>
+ </style>
+
<style name="SimImportTheme"
parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>