From 6bace11c22ecb3746739c8e786a7dba43f0712d4 Mon Sep 17 00:00:00 2001
From: Brandon Bennett <bennetb@gmail.com>
Date: Sat, 10 Nov 2012 19:21:35 -0700
Subject: Remove tabs from GNexusParts

Although the tabs are pretty and shows off some of the nice features
of Androud ICS/JB they are against the design guidelines.  Having
a tab for a single item is inefficient and it doesn't match the
rest of the settings.

This moves all the tabs to PreferenceCategories and have all
settings on one page.

Changeset 2+3+4+5: Fix whitespace and tab fail.

Change-Id: I36fe8b1611ccc345ceab534b01f4dc9a97fef70c
---
 GNexusParts/res/values-de/strings.xml         |  6 ----
 GNexusParts/res/values-es/strings.xml         |  7 -----
 GNexusParts/res/values-ja/strings.xml         |  6 ----
 GNexusParts/res/values-nl/strings.xml         |  3 --
 GNexusParts/res/values-pt/strings.xml         |  4 ---
 GNexusParts/res/values-ru/strings.xml         |  7 -----
 GNexusParts/res/values/strings.xml            | 10 ++-----
 GNexusParts/res/xml/display_preferences.xml   | 19 ------------
 GNexusParts/res/xml/general_preferences.xml   | 16 ----------
 GNexusParts/res/xml/overclock_preferences.xml | 11 -------
 GNexusParts/res/xml/preferences.xml           | 42 +++++++++++++++++++++++++++
 11 files changed, 44 insertions(+), 87 deletions(-)
 delete mode 100755 GNexusParts/res/xml/display_preferences.xml
 delete mode 100644 GNexusParts/res/xml/general_preferences.xml
 delete mode 100644 GNexusParts/res/xml/overclock_preferences.xml
 create mode 100644 GNexusParts/res/xml/preferences.xml

(limited to 'GNexusParts/res')

diff --git a/GNexusParts/res/values-de/strings.xml b/GNexusParts/res/values-de/strings.xml
index af6da0c..89d6fc3 100644
--- a/GNexusParts/res/values-de/strings.xml
+++ b/GNexusParts/res/values-de/strings.xml
@@ -2,12 +2,6 @@
 <resources>
     <string name="app_name">Galaxy Nexus Einstellungen</string>
 
-    <!-- Page Headers -->
-    <string name="general_title">ALLGEMEIN</string>
-    <string name="display_title">BILDSCHIRM</string>
-
-    <string name="category_cpu_title">Prozessor</string>
-    <string name="category_screen_title">WM8994 Einstellungen ( voodoo )</string>
     <string name="color_tuning_title_head">Farbmultiplikator</string>
     <string name="color_tuning_summary_head">Farbmultiplikator einstellen</string>
     <string name="gamma_tuning_title_head">Gammakorrektur</string>
diff --git a/GNexusParts/res/values-es/strings.xml b/GNexusParts/res/values-es/strings.xml
index 90eaee0..137d9f7 100644
--- a/GNexusParts/res/values-es/strings.xml
+++ b/GNexusParts/res/values-es/strings.xml
@@ -2,12 +2,6 @@
 <resources>
     <string name="app_name">Ajustes Galaxy Nexus</string>
 
-    <!-- Page Headers -->
-    <string name="general_title">GENERAL</string>
-    <string name="display_title">PANTALLA</string>
-
-    <string name="category_cpu_title">CPU</string>
-    <string name="category_screen_title">Ajustes WM8994 ( voodoo )</string>
     <string name="color_tuning_title_head">Multiplicadores del color</string>
     <string name="color_tuning_summary_head">Calibrar los multiplicadores del color</string>
     <string name="gamma_tuning_title_head">Gamma</string>
@@ -50,7 +44,6 @@
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Habilitar HSDPA/HSUPA</string>
 
-    <string name="category_speed_title">GPU</string>
     <string name="category_gpu_title">GPU</string>
     <string name="gpu_overclock_title">Velocidad del procesador gráfico</string>
 
diff --git a/GNexusParts/res/values-ja/strings.xml b/GNexusParts/res/values-ja/strings.xml
index 357a2d8..4fc5f26 100644
--- a/GNexusParts/res/values-ja/strings.xml
+++ b/GNexusParts/res/values-ja/strings.xml
@@ -2,12 +2,6 @@
 <resources>
     <string name="app_name">Galaxy Nexus 設定</string>
 
-    <!-- Page Headers -->
-    <string name="general_title">一般</string>
-    <string name="display_title">ディスプレイ</string>
-
-    <string name="category_cpu_title">CPU</string>
-    <string name="category_screen_title">WM8994設定 ( voodoo )</string>
     <string name="color_tuning_title_head">カラーマルチプライヤチューニング</string>
     <string name="color_tuning_summary_head">画面の色味を調整する</string>
     <string name="gamma_tuning_title_head">カラーガンマ調整</string>
diff --git a/GNexusParts/res/values-nl/strings.xml b/GNexusParts/res/values-nl/strings.xml
index 414f3af..0e2718f 100644
--- a/GNexusParts/res/values-nl/strings.xml
+++ b/GNexusParts/res/values-nl/strings.xml
@@ -15,9 +15,6 @@
 -->
 <resources>
     <string name="app_name">Galaxy Nexus-instellingen</string>
-    <string name="general_title">ALGEMEEN</string>
-    <string name="display_title">WEERGAVE</string>
-    <string name="category_screen_title">WM8994-instellingen (voodoo)</string>
     <string name="color_tuning_title_head">Kleurenmultiplicatoren afstemmen</string>
     <string name="color_tuning_summary_head">Kalibreer multiplicatoren van schermkleur</string>
     <string name="gamma_tuning_title_head">Kleurengamma afstemmen</string>
diff --git a/GNexusParts/res/values-pt/strings.xml b/GNexusParts/res/values-pt/strings.xml
index 0ccff92..af5be55 100755
--- a/GNexusParts/res/values-pt/strings.xml
+++ b/GNexusParts/res/values-pt/strings.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Configurações Galaxy Nexus</string>
-    <string name="general_title">Geral</string>
-    <string name="display_title">Tela</string>
-    <string name="category_cpu_title">CPU</string>
-    <string name="category_screen_title">Configurações VM8994 ( voodoo )</string>
     <string name="color_tuning_title_head">Ajustar Multiplicadores de Cor</string>
     <string name="color_tuning_summary_head">Calibrar multiplicadores de cor de tela</string>
     <string name="gamma_tuning_title_head">Ajustar Cor Gama</string>
diff --git a/GNexusParts/res/values-ru/strings.xml b/GNexusParts/res/values-ru/strings.xml
index cfc65a3..898c894 100644
--- a/GNexusParts/res/values-ru/strings.xml
+++ b/GNexusParts/res/values-ru/strings.xml
@@ -2,12 +2,6 @@
 <resources>
     <string name="app_name">Настройки Galaxy Nexus</string>
 
-    <!-- Page Headers -->
-    <string name="general_title">ОСНОВНЫЕ</string>
-    <string name="display_title">ДИСПЛЕЙ</string>
-
-    <string name="category_cpu_title">ЦП</string>
-    <string name="category_screen_title">Настройки WM8994 ( voodoo )</string>
     <string name="color_tuning_title_head">Настройка цвета мультипликатора</string>
     <string name="color_tuning_summary_head">Калибровка цвета мультипликатора</string>
     <string name="gamma_tuning_title_head">Настройка цветовой гаммы</string>
@@ -49,7 +43,6 @@
     <string name="category_radio_title">Радио</string>
     <string name="hspa_summary_head">Включить HSDPA/HSUPA</string>
 
-    <string name="category_speed_title">Графический процессор</string>
     <string name="category_gpu_title">Графический процессор</string>
     <string name="gpu_overclock_title">Тактовая частота</string>
 </resources>
diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml
index 1d0f046..70c1125 100644
--- a/GNexusParts/res/values/strings.xml
+++ b/GNexusParts/res/values/strings.xml
@@ -2,12 +2,7 @@
 <resources>
     <string name="app_name">Galaxy Nexus Settings</string>
 
-    <!-- Page Headers -->
-    <string name="general_title">GENERAL</string>
-    <string name="display_title">DISPLAY</string>
-
-    <string name="category_cpu_title">CPU</string>
-    <string name="category_screen_title">WM8994 Settings ( voodoo )</string>
+    <string name="category_display_title">Display</string>
     <string name="color_tuning_title_head">Color Multipliers Tuning</string>
     <string name="color_tuning_summary_head">Calibrate multipliers screen color</string>
     <string name="gamma_tuning_title_head">Color Gamma Tuning</string>
@@ -26,7 +21,7 @@
     <string name="color_warning">Values higher than 200 are not recommended</string>
     <string name="gamma_dss_title">DSS Gamma Set.</string>
 
-    <string name="category_hardware_title">CPU</string>
+    <string name="category_hardware_title">Hardware</string>
     <string name="vibrator_tuning_title_head">Vibrator feedback tuning</string>
     <string name="vibrator_tuning_summary_head">Controls the default power of vibrator feedback</string>
 
@@ -50,7 +45,6 @@
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
 
-    <string name="category_speed_title">GPU</string>
     <string name="category_gpu_title">GPU</string>
     <string name="gpu_overclock_title">Clock Speed</string>
 
diff --git a/GNexusParts/res/xml/display_preferences.xml b/GNexusParts/res/xml/display_preferences.xml
deleted file mode 100755
index 9fea40f..0000000
--- a/GNexusParts/res/xml/display_preferences.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/app_name">
-
-    <!-- Color tuning -->
-    <com.cyanogenmod.settings.device.ColorTuningPreference
-        android:key="color_tuning"
-        android:title="@string/color_tuning_title_head"
-        android:summary="@string/color_tuning_summary_head" />
-    <com.cyanogenmod.settings.device.GammaTuningPreference
-        android:key="gamma_tuning"
-        android:title="@string/gamma_tuning_title_head"
-        android:summary="@string/gamma_tuning_summary_head" />
-    <com.cyanogenmod.settings.device.ColorHackPresets
-        android:key="colorgamma_presets"
-        android:title="@string/color_hack_presets_title_head"
-        android:summary="@string/color_hack_presets_summary_head" />
-
-</PreferenceScreen>
diff --git a/GNexusParts/res/xml/general_preferences.xml b/GNexusParts/res/xml/general_preferences.xml
deleted file mode 100644
index 73c1495..0000000
--- a/GNexusParts/res/xml/general_preferences.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- General settings -->
-    <PreferenceCategory android:key="category_hardware"
-        android:title="@string/category_hardware_title">
-    <com.cyanogenmod.settings.device.VibratorTuningPreference
-        android:key="vibrator_tuning"
-        android:title="@string/vibrator_tuning_title_head"
-        android:summary="@string/vibrator_tuning_summary_head"
-        />
-
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/GNexusParts/res/xml/overclock_preferences.xml b/GNexusParts/res/xml/overclock_preferences.xml
deleted file mode 100644
index 551275b..0000000
--- a/GNexusParts/res/xml/overclock_preferences.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ListPreference
-        android:key="gpu_overclock"
-        android:title="@string/gpu_overclock_title"
-        android:entries="@array/gpu_overclock_entries"
-        android:entryValues="@array/gpu_overclock_values"
-        android:defaultValue="0" />
-
-</PreferenceScreen>
diff --git a/GNexusParts/res/xml/preferences.xml b/GNexusParts/res/xml/preferences.xml
new file mode 100644
index 0000000..a71d274
--- /dev/null
+++ b/GNexusParts/res/xml/preferences.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/app_name">
+
+    <!-- Color tuning -->
+    <PreferenceCategory
+        android:key="category_display"
+        android:title="@string/category_display_title" >
+        <com.cyanogenmod.settings.device.ColorTuningPreference
+            android:key="color_tuning"
+            android:title="@string/color_tuning_title_head"
+            android:summary="@string/color_tuning_summary_head" />
+        <com.cyanogenmod.settings.device.GammaTuningPreference
+            android:key="gamma_tuning"
+            android:title="@string/gamma_tuning_title_head"
+            android:summary="@string/gamma_tuning_summary_head" />
+        <com.cyanogenmod.settings.device.ColorHackPresets
+            android:key="colorgamma_presets"
+            android:title="@string/color_hack_presets_title_head"
+            android:summary="@string/color_hack_presets_summary_head" />
+    </PreferenceCategory>
+
+    <!-- General settings -->
+    <PreferenceCategory android:key="category_hardware"
+        android:title="@string/category_hardware_title">
+        <com.cyanogenmod.settings.device.VibratorTuningPreference
+            android:key="vibrator_tuning"
+            android:title="@string/vibrator_tuning_title_head"
+            android:summary="@string/vibrator_tuning_summary_head" />
+    </PreferenceCategory>
+
+    <!-- GPU -->
+    <PreferenceCategory android:key="category_gpu"
+        android:title="@string/category_gpu_title">
+        <ListPreference
+            android:key="gpu_overclock"
+            android:title="@string/gpu_overclock_title"
+            android:entries="@array/gpu_overclock_entries"
+            android:entryValues="@array/gpu_overclock_values"
+            android:defaultValue="0" />
+    </PreferenceCategory>
+</PreferenceScreen>
-- 
cgit v1.1