Hotseat: Default Page

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml
	src/com/beansoft/launcher/preference/PreferencesProvider.java

Change-Id: I0ba21f27fe6ba703450d5072d922cd52dbf86dff

2 files changed, 6 insertions, 0 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index 23435d3..7812913 100644
--- a/src/com/cyanogenmod/trebuchet/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -56,6 +56,7 @@ public class Hotseat extends PagedView {
         mHandleScrollIndicator = true;
 
         int hotseatPages = PreferencesProvider.Interface.Dock.getNumberPages();
+        int defaultPage = PreferencesProvider.Interface.Dock.getDefaultPage(hotseatPages / 2);
 
         LayoutInflater inflater =
                 (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -63,6 +64,8 @@ public class Hotseat extends PagedView {
             inflater.inflate(R.layout.hotseat_page, this);
         }
 
+        mCurrentPage = defaultPage;
+
         TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.Hotseat, defStyle, 0);
         Resources r = context.getResources();
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index d5901f8..a6094ef 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -179,6 +179,9 @@ public final class PreferencesProvider {
         }
 
         public static class Dock {
+            public static int getDefaultPage(int def) {
+                return getInt("ui_dock_default_page", def + 1) - 1;
+            }
             public static int getNumberPages() {
                 return getInt("ui_dock_pages", 1);
             }