CrespoParts: Cleanup unused strings

Patch set 1 - Removed unused strings
              Make deepidle stats dependent of deepidle activated in kernel

Patch Set 2 - Reworked Idle Stats disabling. Justin White <just6979@gmail.com>

Patch set 3 - Fixed code style - removed tabs

Change-Id: Ia489a657742227f32c82dfa74237229619782d53

12 files changed, 46 insertions, 81 deletions

diff --git a/CrespoParts/AndroidManifest.xml b/CrespoParts/AndroidManifest.xml
index 12b1009..c0abbdf 100644
--- a/CrespoParts/AndroidManifest.xml
+++ b/CrespoParts/AndroidManifest.xml
@@ -25,7 +25,6 @@
 
         <activity android:name=".GeneralFragmentActivity" />
         <activity android:name=".DisplayFragmentActivity" />
-        <activity android:name=".SoundFragmentActivity" />
     </application>
 
 </manifest>
diff --git a/CrespoParts/res/values-da/strings.xml b/CrespoParts/res/values-da/strings.xml
index a3c8b39..9244ed8 100644
--- a/CrespoParts/res/values-da/strings.xml
+++ b/CrespoParts/res/values-da/strings.xml
@@ -10,9 +10,5 @@
     <string name="color_blue_title">Blå</string>
 
     <string name="category_touchkey_title">Touch Knapper</string>
-    <string name="backlight_timeout_title_head">Baggrundslys Timeout</string>
-    <string name="backlight_timeout_summary_head">Indstil forsinkelsen for hvornår touch knappernes lys skal slukkes</string>
-    <string name="blink_timeout_title_head">Blink Timeout</string>
-    <string name="blink_timeout_summary_head">Indstil forsinkelsen for hvornår touch knappernes blink lys automatisk skal slukkes efter en notifikation</string>
 
 </resources>
diff --git a/CrespoParts/res/values-de/strings.xml b/CrespoParts/res/values-de/strings.xml
index 77189bb..12e1a72 100644
--- a/CrespoParts/res/values-de/strings.xml
+++ b/CrespoParts/res/values-de/strings.xml
@@ -36,10 +36,12 @@
     <string name="credits_presets">Dank an: ale.landra91 cpaixao provolinoo</string>
 
 
-    <string name="category_touchkey_title">Touch Keys</string>
+    <string name="category_touchkey_title">Sensortasten</string>
     <string name="touchkey_notification_title_head">Hintergrundbeleuchtung</string>
     <string name="touchkey_notification_summary_head">Die Hintergrundbeleuchtung wird nach erhalten einer Nachricht aktiviert.</string>
-
+    <string name="bld_title">Abschalten nach</string>
+    <string name="bld_tuning_title_head">Automatisches Abschalten</string>
+    <string name="bld_tuning_summary_head">Zeit nach der die Hintergrundbeleuchtung abgeschaltet wird.\n(0 = kein automatisches Abschalten)</string>
     <string name="category_radio_title">Mobilfunk</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">HSDPA/HSUPA aktivieren</string>
diff --git a/CrespoParts/res/values-es/strings.xml b/CrespoParts/res/values-es/strings.xml
index d48f7c1..8ee0d3e 100644
--- a/CrespoParts/res/values-es/strings.xml
+++ b/CrespoParts/res/values-es/strings.xml
@@ -10,9 +10,5 @@
     <string name="color_blue_title">Azul</string>
 
     <string name="category_touchkey_title">Teclas</string>
-    <string name="backlight_timeout_title_head">Tiempo de luz teclado</string>
-    <string name="backlight_timeout_summary_head">Adjusta el tiempo al que se desactiva la luz de las teclas con la pantalla encendida</string>
-    <string name="blink_timeout_title_head">Tiempo de parpadeo</string>
-    <string name="blink_timeout_summary_head">Adjusta el tiempo al que deja de parpadear el teclado después de que llegue una notificación</string>
 
 </resources>
diff --git a/CrespoParts/res/values-fr/strings.xml b/CrespoParts/res/values-fr/strings.xml
index 600aa8c..ca86fa0 100644
--- a/CrespoParts/res/values-fr/strings.xml
+++ b/CrespoParts/res/values-fr/strings.xml
@@ -10,10 +10,6 @@
     <string name="color_blue_title">Bleu</string>
 
     <string name="category_touchkey_title">Touches tactiles</string>
-    <string name="backlight_timeout_title_head">Délai rétroéclairage</string>
-    <string name="backlight_timeout_summary_head">Régler le délai avant l\'extinction du rétroéclairage des touches tactiles</string>
-    <string name="blink_timeout_title_head">Délai clignotement</string>
-    <string name="blink_timeout_summary_head">Régler le délai avant l\'arrêt du clignotement du rétroéclairage des touches tactiles après une notification</string>
 
 </resources>
 
diff --git a/CrespoParts/res/values-ja/strings.xml b/CrespoParts/res/values-ja/strings.xml
index 37bafb8..6057b1c 100644
--- a/CrespoParts/res/values-ja/strings.xml
+++ b/CrespoParts/res/values-ja/strings.xml
@@ -12,10 +12,6 @@
     <string name="color_blue_title">青</string>
 
     <string name="category_touchkey_title">タッチキー</string>
-    <string name="backlight_timeout_title_head">バックライトのタイムアウト</string>
-    <string name="backlight_timeout_summary_head">タッチキーのバックライトが自動的にオフになるまでの遅延を調整する</string>
-    <string name="blink_timeout_title_head">点滅のタイムアウト</string>
-    <string name="blink_timeout_summary_head">タッチキーの点滅のバックライトが通知した後、自動的に消えるまでの遅延時間を調整する</string>
 
     <string name="category_radio_title">ラジオ</string>
     <string name="hspa_title_head">HSPA</string>
diff --git a/CrespoParts/res/values-nl/strings.xml b/CrespoParts/res/values-nl/strings.xml
index 6260c9a..f686065 100644
--- a/CrespoParts/res/values-nl/strings.xml
+++ b/CrespoParts/res/values-nl/strings.xml
@@ -10,9 +10,5 @@
     <string name="color_blue_title">Blauw</string>
 
     <string name="category_touchkey_title">Touch Keys</string>
-    <string name="backlight_timeout_title_head">Backlight Timeout</string>
-    <string name="backlight_timeout_summary_head">Pas de vertraging aan voor het touch key-backlight uitgaat</string>
-    <string name="blink_timeout_title_head">Blink Timeout</string>
-    <string name="blink_timeout_summary_head">Pas de vertraging aan voor het knipperend touch key-backlight uitgaat na een notificatie</string>
 
 </resources>
diff --git a/CrespoParts/res/values-pt-rPT/strings.xml b/CrespoParts/res/values-pt-rPT/strings.xml
index 4431cca..3186c71 100644
--- a/CrespoParts/res/values-pt-rPT/strings.xml
+++ b/CrespoParts/res/values-pt-rPT/strings.xml
@@ -10,10 +10,6 @@
     <string name="color_blue_title">Azul</string>
 
     <string name="category_touchkey_title">Botões Capacitivos</string>
-    <string name="backlight_timeout_title_head">Temporizador Luz de Fundo</string>
-    <string name="backlight_timeout_summary_head">Ajusta o tempo que as teclas capacitivas demoram a desligar a sua luz de fundo</string>
-    <string name="blink_timeout_title_head">Temporizador de Intermitência</string>
-    <string name="blink_timeout_summary_head">Ajusta o tempo que as teclas demoram a desligar a retroiluminação intermitente após notificação.</string>
 
     <string name="category_radio_title">Radio</string>
     <string name="hspa_title_head">HSPA</string>
diff --git a/CrespoParts/res/values-ru/strings.xml b/CrespoParts/res/values-ru/strings.xml
index 2bcbe46..f303381 100644
--- a/CrespoParts/res/values-ru/strings.xml
+++ b/CrespoParts/res/values-ru/strings.xml
@@ -12,10 +12,6 @@
     <string name="color_blue_title">Синий</string>
 
     <string name="category_touchkey_title">Сенсорные кнопки</string>
-    <string name="backlight_timeout_title_head">Таймаут подсветки</string>
-    <string name="backlight_timeout_summary_head">Как долго работает подсветка сенсорных кнопок</string>
-    <string name="blink_timeout_title_head">Таймаут мигания</string>
-    <string name="blink_timeout_summary_head">Как долго будут мигать сенсорные кнопки после уведомления</string>
 
     <string name="category_radio_title">Радиомодуль</string>
     <string name="hspa_title_head">HSPA</string>
diff --git a/CrespoParts/res/values-tr/strings.xml b/CrespoParts/res/values-tr/strings.xml
index 8f1e947..485f433 100644
--- a/CrespoParts/res/values-tr/strings.xml
+++ b/CrespoParts/res/values-tr/strings.xml
@@ -11,9 +11,5 @@
     <string name="color_blue_title">Mavi</string>
 
     <string name="category_touchkey_title">Dokunmatik tuşlar</string>
-    <string name="backlight_timeout_title_head">Arka ışık zaman aşımı</string>
-    <string name="backlight_timeout_summary_head">Dokunmatik tuşa ışığı otomatik kapanmadan önceki gecikmeyi ayarlayın</string>
-    <string name="blink_timeout_title_head">Yanıp sönme zaman aşımı</string>
-    <string name="blink_timeout_summary_head">Bir bildirim sonrası dokunmatik tuşun yanıp söner arka ışığın otomatik kapanmadan önceki gecikmeyi ayarlayın.</string>
 
 </resources>
diff --git a/CrespoParts/res/values-zh-rTW/strings.xml b/CrespoParts/res/values-zh-rTW/strings.xml
index 9f2ec87..2bea575 100644
--- a/CrespoParts/res/values-zh-rTW/strings.xml
+++ b/CrespoParts/res/values-zh-rTW/strings.xml
@@ -12,10 +12,6 @@
     <string name="color_blue_title">藍</string>
 
     <string name="category_touchkey_title">觸控鍵</string>
-    <string name="backlight_timeout_title_head">背光逾時</string>
-    <string name="backlight_timeout_summary_head">調整觸控鍵背光自動關閉前的延遲時間</string>
-    <string name="blink_timeout_title_head">閃爍逾時</string>
-    <string name="blink_timeout_summary_head">調整觸控鍵閃爍通知自動關閉前的延遲時間</string>
 
     <string name="category_radio_title">行動網路</string>
     <string name="hspa_title_head">HSPA</string>
diff --git a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
index d437997..613bc24 100644
--- a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
+++ b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
@@ -48,6 +48,7 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre
 
     private CheckBoxPreference mDeepIdle;
     private CheckBoxPreference mNotification;
+    private PreferenceScreen mIdleStats;
     private bldTuningPreference mbldTuning;
 
     @Override
@@ -59,11 +60,14 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre
         PreferenceScreen prefSet = getPreferenceScreen();
         mDeepIdle = (CheckBoxPreference) findPreference(DeviceSettings.KEY_DEEPIDLE);
         mNotification = (CheckBoxPreference) findPreference(DeviceSettings.KEY_NOTIFICATION);
+        mIdleStats = (PreferenceScreen) findPreference(DeviceSettings.KEY_DEEPIDLE_STATS);
 
         if (isSupported(CPU_DEEPIDLE_FILE)) {
             mDeepIdle.setChecked(PREF_ENABLED.equals(Utils.readOneLine(CPU_DEEPIDLE_FILE)));
+            mIdleStats.setOnPreferenceClickListener(this);
         } else {
             mDeepIdle.setEnabled(false);
+            mIdleStats.setEnabled(false);
         }
 
         if (isSupported(TOUCHKEY_NOTIFICATION_FILE)) {
@@ -72,10 +76,6 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre
             mNotification.setEnabled(false);
         }
 
-		Preference p = findPreference(DeviceSettings.KEY_DEEPIDLE_STATS);
-		if(p != null)
-			p.setOnPreferenceClickListener(this);
-
         mbldTuning = (bldTuningPreference) findPreference(DeviceSettings.KEY_BLD_TUNING);
         if(mbldTuning != null)
             mbldTuning.setEnabled(bldTuningPreference.isSupported());
@@ -120,45 +120,45 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre
         }
     }
 
-	private void showIdleStatsDialog() {
-		// display dialog
-		final View content = getActivity().getLayoutInflater().inflate(R.layout.idle_stats_dialog, null);
+    private void showIdleStatsDialog() {
+        // display dialog
+        final View content = getActivity().getLayoutInflater().inflate(R.layout.idle_stats_dialog, null);
 
         String sStatsLine = Utils.readOneLine(CPU_DEEPIDLE_STATS);
         String[] sValues = sStatsLine.split(" ");
-		((TextView)content.findViewById(R.id.time1)).setText(sValues[0]);
-		((TextView)content.findViewById(R.id.time2)).setText(sValues[2]);
-		((TextView)content.findViewById(R.id.time3)).setText(sValues[4]);
-		((TextView)content.findViewById(R.id.avg1)).setText(sValues[1]);
-		((TextView)content.findViewById(R.id.avg2)).setText(sValues[3]);
-		((TextView)content.findViewById(R.id.avg3)).setText(sValues[5]);
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		builder.setTitle(getString(R.string.label_deepidle_stats));
-		builder.setView(content);
-		builder.setPositiveButton(getString(R.string.label_reset), new OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				Utils.writeValue(CPU_DEEPIDLE_RESET, "1");
-				dialog.dismiss();
-			}
-		});
-		builder.setNegativeButton(getString(R.string.label_close), new OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				dialog.dismiss();
-			}
-		});
-		builder.show();
-	}
-	
-	@Override
-	public boolean onPreferenceClick(Preference preference) {
-		boolean ret = false;
-		if(preference.getKey().equals(DeviceSettings.KEY_DEEPIDLE_STATS)) {
-			showIdleStatsDialog();
-			ret = true;
-		}
-		return ret;
-	}
+        ((TextView)content.findViewById(R.id.time1)).setText(sValues[0]);
+        ((TextView)content.findViewById(R.id.time2)).setText(sValues[2]);
+        ((TextView)content.findViewById(R.id.time3)).setText(sValues[4]);
+        ((TextView)content.findViewById(R.id.avg1)).setText(sValues[1]);
+        ((TextView)content.findViewById(R.id.avg2)).setText(sValues[3]);
+        ((TextView)content.findViewById(R.id.avg3)).setText(sValues[5]);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(getString(R.string.label_deepidle_stats));
+        builder.setView(content);
+        builder.setPositiveButton(getString(R.string.label_reset), new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Utils.writeValue(CPU_DEEPIDLE_RESET, "1");
+                dialog.dismiss();
+            }
+        });
+        builder.setNegativeButton(getString(R.string.label_close), new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        builder.show();
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        boolean ret = false;
+        if(preference.getKey().equals(DeviceSettings.KEY_DEEPIDLE_STATS)) {
+            showIdleStatsDialog();
+            ret = true;
+        }
+        return ret;
+    }
 }