[2/3] OmniGears: setting search index fixes
for propper creating we must provide our dashboard entries
directly in the xml file and not via manifest contribution
and while we are here fix all the wrong ListPreferences
added for left clock - must have persistent = false
Change-Id: I6ef79883202c564c05891b39b5815496401e7df5
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 5589644..803b958 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="bars_settings"
+ android:title="@string/bars_settings_title" >
<PreferenceCategory
android:key="category_statusbar"
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index c5ef473..ad962fb 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -15,7 +15,9 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="led_settings"
+ android:title="@string/battery_light_settings_title" >
<org.omnirom.omnigears.preference.SystemSettingSwitchPreference
android:key="battery_light_enabled"
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
index 27f7ae2..928a649 100644
--- a/res/xml/button_brightness_settings.xml
+++ b/res/xml/button_brightness_settings.xml
@@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="button_brightness"
+ android:title="@string/button_backlight_title" >
<org.omnirom.omnigears.preference.SystemSettingSwitchPreference
android:key="button_backlight_enable"
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index b83d291..95c38d5 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="button_settings"
+ android:title="@string/button_settings_title" >
<PreferenceCategory
android:key="button_volume_keys"
diff --git a/res/xml/display_rotation.xml b/res/xml/display_rotation.xml
index 6831c33..38f0fa4 100644
--- a/res/xml/display_rotation.xml
+++ b/res/xml/display_rotation.xml
@@ -15,8 +15,9 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/display_rotation_title"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="rotation_settings"
+ android:title="@string/display_rotation_title" >
<SwitchPreference
android:key="accelerometer"
diff --git a/res/xml/global_actions.xml b/res/xml/global_actions.xml
index 2748338..a317a03 100644
--- a/res/xml/global_actions.xml
+++ b/res/xml/global_actions.xml
@@ -16,8 +16,9 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="global_actions"
- android:title="@string/global_actions_title">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="global_actions"
+ android:title="@string/global_actions_title">
<PreferenceCategory
android:key="global_actions_anim"
diff --git a/res/xml/omni_dashboard_fragment.xml b/res/xml/omni_dashboard_fragment.xml
index 78cd6c7..0802e18 100644
--- a/res/xml/omni_dashboard_fragment.xml
+++ b/res/xml/omni_dashboard_fragment.xml
@@ -17,4 +17,49 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/header_category_omni">
+
+ <Preference
+ android:key="style_settings"
+ android:title="@string/style_settings_title"
+ android:summary="@string/style_settings_summary"
+ android:icon="@drawable/ic_settings_style"
+ android:fragment="org.omnirom.omnigears.interfacesettings.StyleSettings" />
+
+ <Preference
+ android:key="device_parts"
+ android:title="@string/omni_device_parts"
+ android:icon="@drawable/ic_settings_omnigears"
+ android:fragment="org.omnirom.device.DeviceParts" />
+
+ <Preference
+ android:key="button_settings"
+ android:title="@string/button_settings_title"
+ android:icon="@drawable/ic_settings_buttons"
+ android:fragment="org.omnirom.omnigears.ButtonSettings" />
+
+ <Preference
+ android:key="bars_settings"
+ android:title="@string/bars_settings_title"
+ android:icon="@drawable/ic_bars_tile"
+ android:fragment="org.omnirom.omnigears.interfacesettings.BarsSettings" />
+
+ <Preference
+ android:key="rotation_settings"
+ android:title="@string/display_rotation_title"
+ android:summary="@string/display_rotation_summary"
+ android:icon="@drawable/ic_display_rotation_tile"
+ android:fragment="org.omnirom.omnigears.DisplayRotation" />
+
+ <Preference
+ android:key="led_settings"
+ android:title="@string/battery_light_settings_title"
+ android:icon="@drawable/ic_settings_leds"
+ android:fragment="org.omnirom.omnigears.batterylight.BatteryLightSettings" />
+
+ <Preference
+ android:key="more_settings"
+ android:title="@string/more_settings_title"
+ android:icon="@drawable/ic_settings_more"
+ android:fragment="org.omnirom.omnigears.moresettings.MoreSettings"
+ android:order="10" />
</PreferenceScreen>
diff --git a/res/xml/statusbar_battery_settings.xml b/res/xml/statusbar_battery_settings.xml
index 4ecf0c6..103f10a 100644
--- a/res/xml/statusbar_battery_settings.xml
+++ b/res/xml/statusbar_battery_settings.xml
@@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/battery_title"
+ android:key="statusbar_battery">
<ListPreference
android:key="statusbar_battery_style"
diff --git a/res/xml/statusbar_clock_settings.xml b/res/xml/statusbar_clock_settings.xml
index e345434..d2ae3c7 100644
--- a/res/xml/statusbar_clock_settings.xml
+++ b/res/xml/statusbar_clock_settings.xml
@@ -13,8 +13,10 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/clock_title"
+ android:key="statusbar_clock">
<org.omnirom.omnigears.preference.SystemSettingSwitchPreference
android:key="status_bar_clock"
@@ -32,7 +34,8 @@
android:entries="@array/clock_style_entries"
android:entryValues="@array/clock_style_values"
android:title="@string/clock_title_enable"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
<ListPreference
android:key="status_bar_am_pm"
@@ -40,7 +43,8 @@
android:title="@string/status_bar_am_pm_title"
android:entries="@array/entries_status_bar_am_pm"
android:entryValues="@array/values_status_bar_am_pm"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
<ListPreference
android:key="clock_date_display"
@@ -48,28 +52,32 @@
android:summary="@string/clock_date_display_summary"
android:entries="@array/clock_date_display_entries"
android:entryValues="@array/clock_date_display_values"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
<ListPreference
android:key="clock_date_style"
android:title="@string/clock_date_style"
android:entries="@array/clock_date_style_entries"
android:entryValues="@array/clock_date_style_values"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
<ListPreference
android:key="clock_date_position"
android:title="@string/clock_date_position"
android:entries="@array/clock_date_position_entries"
android:entryValues="@array/clock_date_position_values"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
<ListPreference
android:key="clock_date_format"
android:title="@string/clock_date_format"
android:entries="@array/clock_date_format_entries_values"
android:entryValues="@array/clock_date_format_entries_values"
- android:dependency="status_bar_clock" />
+ android:dependency="status_bar_clock"
+ android:persistent="false" />
</PreferenceScreen>
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
index 639a2ce..b03adb2 100644
--- a/res/xml/style_settings.xml
+++ b/res/xml/style_settings.xml
@@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="style_settings"
+ android:title="@string/style_settings_title" >
<PreferenceCategory
android:key="category_theming"
diff --git a/res/xml/volume_steps.xml b/res/xml/volume_steps.xml
index e495ee7..c025273 100644
--- a/res/xml/volume_steps.xml
+++ b/res/xml/volume_steps.xml
@@ -12,8 +12,9 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/volume_steps_title"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/volume_steps_title"
+ android:key="volume_steps">
<ListPreference
android:key="volume_steps_music"