Merge remote branch 'cyanogen/eclair' into eclair

4 files changed, 143 insertions, 6 deletions

diff --git a/apps/SpareParts/res/values-it/strings.xml b/apps/SpareParts/res/values-it/strings.xml
index 002be9a36..f5775472a 100644
--- a/apps/SpareParts/res/values-it/strings.xml
+++ b/apps/SpareParts/res/values-it/strings.xml
@@ -83,5 +83,28 @@
     <string name="compatibility_mode_summary_on">Avvia le vecchie apps in modalità compatibilità</string>
     <!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
     <string name="compatibility_mode_summary_off">Non avviare le vecchie apps in modalità compatibilità</string>
+
+<string name="title_ui_tweaks">Modifiche ai colori della UI</string>
+    
+    <string name="title_general_color_tweaks">Generale</string>
+    <string name="summary_general_color_tweaks">Orologio, data, operatore, etc.</string>
+    <string name="title_clock_color">Orologio</string>
+    <string name="title_date_color">Data</string>
+    <string name="title_spn_label_color">Etichetta SPN operatore</string>
+    <string name="title_plmn_label_color">Etichetta PLMN operatore</string>
+    
+    <string name="title_notifications_color_tweaks">Notifiche</string>
+    <string name="summary_notifications_color_tweaks">Ticker notifiche, notifiche in corso, ultime notifiche, cancella notifiche, etc.</string>    
+    <string name="title_notifications_ticker_color">Ticker notifiche</string>
+    <string name="title_no_notifications_color">Titolo Nessuna notifica</string>
+    <string name="title_clear_button_label_color">Etichetta Cancella</string>    
+    <string name="title_ongoing_notifications_color">Titolo notifiche in corso</string>    
+    <string name="title_latest_notifications_color">Titolo ultime notifiche</string>
+    <string name="title_notifications_items">Oggetto della notifica</string>
+    <string name="title_notifications_items_title">Titolo</string>
+    <string name="title_notifications_items_text">Testo</string>
+    <string name="title_notifications_items_time">Ora</string>
+    
+    <string name="dialog_title_color">Seleziona un colore</string>
 </resources>
 
diff --git a/apps/SpareParts/res/values/strings.xml b/apps/SpareParts/res/values/strings.xml
index eec4529aa..971625655 100644
--- a/apps/SpareParts/res/values/strings.xml
+++ b/apps/SpareParts/res/values/strings.xml
@@ -79,6 +79,30 @@
 	<string name="title_compcache_enabled">Compcache enabled</string>
 	<string name="summary_on_compcache_enabled">Compressed caching is enabled</string>
 	<string name="summary_off_compcache_enabled">Compressed caching is disabled</string>
+
+	<!-- Double Carrier -->
+    
+    <string name="title_plmn">Settings for PLMN carrier string</string>
+
+	<string name="title_show_plmn_ls">Display PLMN (lockscreen)</string>
+	<string name="summary_on_show_plmn_ls">PLMN field is displayed on lockscreen</string>
+	<string name="summary_off_show_plmn_ls">PLMN field is not displayed on lockscreen</string>
+
+	<string name="title_show_plmn_sb">Display PLMN (status bar)</string>
+	<string name="summary_on_show_plmn_sb">PLMN field is displayed in status bar</string>
+	<string name="summary_off_show_plmn_sb">PLMN field is not displayed in status bar</string>
+
+
+    <string name="title_spn">Settings for SPN carrier string</string>
+
+	<string name="title_show_spn_ls">Display SPN (lockscreen)</string>
+	<string name="summary_on_show_spn_ls">SPN field is displayed on lockscreen</string>
+	<string name="summary_off_show_spn_ls">SPN field is not displayed on lockscreen</string>
+
+	<string name="title_show_spn_sb">Display SPN (status bar)</string>
+	<string name="summary_on_show_spn_sb">SPN field is displayed in status bar</string>
+	<string name="summary_off_show_spn_sb">SPN field is not displayed in status bar</string>
+
 	
     <!-- Sound & display settings screen, compatibility mode check box label -->
     <string name="compatibility_mode_title">Compatibility mode</string>
diff --git a/apps/SpareParts/res/xml/spare_parts.xml b/apps/SpareParts/res/xml/spare_parts.xml
index 9febcda05..2bcbd6b66 100644
--- a/apps/SpareParts/res/xml/spare_parts.xml
+++ b/apps/SpareParts/res/xml/spare_parts.xml
@@ -165,15 +165,58 @@
             <Preference android:key="date_color"
                 android:title="@string/title_date_color"
                 android:defaultValue="-16777216" />
-                
-            <Preference android:key="spn_label_color"
-                android:title="@string/title_spn_label_color"
-                android:defaultValue="-16777216" />
-                
+		
+				<!-- Double Carrier - bcrook shenanigans -->
+    	<PreferenceCategory
+        	android:title="@string/title_plmn">
+
+		    <CheckBoxPreference 
+		        android:key="show_plmn_ls" 
+		        android:title="@string/title_show_plmn_ls" 
+		        android:summaryOn="@string/summary_on_show_plmn_ls"
+		        android:summaryOff="@string/summary_off_show_plmn_ls"
+				android:defaultValue="true" />
+
+		    <CheckBoxPreference 
+		        android:key="show_plmn_sb" 
+		        android:title="@string/title_show_plmn_sb" 
+		        android:summaryOn="@string/summary_on_show_plmn_sb"
+		        android:summaryOff="@string/summary_off_show_plmn_sb"
+				android:defaultValue="true" 
+                android:disableDependentsState="false" />
+
             <Preference android:key="plmn_label_color"
                 android:title="@string/title_plmn_label_color"
-                android:defaultValue="-16777216" />
+                android:defaultValue="-16777216"
+                android:dependency="show_plmn_sb" />
+
+       	</PreferenceCategory>
+
+    	<PreferenceCategory
+        	android:title="@string/title_spn">
+
+		    <CheckBoxPreference 
+		        android:key="show_spn_ls" 
+		        android:title="@string/title_show_spn_ls" 
+		        android:summaryOn="@string/summary_on_show_spn_ls"
+		        android:summaryOff="@string/summary_off_show_spn_ls"
+				android:defaultValue="true" />
+
+		    <CheckBoxPreference 
+		        android:key="show_spn_sb" 
+		        android:title="@string/title_show_spn_sb" 
+		        android:summaryOn="@string/summary_on_show_spn_sb"
+		        android:summaryOff="@string/summary_off_show_spn_sb"
+				android:defaultValue="true" 
+                android:disableDependentsState="false" />
                 
+            <Preference android:key="spn_label_color"
+                android:title="@string/title_spn_label_color"
+                android:defaultValue="-16777216"
+                android:dependency="show_spn_sb" />
+
+      	</PreferenceCategory>
+              
         </PreferenceScreen>
         
         <PreferenceScreen
diff --git a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
index b657c0b9f..e105b1c15 100644
--- a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
+++ b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
@@ -62,6 +62,12 @@ public class SpareParts extends PreferenceActivity
     private static final String LAUNCHER_COLUMN_PREF = "launcher_columns";
     private static final String BATTERY_STATUS_PREF = "battery_status";
     private static final String COMPCACHE_PREF = "compcache_enabled";
+// Double Carrier - bcrook
+	private static final String SHOW_PLMN_LS_PREF = "show_plmn_ls";
+	private static final String SHOW_SPN_LS_PREF = "show_spn_ls";
+	private static final String SHOW_PLMN_SB_PREF = "show_plmn_sb";
+	private static final String SHOW_SPN_SB_PREF = "show_spn_sb";
+	
     
     //Wysie_Soh
     private static final String RECENT_APPS_NUM_PREF = "recent_apps_num";
@@ -112,6 +118,11 @@ public class SpareParts extends PreferenceActivity
     private CheckBoxPreference mBatteryStatusPref;
     private CheckBoxPreference mCompcachePref;
     private CheckBoxPreference mShowClockPref;
+	//Double Carrier - bcrook
+	private CheckBoxPreference mShowPlmnLsPref;
+	private CheckBoxPreference mShowSpnLsPref;
+	private CheckBoxPreference mShowPlmnSbPref;
+	private CheckBoxPreference mShowSpnSbPref;
     
     private Preference mResetToDefaults;
 
@@ -182,6 +193,11 @@ public class SpareParts extends PreferenceActivity
         mLauncherOrientationPref = (CheckBoxPreference) prefSet.findPreference(LAUNCHER_ORIENTATION_PREF);
         mLauncherColumnPref = (CheckBoxPreference) prefSet.findPreference(LAUNCHER_COLUMN_PREF);
         mCompcachePref = (CheckBoxPreference) prefSet.findPreference(COMPCACHE_PREF);
+		// Double carrier
+		mShowPlmnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_LS_PREF);
+		mShowSpnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_LS_PREF);
+		mShowPlmnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_SB_PREF);
+		mShowSpnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_SB_PREF);
         
         mBatteryStatusPref = (CheckBoxPreference) prefSet.findPreference(BATTERY_STATUS_PREF);
         mBatteryPercentColorPreference = prefSet.findPreference(UI_BATTERY_PERCENT_COLOR);
@@ -248,6 +264,19 @@ public class SpareParts extends PreferenceActivity
             mShowClockPref.setChecked(Settings.System.getInt(
             		getContentResolver(),
             		Settings.System.SHOW_STATUS_CLOCK, 0) != 0);
+// Double Carrier - bcrook
+            mShowPlmnLsPref.setChecked(Settings.System.getInt(
+            		getContentResolver(),
+            		Settings.System.SHOW_PLMN_LS, 0) != 0);
+            mShowSpnLsPref.setChecked(Settings.System.getInt(
+            		getContentResolver(),
+            		Settings.System.SHOW_SPN_LS, 0) != 0);
+            mShowPlmnSbPref.setChecked(Settings.System.getInt(
+            		getContentResolver(),
+            		Settings.System.SHOW_PLMN_SB, 0) != 0);
+            mShowSpnSbPref.setChecked(Settings.System.getInt(
+            		getContentResolver(),
+            		Settings.System.SHOW_SPN_SB, 0) != 0);
     }
     
     public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -402,6 +431,11 @@ public class SpareParts extends PreferenceActivity
         Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR, -16777216);
         Settings.System.putInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_ICON,1);
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK, 1);
+// Double carrier
+        Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_LS, 1);
+        Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_LS, 1);
+        Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_SB, 1);
+        Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_SB, 1);
         mBatteryStatusPref.setChecked(Settings.System.getInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_ICON, 0) != 0);
         mShowClockPref.setChecked(Settings.System.getInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK, 0) != 0);
     }
@@ -721,6 +755,19 @@ public class SpareParts extends PreferenceActivity
         } else if (COMPCACHE_PREF.equals(key)) {
         	Settings.Secure.putInt(getContentResolver(), Settings.Secure.COMPCACHE_ENABLED,
         			mCompcachePref.isChecked() ? 1 : 0);
+// Double Carrier
+        } else if (SHOW_PLMN_LS_PREF.equals(key)) {
+        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_LS,
+        			mShowPlmnLsPref.isChecked() ? 1 : 0);
+        } else if (SHOW_SPN_LS_PREF.equals(key)) {
+        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_LS,
+        			mShowSpnLsPref.isChecked() ? 1 : 0);
+        } else if (SHOW_PLMN_SB_PREF.equals(key)) {
+        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_SB,
+        			mShowPlmnSbPref.isChecked() ? 1 : 0);
+        } else if (SHOW_SPN_SB_PREF.equals(key)) {
+        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_SB,
+        			mShowSpnSbPref.isChecked() ? 1 : 0);
         } else if (UI_SHOW_STATUS_CLOCK.equals(key)) {
         	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK,
         			mShowClockPref.isChecked() ? 1 : 0);