diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2013-11-25 16:58:53 +0000 |
|---|---|---|
| committer | Rajesh Yengisetty <rajesh@cyngn.com> | 2014-12-23 19:39:52 +0000 |
| commit | aed08787684b6351082c3a1bfbec2c54d365ee2b (patch) | |
| tree | 83a77a98e9c87cce33e7d75f76028174726c392c /src/com | |
| parent | 0b7b1db20f738fc93b423883e42ad166904b90f6 (diff) | |
| download | android_packages_apps_Trebuchet-aed08787684b6351082c3a1bfbec2c54d365ee2b.tar.gz android_packages_apps_Trebuchet-aed08787684b6351082c3a1bfbec2c54d365ee2b.tar.bz2 android_packages_apps_Trebuchet-aed08787684b6351082c3a1bfbec2c54d365ee2b.zip | |
Workspace: Custom default screen
Change-Id: Ic90254f7758b9dbd4997a19474e455230355b772
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/OverviewSettingsPanel.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index 5f0c15e0a..2403d2344 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -124,7 +124,9 @@ public class OverviewSettingsPanel { defaultScreenButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View arg0) { - mLauncher.getWorkspace().onClickDefaultScreenButton(); + if (!mLauncher.getWorkspace().isSwitchingState()) { + mLauncher.getWorkspace().onClickDefaultScreenButton(); + } } }); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 9d1aac269..97577a10a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -638,9 +638,6 @@ public class Workspace extends SmoothPagedView addFullScreenPage(customScreen); - // Ensure that the current page and default page are maintained. - mDefaultPage = mOriginalDefaultPage + 1; - // Update the custom content hint if (mRestorePage != INVALID_RESTORE_PAGE) { mRestorePage = mRestorePage + 1; @@ -666,9 +663,6 @@ public class Workspace extends SmoothPagedView mCustomContentCallbacks = null; - // Ensure that the current page and default page are maintained. - mDefaultPage = mOriginalDefaultPage - 1; - // Update the custom content hint if (mRestorePage != INVALID_RESTORE_PAGE) { mRestorePage = mRestorePage - 1; @@ -2134,6 +2128,10 @@ public class Workspace extends SmoothPagedView showOutlines(); // Reordering handles its own animations, disable the automatic ones. disableLayoutTransitions(); + + mLauncher.getOverviewPanel().animate() + .alpha(0f) + .start(); } protected void onEndReordering() { @@ -2156,6 +2154,13 @@ public class Workspace extends SmoothPagedView // Re-enable auto layout transitions for page deletion. enableLayoutTransitions(); + + // Show the default screen button + updateDefaultScreenButton(); + + mLauncher.getOverviewPanel().animate() + .alpha(1f) + .start(); } public boolean isInOverviewMode() { |