summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2013-11-27 15:32:37 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:24:23 -0800
commit52d5f749553cbf973d7956f71a205ef3b2d4181e (patch)
tree6c912dd7adff4e2efe821e6b1fe7cdc3c4a2e812 /src/com/android/launcher3/Workspace.java
parenta1ae6efea94028200b4c01a4a04933f7c096fd2e (diff)
downloadandroid_packages_apps_Trebuchet-52d5f749553cbf973d7956f71a205ef3b2d4181e.tar.gz
android_packages_apps_Trebuchet-52d5f749553cbf973d7956f71a205ef3b2d4181e.tar.bz2
android_packages_apps_Trebuchet-52d5f749553cbf973d7956f71a205ef3b2d4181e.zip
Workspace: Still use config provided default screen
Change-Id: Icc2050d0fd6211725df3729d2676a4e43f219534
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 531eb27e6..3bd28861a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -116,6 +116,7 @@ public class Workspace extends SmoothPagedView
private final WallpaperManager mWallpaperManager;
private IBinder mWindowToken;
+ private int mDefaultPage;
private long mDefaultScreenId;
private ShortcutAndWidgetContainer mDragSourceInternal;
@@ -326,6 +327,7 @@ public class Workspace extends SmoothPagedView
res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100.0f;
mOverviewModePageOffset = res.getDimensionPixelSize(R.dimen.overview_mode_page_offset);
mCameraDistance = res.getInteger(R.integer.config_cameraDistance);
+ mDefaultPage = a.getInt(R.styleable.Workspace_defaultScreen, 1);
mDefaultScreenId = SettingsProvider.getLongCustomDefault(context,
SettingsProvider.SETTINGS_UI_HOMESCREEN_DEFAULT_SCREEN_ID, -1);
a.recycle();
@@ -417,6 +419,7 @@ public class Workspace extends SmoothPagedView
*/
protected void initWorkspace() {
Context context = getContext();
+ mCurrentPage = mDefaultPage;
Launcher.setScreen(mCurrentPage);
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();