4 files changed, 42 insertions, 46 deletions
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>