Preferences: Number of Homescreens + Default Screen

Change-Id: Id361d71c9fd0f0748fa6a48c6702178d366221b8

6 files changed, 20 insertions, 28 deletions

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index ff25506ce..1a1f908b1 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -32,19 +32,11 @@
         android:paddingRight="@dimen/workspace_right_padding"
         android:paddingTop="@dimen/workspace_top_padding"
         android:paddingBottom="@dimen/workspace_bottom_padding"
-        launcher:defaultScreen="2"
         launcher:cellCountX="@integer/cell_count_x"
         launcher:cellCountY="@integer/cell_count_y"
         launcher:pageSpacing="@dimen/workspace_page_spacing"
         launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height"
-        launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height">
-
-        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.cyanogenmod.trebuchet.Workspace>
+        launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" />
 
     <include
         android:id="@+id/qsb_divider"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 6f7961779..b4ec30c3a 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -49,19 +49,11 @@
         android:paddingRight="@dimen/workspace_right_padding"
         android:paddingTop="@dimen/workspace_top_padding"
         android:paddingBottom="@dimen/workspace_bottom_padding"
-        launcher:defaultScreen="2"
         launcher:cellCountX="@integer/cell_count_x"
         launcher:cellCountY="@integer/cell_count_y"
         launcher:pageSpacing="@dimen/workspace_page_spacing"
         launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left"
-        launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right">
-
-        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.cyanogenmod.trebuchet.Workspace>
+        launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right" />
 
     <include layout="@layout/hotseat"
         android:id="@+id/hotseat"
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index 352c4d709..db2c3a62d 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -23,11 +23,4 @@
     android:paddingRight="@dimen/workspace_right_padding"
     android:paddingTop="@dimen/workspace_top_padding"
     android:paddingBottom="@dimen/workspace_bottom_padding"
-    launcher:defaultScreen="2"
-    launcher:pageSpacing="@dimen/workspace_page_spacing">
-      <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
-      <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
-      <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
-      <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
-      <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-</com.cyanogenmod.trebuchet.Workspace>
\ No newline at end of file
+    launcher:pageSpacing="@dimen/workspace_page_spacing" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9e3981305..f8fbf21d1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -44,8 +44,6 @@
     <!-- Workspace specific attributes. These attributes are used to customize
          the workspace in XML files. -->
     <declare-styleable name="Workspace">
-        <!-- The first screen the workspace should display. -->
-        <attr name="defaultScreen" format="integer"  />
         <!-- The number of horizontal cells in the CellLayout -->
         <attr name="cellCountX" format="integer"  />
         <!-- The number of vertical cells in the CellLayout -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86a1a8533..689efdc70 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,6 +292,10 @@ s -->
     <!-- Homescreen -->
     <string name="preferences_interface_homescreen_title">Homescreen</string>
     <string name="preferences_interface_homescreen_general_category">General</string>
+    <string name="preferences_interface_homescreen_general_screens_title">Homescreens</string>
+    <string name="preferences_interface_homescreen_general_screens_summary">Number of screens on the homescreen</string>
+    <string name="preferences_interface_homescreen_general_default_screen_title">Default Screen</string>
+    <string name="preferences_interface_homescreen_general_default_screen_summary">Choose the default homescreen</string>
     <string name="preferences_interface_homescreen_general_search_title">Search Bar</string>
     <string name="preferences_interface_homescreen_general_grid_title">Grid Size</string>
     <string name="preferences_interface_homescreen_general_grid_summary">Choose the number of rows/columns on the homescreen</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index dcb637991..1e10bb37b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -33,6 +33,19 @@
                     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_general_search"
                     android:title="@string/preferences_interface_homescreen_general_search_title"
                     android:summary="@string/preferences_interface_homescreen_general_search_summary"