Merge "Hotseat: Multiple Pages" into cm-10.1

8 files changed, 110 insertions, 40 deletions

diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index 2b13347..4fd3e28 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -17,20 +17,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:cellCountX="1"
-    launcher:cellCountY="@integer/hotseat_cell_count">
-    <com.cyanogenmod.trebuchet.CellLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingTop="@dimen/button_bar_width_left_padding"
-        android:paddingBottom="@dimen/button_bar_width_right_padding"
-        android:paddingLeft="@dimen/button_bar_height_top_padding"
-        android:paddingRight="@dimen/button_bar_height_bottom_padding"
-
-        launcher:cellWidth="@dimen/hotseat_cell_width"
-        launcher:cellHeight="@dimen/hotseat_cell_height"
-        launcher:widthGap="@dimen/hotseat_width_gap"
-        launcher:heightGap="@dimen/hotseat_height_gap"
-        launcher:maxGap="@dimen/workspace_max_gap" />
-</com.cyanogenmod.trebuchet.Hotseat>
+    launcher:cellCountY="@integer/hotseat_cell_count" />
diff --git a/res/layout-land/hotseat_page.xml b/res/layout-land/hotseat_page.xml
new file mode 100644
index 0000000..5371a09
--- /dev/null
+++ b/res/layout-land/hotseat_page.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<com.cyanogenmod.trebuchet.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:paddingTop="@dimen/button_bar_width_left_padding"
+    android:paddingBottom="@dimen/button_bar_width_right_padding"
+    android:paddingLeft="@dimen/button_bar_height_top_padding"
+    android:paddingRight="@dimen/button_bar_height_bottom_padding"
+
+    launcher:cellWidth="@dimen/hotseat_cell_width"
+    launcher:cellHeight="@dimen/hotseat_cell_height"
+    launcher:widthGap="@dimen/hotseat_width_gap"
+    launcher:heightGap="@dimen/hotseat_height_gap"
+    launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index 0420469..3abd133 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -17,20 +17,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:cellCountX="@integer/hotseat_cell_count"
-    launcher:cellCountY="1">
-    <com.cyanogenmod.trebuchet.CellLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:paddingTop="@dimen/button_bar_height_top_padding"
-        android:paddingBottom="@dimen/button_bar_height_bottom_padding"
-        android:paddingLeft="@dimen/button_bar_width_left_padding"
-        android:paddingRight="@dimen/button_bar_width_right_padding"
-
-        launcher:cellWidth="@dimen/hotseat_cell_width"
-        launcher:cellHeight="@dimen/hotseat_cell_height"
-        launcher:widthGap="@dimen/hotseat_width_gap"
-        launcher:heightGap="@dimen/hotseat_height_gap"
-        launcher:maxGap="@dimen/workspace_max_gap" />
-</com.cyanogenmod.trebuchet.Hotseat>
+    launcher:cellCountY="1" />
diff --git a/res/layout-port/hotseat_page.xml b/res/layout-port/hotseat_page.xml
new file mode 100644
index 0000000..9c1e87c
--- /dev/null
+++ b/res/layout-port/hotseat_page.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<com.cyanogenmod.trebuchet.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:paddingTop="@dimen/button_bar_height_top_padding"
+    android:paddingBottom="@dimen/button_bar_height_bottom_padding"
+    android:paddingLeft="@dimen/button_bar_width_left_padding"
+    android:paddingRight="@dimen/button_bar_width_right_padding"
+
+    launcher:cellWidth="@dimen/hotseat_cell_width"
+    launcher:cellHeight="@dimen/hotseat_cell_height"
+    launcher:widthGap="@dimen/hotseat_width_gap"
+    launcher:heightGap="@dimen/hotseat_height_gap"
+    launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d23b861..87047d2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -382,6 +382,8 @@ s -->
 
     <!-- Dock -->
     <string name="preferences_interface_dock_title">Dock</string>
+    <string name="preferences_interface_dock_pages_title">Pages</string>
+    <string name="preferences_interface_dock_pages_summary">Number of pages in the dock</string>
     <string name="preferences_interface_dock_divider_title">Show dock divider</string>
     <string name="preferences_interface_dock_divider_summary">Show divider between homescreen and dock</string>
 
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 2feb09f..7975e65 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -71,12 +71,12 @@
         launcher:packageName="com.android.contacts"
         launcher:className="com.android.contacts.activities.PeopleActivity"
         launcher:container="-101"
-        launcher:screen="1"
+        launcher:screen="0"
         launcher:x="1"
         launcher:y="0" />
     <shortcut
         launcher:container="-101"
-        launcher:screen="2"
+        launcher:screen="0"
         launcher:x="2"
         launcher:y="0"
         launcher:icon="@drawable/ic_allapps"
@@ -86,14 +86,14 @@
         launcher:packageName="com.android.mms"
         launcher:className="com.android.mms.ui.ConversationList"
         launcher:container="-101"
-        launcher:screen="3"
+        launcher:screen="0"
         launcher:x="3"
         launcher:y="0" />
     <favorite
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
-        launcher:screen="4"
+        launcher:screen="0"
         launcher:x="4"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml/preferences_dock.xml b/res/xml/preferences_dock.xml
index 10fabe2..08a2c19 100644
--- a/res/xml/preferences_dock.xml
+++ b/res/xml/preferences_dock.xml
@@ -18,8 +18,14 @@
     xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     android:key="ui_dock"
     android:title="@string/preferences_interface_dock_title">
+    <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_dock_pages"
+        android:title="@string/preferences_interface_dock_pages_title"
+        android:summary="@string/preferences_interface_dock_pages_summary"
+        android:defaultValue="1"
+        launcher:max="3"
+        launcher:min="1" />
     <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
+</PreferenceScreen>
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 768d3ba..320d765 100644
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_workspace.xml
@@ -17,12 +17,40 @@
 <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="1"
+        launcher:y="0" />
     <shortcut
         launcher:container="-101"
-        launcher:screen="2"
+        launcher:screen="0"
         launcher:x="2"
         launcher:y="0"
         launcher:icon="@drawable/ic_allapps"
         launcher:title="@string/all_apps_button_label"
         launcher:uri="#Intent;action=com.cyanogenmod.trebuchet.LAUNCHER_ACTION;category=android.intent.category.HOME;launchFlags=0x10200000;component=com.cyanogenmod.trebuchet/com.cyanogenmod.trebuchet.Launcher;S.android.intent.extra.TEXT=AllApps;end" />
+    <favorite
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.browser"
+        launcher:className="com.android.browser.BrowserActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="4"
+        launcher:y="0" />
 </favorites>