Removing launcher orientation and columns prefs.

7 files changed, 21 insertions, 108 deletions

diff --git a/apps/SpareParts/res/values-de/strings.xml b/apps/SpareParts/res/values-de/strings.xml
index 375e64f04..501850b9c 100644
--- a/apps/SpareParts/res/values-de/strings.xml
+++ b/apps/SpareParts/res/values-de/strings.xml
@@ -52,20 +52,10 @@
   <string name="summary_end_button">Wähle Aktion für Endetaste (rot)</string>
   <string name="dialog_title_end_button">Wähle Endetaste</string>
 
-  <string name="applications_title">Anwendungen</string>
-
   <string name="title_pin_home">Home-App im Speicher</string>
   <string name="summary_on_pin_home">Versuchen die Home-App im Speicher zu halten.</string>
   <string name="summary_off_pin_home">Home-App nicht zwingen im Speicher zu bleiben.</string>
 
-  <string name="title_launcher_orientation">Launcher Drehung</string>
-  <string name="summary_on_launcher_orientation">Launcher richtet sich bei Drehung neu aus.</string>
-  <string name="summary_off_launcher_orientation">Launcher reagiert nicht auf Drehung des Gerätes</string>
-
-  <string name="title_launcher_columns">Spalten im Launcher</string>
-  <string name="summary_on_launcher_columns">5 Spalten pro Reihe (Neustart erforderlich)</string>
-  <string name="summary_off_launcher_columns">4 Spalten pro Reihe (Neustart erforderlich)</string>
-
   <string name="battery_status_title">Batterie Statusanzeige</string>
   <string name="battery_status_summary_on">Batterieladung in Prozent wird in der Statusleiste angezeigt.</string>
   <string name="battery_status_summary_off">Batterieladung in Prozent wird nicht in der Statusleiste angezeigt.</string>
diff --git a/apps/SpareParts/res/values-it/strings.xml b/apps/SpareParts/res/values-it/strings.xml
index c8ad20208..09f73592c 100644
--- a/apps/SpareParts/res/values-it/strings.xml
+++ b/apps/SpareParts/res/values-it/strings.xml
@@ -55,20 +55,10 @@
     <string name="summary_end_button">Seleziona il comportamento del tasto Power</string>
     <string name="dialog_title_end_button">Seleziona comportamento</string>
     
-    <string name="applications_title">Applicazioni</string>
-    
     <string name="title_pin_home">Home in memoria</string>
     <string name="summary_on_pin_home">La home cercherà di restare sempre in memoria</string>
     <string name="summary_off_pin_home">La home non resterà in memoria</string>
 
-    <string name="title_launcher_orientation">Rotazione Launcher</string>
-    <string name="summary_on_launcher_orientation">Il launcher ruoterà usando l\'accelerometro</string>
-    <string name="summary_off_launcher_orientation">Il launcher non ruoterà</string>
-
-    <string name="title_launcher_columns">Launcher compatto</string>
-    <string name="summary_on_launcher_columns">5 colonne di icone per riga (richiede riavvio)</string>
-    <string name="summary_off_launcher_columns">4 colonne di icone per riga (richiede riavvio)</string>
-
     <string name="battery_status_title">Mostra stato batteria</string>
     <string name="battery_status_summary_on">La percentuale di carica verrà mostrata nella barra notifiche. (richiede riavvio)</string>
     <string name="battery_status_summary_off">La percentuale di carica NON verrà mostrata nella barra notifiche. (richiede riavvio)</string>
diff --git a/apps/SpareParts/res/values-ja/strings.xml b/apps/SpareParts/res/values-ja/strings.xml
index e9ab4dc3d..4c5d7d096 100644
--- a/apps/SpareParts/res/values-ja/strings.xml
+++ b/apps/SpareParts/res/values-ja/strings.xml
@@ -56,20 +56,10 @@
     <string name="summary_end_button">終了ボタン(赤)の挙動選択</string>
     <string name="dialog_title_end_button">終了ボタンの選択</string>
 
-    <string name="applications_title">アプリケーション</string>
-
     <string name="title_pin_home">ランチャーの常駐</string>
     <string name="summary_on_pin_home">ランチャーはメモリに常駐する</string>
     <string name="summary_off_pin_home">ランチャーはメモリに常駐しない</string>
 
-    <string name="title_launcher_orientation">ランチャーの回転</string>
-    <string name="summary_on_launcher_orientation">ランチャーは加速度センサにより自動回転する</string>
-    <string name="summary_off_launcher_orientation">ランチャーは自動回転しない</string>
-
-    <string name="title_launcher_columns">コンパクトランチャー</string>
-    <string name="summary_on_launcher_columns">1行に5カラムのアイコン列(要再起動)</string>
-    <string name="summary_off_launcher_columns">1行に5カラムのアイコン列(要再起動)</string>
-
     <string name="battery_status_title">バッテリ状態表示</string>
     <string name="battery_status_summary_on">バッテリの残りパーセントをステータスバーに表示する</string>
     <string name="battery_status_summary_off">バッテリの残りパーセントをステータスバーに表示しない</string>
diff --git a/apps/SpareParts/res/values-zh-rCN/strings.xml b/apps/SpareParts/res/values-zh-rCN/strings.xml
index 600b0f0e6..b3770dc69 100644
--- a/apps/SpareParts/res/values-zh-rCN/strings.xml
+++ b/apps/SpareParts/res/values-zh-rCN/strings.xml
@@ -53,24 +53,14 @@
     <string name="summary_end_button">选择结束通话按钮的动作</string>
     <string name="dialog_title_end_button">选择动作</string>
     
-    <string name="applications_title">应用程序</string>
-    
     <string name="title_pin_home">内存中的应用程序</string>
     <string name="summary_on_pin_home">尝试保留桌面应用程序到内存</string>
     <string name="summary_off_pin_home">不把桌面应用程序锁定在内存</string>
 
-    <string name="title_launcher_orientation">屏幕旋转</string>
-    <string name="summary_on_launcher_orientation">使用加速及自动旋转屏幕</string>
-    <string name="summary_off_launcher_orientation">不旋转屏幕</string>
-
-    <string name="battery_status_title">电池状态显示</string>
-    <string name="battery_status_summary_on">在状态栏显示电量百分比</string>
-    <string name="battery_status_summary_off">不显示电量百分比</string>
-
-	<string name="title_compcache_enabled">压缩缓存</string>
-	<string name="summary_on_compcache_enabled">启用压缩缓存</string>
-	<string name="summary_off_compcache_enabled">禁用压缩缓存</string>
-	
+    <string name="title_compcache_enabled">压缩缓存</string>
+    <string name="summary_on_compcache_enabled">启用压缩缓存</string>
+    <string name="summary_off_compcache_enabled">禁用压缩缓存</string>
+    
     <!-- Sound & display settings screen, compatibility mode check box label -->
     <string name="compatibility_mode_title">兼容模式</string>
     <!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
diff --git a/apps/SpareParts/res/values/strings.xml b/apps/SpareParts/res/values/strings.xml
index 458b97444..60287ce9e 100644
--- a/apps/SpareParts/res/values/strings.xml
+++ b/apps/SpareParts/res/values/strings.xml
@@ -57,53 +57,43 @@
     <string name="summary_end_button">Select End (red) button action</string>
     <string name="dialog_title_end_button">Select End button</string>
     
-    <string name="applications_title">Applications</string>
-    
     <string name="title_pin_home">Launcher in memory</string>
     <string name="summary_on_pin_home">Launcher will attempt to to stay in memory</string>
     <string name="summary_off_pin_home">Launcher will not be locked in memory</string>
 
-    <string name="title_launcher_orientation">Launcher rotation</string>
-    <string name="summary_on_launcher_orientation">Launcher will auto-orientate using accelerometer</string>
-    <string name="summary_off_launcher_orientation">Launcher will not auto-orientate</string>
-
-    <string name="title_launcher_columns">Compact launcher</string>
-    <string name="summary_on_launcher_columns">5 columns of icons per row (requires restart)</string>
-    <string name="summary_off_launcher_columns">4 columns of icons per row (requires restart)</string>
-
     <string name="battery_status_title">Battery status display</string>
     <string name="battery_status_summary_on">Battery percentage will be displayed in status bar</string>
     <string name="battery_status_summary_off">Battery percentage will not be displayed in status bar</string>    
     <string name="battery_status_color_title">Battery percentage color</string>
 
-	<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>
+    <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 -->
+    <!-- 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_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_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_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>
+    <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>
     <!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
diff --git a/apps/SpareParts/res/xml/spare_parts.xml b/apps/SpareParts/res/xml/spare_parts.xml
index b49e307f9..e6bb4e74c 100644
--- a/apps/SpareParts/res/xml/spare_parts.xml
+++ b/apps/SpareParts/res/xml/spare_parts.xml
@@ -107,24 +107,6 @@
             android:summaryOn="@string/summary_on_compcache_enabled"
             android:summaryOff="@string/summary_off_compcache_enabled" />
 
-    </PreferenceCategory>
-            
-    <PreferenceCategory
-        android:title="@string/applications_title">
-
-        <CheckBoxPreference
-            android:key="launcher_orientation"
-            android:title="@string/title_launcher_orientation"
-            android:summaryOn="@string/summary_on_launcher_orientation"
-            android:summaryOff="@string/summary_off_launcher_orientation" />
-
-        <CheckBoxPreference
-            android:key="launcher_columns"
-            android:title="@string/title_launcher_columns"
-            android:summaryOn="@string/summary_on_launcher_columns"
-            android:summaryOff="@string/summary_off_launcher_columns" />
-
-        
         <CheckBoxPreference
             android:key="pin_home"
             android:title="@string/title_pin_home"
diff --git a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
index cbbde31f5..5c4f900cf 100644
--- a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
+++ b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
@@ -69,8 +69,6 @@ public class SpareParts extends PreferenceActivity
     private static final String END_BUTTON_PREF = "end_button";
     private static final String KEY_COMPATIBILITY_MODE = "compatibility_mode";
     private static final String PIN_HOME_PREF = "pin_home";
-    private static final String LAUNCHER_ORIENTATION_PREF = "launcher_orientation";
-    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";
     
@@ -125,8 +123,6 @@ public class SpareParts extends PreferenceActivity
     private ListPreference mEndButtonPref;
     private CheckBoxPreference mCompatibilityMode;
     private CheckBoxPreference mPinHomePref;
-    private CheckBoxPreference mLauncherOrientationPref;
-    private CheckBoxPreference mLauncherColumnPref;
     private CheckBoxPreference mBatteryStatusPref;
     private CheckBoxPreference mCompcachePref;
     private CheckBoxPreference mShowClockPref;
@@ -202,8 +198,6 @@ public class SpareParts extends PreferenceActivity
         mEndButtonPref = (ListPreference) prefSet.findPreference(END_BUTTON_PREF);
         mEndButtonPref.setOnPreferenceChangeListener(this);
         mPinHomePref = (CheckBoxPreference) prefSet.findPreference(PIN_HOME_PREF);
-        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);
@@ -263,12 +257,6 @@ public class SpareParts extends PreferenceActivity
             mPinHomePref.setChecked(Settings.System.getInt(
                     getContentResolver(),
                     "pin_home_in_memory", 0) != 0);
-            mLauncherOrientationPref.setChecked(Settings.System.getInt(
-                    getContentResolver(),
-                    "launcher_orientation", 0) != 0);
-            mLauncherColumnPref.setChecked(Settings.System.getInt(
-                    getContentResolver(),
-                    Settings.System.LAUNCHER_COLUMN_NUMBER, 5) != 4);
             mBatteryStatusPref.setChecked(Settings.System.getInt(
                     getContentResolver(),
                     Settings.System.BATTERY_PERCENTAGE_STATUS_ICON, 0) != 0);
@@ -857,13 +845,6 @@ public class SpareParts extends PreferenceActivity
         } else if (PIN_HOME_PREF.equals(key)) {
             Settings.System.putInt(getContentResolver(), "pin_home_in_memory",
                     mPinHomePref.isChecked() ? 1 : 0);
-        } else if (LAUNCHER_ORIENTATION_PREF.equals(key)) {
-            Settings.System.putInt(getContentResolver(), "launcher_orientation",
-                    mLauncherOrientationPref.isChecked() ? 1 : 0);
-        } else if (LAUNCHER_COLUMN_PREF.equals(key)) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.LAUNCHER_COLUMN_NUMBER,
-                    mLauncherColumnPref.isChecked() ? 5 : 4);
         } else if (BATTERY_STATUS_PREF.equals(key)) {
             Settings.System.putInt(getContentResolver(),
                     Settings.System.BATTERY_PERCENTAGE_STATUS_ICON,