Preferences: Cleanup

Change-Id: I8973c8c043755ed01e1bb6107b09bb0eb734e66a

6 files changed, 248 insertions, 177 deletions

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
deleted file mode 100644
index 4134402..0000000
--- a/res/xml/preferences.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
-    <!-- UI -->
-    <PreferenceCategory android:title="@string/preferences_interface_title">
-        <!-- Homescreen -->
-        <PreferenceScreen android:key="ui_homescreen"
-            android:title="@string/preferences_interface_homescreen_title">
-            <PreferenceCategory android:title="@string/preferences_interface_homescreen_general_category">
-                <com.cyanogenmod.trebuchet.preference.DoubleNumberPickerPreference android:key="ui_homescreen_grid"
-                    android:title="@string/preferences_interface_homescreen_general_grid_title"
-                    android:summary="@string/preferences_interface_homescreen_general_grid_summary"
-                    launcher:pickerTitle1="@string/preferences_interface_homescreen_general_grid_rows_title"
-                    launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title"
-                    launcher:defaultValue1="@integer/cell_count_x"
-                    launcher:defaultValue2="@integer/cell_count_y"
-                    launcher:max1="7"
-                    launcher:min1="3"
-                    launcher:max2="7"
-                    launcher:min2="3" />
-                <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screens"
-                    android:title="@string/preferences_interface_homescreen_general_screens_title"
-                    android:summary="@string/preferences_interface_homescreen_general_screens_summary"
-                    android:defaultValue="5"
-                    launcher:max="7"
-                    launcher:min="1" />
-                <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_default_screen"
-                    android:title="@string/preferences_interface_homescreen_general_default_screen_title"
-                    android:summary="@string/preferences_interface_homescreen_general_default_screen_summary"
-                    android:defaultValue="3"
-                    launcher:maxExternal="ui_homescreen_screens"
-                    launcher:max="7"
-                    launcher:min="1" />
-                <CheckBoxPreference android:key="ui_homescreen_stretch_screens"
-                    android:title="@string/preferences_interface_homescreen_general_stretch_screens_title"
-                    android:summary="@string/preferences_interface_homescreen_general_stretch_screens_summary" />
-                <CheckBoxPreference android:key="ui_homescreen_general_search"
-                    android:title="@string/preferences_interface_homescreen_general_search_title"
-                    android:summary="@string/preferences_interface_homescreen_general_search_summary"
-                    android:defaultValue="true" />
-                <CheckBoxPreference android:key="ui_homescreen_general_resize_any_widget"
-                    android:title="@string/preferences_interface_homescreen_general_resize_any_widget_title"
-                    android:summary="@string/preferences_interface_homescreen_general_resize_any_widget_summary" />
-                <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels"
-                    android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title"
-                    android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" />
-            </PreferenceCategory>
-            <PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category">
-                <ListPreference android:key="ui_homescreen_scrolling_transition_effect"
-                    android:title="@string/preferences_interface_homescreen_scrolling_transition_effect_title"
-                    android:summary="@string/preferences_interface_homescreen_scrolling_transition_effect_summary"
-                    android:entries="@array/preferences_interface_homescreen_scrolling_transition_effect_entries"
-                    android:entryValues="@array/preferences_interface_homescreen_scrolling_transition_effect_values"
-                    android:defaultValue="@string/config_workspaceDefaultTransitionEffect" />
-                <CheckBoxPreference android:key="ui_homescreen_scrolling_scroll_wallpaper"
-                    android:title="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_title"
-                    android:summary="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_summary"
-                    android:defaultValue="true" />
-                <CheckBoxPreference android:key="ui_homescreen_scrolling_wallpaper_hack"
-                    android:title="@string/preferences_interface_homescreen_scrolling_wallpaper_hack_title"
-                    android:summary="@string/preferences_interface_homescreen_scrolling_wallpaper_hack_summary"
-                    android:defaultValue="false" />
-                <CheckBoxPreference android:key="ui_homescreen_scrolling_fade_adjacent_screens"
-                    android:title="@string/preferences_interface_homescreen_scrolling_fade_adjacent_screens_title"
-                    android:summary="@string/preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary"
-                    android:defaultValue="@bool/config_workspaceDefualtFadeInAdjacentScreens" />
-                <CheckBoxPreference android:key="ui_homescreen_scrolling_show_outlines"
-                    android:title="@string/preferences_interface_homescreen_scrolling_show_outlines_title"
-                    android:summary="@string/preferences_interface_homescreen_scrolling_show_outlines_summary"
-                    android:defaultValue="@bool/config_workspaceDefaultShowOutlines" />
-            </PreferenceCategory>
-            <PreferenceCategory android:title="@string/preferences_interface_homescreen_indicator_category">
-                <CheckBoxPreference android:key="ui_homescreen_indicator_enable"
-                    android:title="@string/preferences_interface_homescreen_indicator_enable_title"
-                    android:summary="@string/preferences_interface_homescreen_indicator_enable_summary"
-                    android:defaultValue="true" />
-                <CheckBoxPreference android:key="ui_homescreen_indicator_fade"
-                    android:title="@string/preferences_interface_homescreen_indicator_fade_title"
-                    android:summary="@string/preferences_interface_homescreen_indicator_fade_summary"
-                    android:defaultValue="true"
-                    android:dependency="ui_homescreen_indicator_enable" />
-                <ListPreference android:key="ui_homescreen_indicator_position"
-                    android:title="@string/preferences_interface_homescreen_indicator_position_title"
-                    android:summary="@string/preferences_interface_homescreen_indicator_position_summary"
-                    android:entries="@array/preferences_interface_homescreen_indicator_position_entries"
-                    android:entryValues="@array/preferences_interface_homescreen_indicator_position_values"
-                    android:defaultValue="0"
-                    android:dependency="ui_homescreen_indicator_enable" />
-                <CheckBoxPreference android:key="ui_homescreen_indicator_background"
-                    android:title="@string/preferences_interface_homescreen_indicator_background_title"
-                    android:summary="@string/preferences_interface_homescreen_indicator_background_summary"
-                    android:defaultValue="true" />
-            </PreferenceCategory>
-        </PreferenceScreen>
-
-        <!-- Drawer -->
-        <PreferenceScreen android:key="ui_drawer"
-            android:title="@string/preferences_interface_drawer_title">
-            <ListPreference android:key="ui_drawer_orientation"
-                android:title="@string/preferences_interface_drawer_orientation_title"
-                android:summary="@string/preferences_interface_drawer_orientation_summary"
-                android:entries="@array/preferences_interface_drawer_orientation_entries"
-                android:entryValues="@array/preferences_interface_drawer_orientation_values"
-                android:defaultValue="horizontal" />
-            <PreferenceCategory android:title="@string/preferences_interface_drawer_widgets_category">
-                <CheckBoxPreference android:key="ui_drawer_widgets_join_apps"
-                    android:title="@string/preferences_interface_drawer_widgets_join_apps_title"
-                    android:summary="@string/preferences_interface_drawer_widgets_join_apps_summary"
-                    android:defaultValue="true" />
-            </PreferenceCategory>
-            <PreferenceCategory android:title="@string/preferences_interface_drawer_scrolling_category">
-                <ListPreference android:key="ui_drawer_scrolling_transition_effect"
-                    android:title="@string/preferences_interface_drawer_scrolling_transition_effect_title"
-                    android:summary="@string/preferences_interface_drawer_scrolling_transition_effect_summary"
-                    android:entries="@array/preferences_interface_drawer_scrolling_transition_effect_entries"
-                    android:entryValues="@array/preferences_interface_drawer_scrolling_transition_effect_values"
-                    android:defaultValue="@string/config_drawerDefaultTransitionEffect" />
-                <CheckBoxPreference android:key="ui_drawer_scrolling_fade_adjacent_screens"
-                    android:title="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_title"
-                    android:summary="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_summary" />
-            </PreferenceCategory>
-            <PreferenceCategory android:title="@string/preferences_interface_drawer_indicator_category">
-                <CheckBoxPreference android:key="ui_drawer_indicator_enable"
-                    android:title="@string/preferences_interface_drawer_indicator_enable_title"
-                    android:summary="@string/preferences_interface_drawer_indicator_enable_summary"
-                    android:defaultValue="true" />
-                <CheckBoxPreference android:key="ui_drawer_indicator_fade"
-                    android:title="@string/preferences_interface_drawer_indicator_fade_title"
-                    android:summary="@string/preferences_interface_drawer_indicator_fade_summary"
-                    android:defaultValue="true"
-                    android:dependency="ui_drawer_indicator_enable" />
-            </PreferenceCategory>
-        </PreferenceScreen>
-
-        <!-- Dock -->
-        <!-- <PreferenceScreen android:key="ui_dock"
-            android:title="@string/preferences_interface_dock_title">
-
-        </PreferenceScreen> -->
-
-        <!-- Icons -->
-        <!-- <PreferenceScreen android:key="ui_icons"
-            android:title="@string/preferences_interface_icons_title">
-
-        </PreferenceScreen> -->
-
-        <!-- General -->
-        <PreferenceScreen android:key="ui_general"
-            android:title="@string/preferences_interface_general_title">
-            <CheckBoxPreference android:key="ui_general_orientation"
-                android:title="@string/preferences_interface_general_orientation_title" />
-        </PreferenceScreen>
-
-    </PreferenceCategory>
-
-    <!-- Application -->
-    <PreferenceCategory android:title="@string/preferences_application_title">
-        <Preference android:key="application_version"
-            style="?android:preferenceInformationStyle"
-            android:summary="@string/application_copyright" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/preferences_dock.xml b/res/xml/preferences_dock.xml
new file mode 100644
index 0000000..10fabe2
--- /dev/null
+++ b/res/xml/preferences_dock.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+    android:key="ui_dock"
+    android:title="@string/preferences_interface_dock_title">
+    <CheckBoxPreference android:key="ui_dock_divider"
+        android:title="@string/preferences_interface_dock_divider_title"
+        android:summary="@string/preferences_interface_dock_divider_summary"
+        android:defaultValue="true" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/preferences_drawer.xml b/res/xml/preferences_drawer.xml
new file mode 100644
index 0000000..8cb6e4f
--- /dev/null
+++ b/res/xml/preferences_drawer.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+    android:key="ui_drawer"
+    android:title="@string/preferences_interface_drawer_title">
+    <ListPreference android:key="ui_drawer_orientation"
+        android:title="@string/preferences_interface_drawer_orientation_title"
+        android:summary="@string/preferences_interface_drawer_orientation_summary"
+        android:entries="@array/preferences_interface_drawer_orientation_entries"
+        android:entryValues="@array/preferences_interface_drawer_orientation_values"
+        android:defaultValue="horizontal" />
+    <PreferenceCategory android:title="@string/preferences_interface_drawer_widgets_category">
+        <CheckBoxPreference android:key="ui_drawer_widgets_join_apps"
+            android:title="@string/preferences_interface_drawer_widgets_join_apps_title"
+            android:summary="@string/preferences_interface_drawer_widgets_join_apps_summary"
+            android:defaultValue="true" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_interface_drawer_scrolling_category">
+        <ListPreference android:key="ui_drawer_scrolling_transition_effect"
+            android:title="@string/preferences_interface_drawer_scrolling_transition_effect_title"
+            android:summary="@string/preferences_interface_drawer_scrolling_transition_effect_summary"
+            android:entries="@array/preferences_interface_drawer_scrolling_transition_effect_entries"
+            android:entryValues="@array/preferences_interface_drawer_scrolling_transition_effect_values"
+            android:defaultValue="@string/config_drawerDefaultTransitionEffect" />
+        <CheckBoxPreference android:key="ui_drawer_scrolling_fade_adjacent_screens"
+            android:title="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_title"
+            android:summary="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_summary" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_interface_drawer_indicator_category">
+        <CheckBoxPreference android:key="ui_drawer_indicator_enable"
+            android:title="@string/preferences_interface_drawer_indicator_enable_title"
+            android:summary="@string/preferences_interface_drawer_indicator_enable_summary"
+            android:defaultValue="true" />
+        <CheckBoxPreference android:key="ui_drawer_indicator_fade"
+            android:title="@string/preferences_interface_drawer_indicator_fade_title"
+            android:summary="@string/preferences_interface_drawer_indicator_fade_summary"
+            android:defaultValue="true"
+            android:dependency="ui_drawer_indicator_enable" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
new file mode 100644
index 0000000..1385bd2
--- /dev/null
+++ b/res/xml/preferences_general.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+    android:key="ui_general"
+    android:title="@string/preferences_interface_general_title">
+    <CheckBoxPreference android:key="ui_general_orientation"
+        android:title="@string/preferences_interface_general_orientation_title" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml
new file mode 100644
index 0000000..b5d66f1
--- /dev/null
+++ b/res/xml/preferences_headers.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <header android:id="@+id/preferences_homescreen_section"
+            android:fragment="com.cyanogenmod.trebuchet.preference.Preferences$HomescreenFragment"
+            android:title="@string/preferences_interface_homescreen_title"
+            android:summary="@string/preferences_interface_homescreen_summary" />
+
+    <header android:id="@+id/preferences_drawer_section"
+            android:fragment="com.cyanogenmod.trebuchet.preference.Preferences$DrawerFragment"
+            android:title="@string/preferences_interface_drawer_title"
+            android:summary="@string/preferences_interface_drawer_summary" />
+            
+    <header android:id="@+id/preferences_dock_section"
+            android:fragment="com.cyanogenmod.trebuchet.preference.Preferences$DockFragment"
+            android:title="@string/preferences_interface_dock_title" />
+    
+    <header android:id="@+id/preferences_general_section"
+            android:fragment="com.cyanogenmod.trebuchet.preference.Preferences$GeneralFragment"
+            android:title="@string/preferences_interface_general_title" />
+            
+    <header android:id="@+id/preferences_application_section"
+            android:title="@string/preferences_application_title" />        
+            
+    <header android:id="@+id/preferences_application_version"
+            android:summary="@string/application_copyright" />        
+
+</preference-headers>
\ No newline at end of file
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
new file mode 100644
index 0000000..c1996bc
--- /dev/null
+++ b/res/xml/preferences_homescreen.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+    android:key="ui_homescreen"
+    android:title="@string/preferences_interface_homescreen_title">
+    <PreferenceCategory android:title="@string/preferences_interface_homescreen_general_category">
+        <com.cyanogenmod.trebuchet.preference.DoubleNumberPickerPreference android:key="ui_homescreen_grid"
+            android:title="@string/preferences_interface_homescreen_general_grid_title"
+            android:summary="@string/preferences_interface_homescreen_general_grid_summary"
+            launcher:pickerTitle1="@string/preferences_interface_homescreen_general_grid_rows_title"
+            launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title"
+            launcher:defaultValue1="@integer/cell_count_x"
+            launcher:defaultValue2="@integer/cell_count_y"
+            launcher:max1="7"
+            launcher:min1="3"
+            launcher:max2="7"
+            launcher:min2="3" />
+        <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screens"
+            android:title="@string/preferences_interface_homescreen_general_screens_title"
+            android:summary="@string/preferences_interface_homescreen_general_screens_summary"
+            android:defaultValue="5"
+            launcher:max="7"
+            launcher:min="1" />
+        <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_default_screen"
+            android:title="@string/preferences_interface_homescreen_general_default_screen_title"
+            android:summary="@string/preferences_interface_homescreen_general_default_screen_summary"
+            android:defaultValue="3"
+            launcher:maxExternal="ui_homescreen_screens"
+            launcher:max="7"
+            launcher:min="1" />
+        <CheckBoxPreference android:key="ui_homescreen_stretch_screens"
+            android:title="@string/preferences_interface_homescreen_general_stretch_screens_title"
+            android:summary="@string/preferences_interface_homescreen_general_stretch_screens_summary" />
+        <CheckBoxPreference android:key="ui_homescreen_general_search"
+            android:title="@string/preferences_interface_homescreen_general_search_title"
+            android:summary="@string/preferences_interface_homescreen_general_search_summary"
+            android:defaultValue="true" />
+        <CheckBoxPreference android:key="ui_homescreen_general_resize_any_widget"
+            android:title="@string/preferences_interface_homescreen_general_resize_any_widget_title"
+            android:summary="@string/preferences_interface_homescreen_general_resize_any_widget_summary" />
+        <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels"
+            android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title"
+            android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category">
+        <ListPreference android:key="ui_homescreen_scrolling_transition_effect"
+            android:title="@string/preferences_interface_homescreen_scrolling_transition_effect_title"
+            android:summary="@string/preferences_interface_homescreen_scrolling_transition_effect_summary"
+            android:entries="@array/preferences_interface_homescreen_scrolling_transition_effect_entries"
+            android:entryValues="@array/preferences_interface_homescreen_scrolling_transition_effect_values"
+            android:defaultValue="@string/config_workspaceDefaultTransitionEffect" />
+        <CheckBoxPreference android:key="ui_homescreen_scrolling_scroll_wallpaper"
+            android:title="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_title"
+            android:summary="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_summary"
+            android:defaultValue="true" />
+        <CheckBoxPreference android:key="ui_homescreen_scrolling_wallpaper_hack"
+            android:title="@string/preferences_interface_homescreen_scrolling_wallpaper_hack_title"
+            android:summary="@string/preferences_interface_homescreen_scrolling_wallpaper_hack_summary"
+            android:defaultValue="false" />
+        <CheckBoxPreference android:key="ui_homescreen_scrolling_fade_adjacent_screens"
+            android:title="@string/preferences_interface_homescreen_scrolling_fade_adjacent_screens_title"
+            android:summary="@string/preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary"
+            android:defaultValue="@bool/config_workspaceDefualtFadeInAdjacentScreens" />
+        <CheckBoxPreference android:key="ui_homescreen_scrolling_show_outlines"
+            android:title="@string/preferences_interface_homescreen_scrolling_show_outlines_title"
+            android:summary="@string/preferences_interface_homescreen_scrolling_show_outlines_summary"
+            android:defaultValue="@bool/config_workspaceDefaultShowOutlines" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_interface_homescreen_indicator_category">
+        <CheckBoxPreference android:key="ui_homescreen_indicator_enable"
+            android:title="@string/preferences_interface_homescreen_indicator_enable_title"
+            android:summary="@string/preferences_interface_homescreen_indicator_enable_summary"
+            android:defaultValue="true" />
+        <CheckBoxPreference android:key="ui_homescreen_indicator_fade"
+            android:title="@string/preferences_interface_homescreen_indicator_fade_title"
+            android:summary="@string/preferences_interface_homescreen_indicator_fade_summary"
+            android:defaultValue="true"
+            android:dependency="ui_homescreen_indicator_enable" />
+        <ListPreference android:key="ui_homescreen_indicator_position"
+            android:title="@string/preferences_interface_homescreen_indicator_position_title"
+            android:summary="@string/preferences_interface_homescreen_indicator_position_summary"
+            android:entries="@array/preferences_interface_homescreen_indicator_position_entries"
+            android:entryValues="@array/preferences_interface_homescreen_indicator_position_values"
+            android:defaultValue="0"
+            android:dependency="ui_homescreen_indicator_enable" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file