diff options
| author | Selim Cinek <cinek@google.com> | 2014-01-16 10:38:38 -0800 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-03-07 14:30:36 +0100 |
| commit | 3a8a8f7c2355863006208fced945f63c9bdb40b4 (patch) | |
| tree | 43a6272166697bcc4537075f599e3a9e0b8762de /src | |
| parent | 497ecbd311bce99d652f74492f623c8b93b2b5f9 (diff) | |
| download | android_packages_apps_Trebuchet-3a8a8f7c2355863006208fced945f63c9bdb40b4.tar.gz android_packages_apps_Trebuchet-3a8a8f7c2355863006208fced945f63c9bdb40b4.tar.bz2 android_packages_apps_Trebuchet-3a8a8f7c2355863006208fced945f63c9bdb40b4.zip | |
Disable wallpaper in -1 space in GEL and hack around window animations
Bug: 12978354
Change-Id: I8b5602ae434a9151b40d41defb891db1ad78ce81
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 218b787e8..986fa2162 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1011,7 +1011,7 @@ public class Launcher extends Activity // It is also poassible that onShow will instead be called slightly after first layout // if PagedView#setRestorePage was set to the custom content page in onCreate(). if (mWorkspace.isOnOrMovingToCustomContent()) { - mWorkspace.getCustomContentCallbacks().onShow(); + mWorkspace.getCustomContentCallbacks().onShow(true); } } mWorkspace.updateInteractionForState(); @@ -1055,8 +1055,9 @@ public class Launcher extends Activity } public interface CustomContentCallbacks { - // Custom content is completely shown - public void onShow(); + // Custom content is completely shown. {@code fromResume} indicates whether this was caused + // by a onResume or by scrolling otherwise. + public void onShow(boolean fromResume); // Custom content is completely hidden public void onHide(); @@ -2927,7 +2928,7 @@ public class Launcher extends Activity mWorkspaceBackgroundDrawable : null); } - void updateWallpaperVisibility(boolean visible) { + protected void changeWallpaperVisiblity(boolean visible) { int wpflags = visible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0; int curflags = getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 567abfa47..1d413f5ef 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1215,7 +1215,7 @@ public class Workspace extends SmoothPagedView if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) { mCustomContentShowing = true; if (mCustomContentCallbacks != null) { - mCustomContentCallbacks.onShow(); + mCustomContentCallbacks.onShow(false); mCustomContentShowTime = System.currentTimeMillis(); mLauncher.updateVoiceButtonProxyVisible(false); } |