Add new colors and styles to Phone settings
Yorke Lee [Tue, 30 Jul 2013 04:07:11 +0000 (21:07 -0700)]
Change-Id: Ic50ea0b1d21c902a04ff57d7641927e674cd4cb5

AndroidManifest.xml
res/values/colors.xml
res/values/styles.xml

index d8cda6f..88b3261 100644 (file)
             </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" />
 
         <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>
 
         <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>
 
         <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>
 
         <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>
         <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>
         <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>
         <!-- 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>
 
         <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" />
 
         <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" />
 
         <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"
         <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" />
 
         <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">
             </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>
         <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>
index 4ccfc1a..f0a3e9f 100644 (file)
@@ -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>
index 88044b9..d7b010d 100644 (file)
@@ -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>
         <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.
         <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>