diff options
author | Derek Prothro <dprothro@google.com> | 2014-01-30 22:03:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-30 22:03:55 +0000 |
commit | 93b92d0895f86fddf270b4861282b75c8e455ce3 (patch) | |
tree | b54fdd94e906568e1346b24d240e2de99f85d319 | |
parent | 2a4f4928a964fa8eef9ea6542f835ad4a79b9bd5 (diff) | |
parent | dadd984a891a574cebf3dfd38a454a0e6a4228b3 (diff) | |
download | android_packages_apps_Trebuchet-93b92d0895f86fddf270b4861282b75c8e455ce3.tar.gz android_packages_apps_Trebuchet-93b92d0895f86fddf270b4861282b75c8e455ce3.tar.bz2 android_packages_apps_Trebuchet-93b92d0895f86fddf270b4861282b75c8e455ce3.zip |
Merge "Fix black flash during rotation of -1 screen with GEL." into ub-now-lunchbox
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 27 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
2 files changed, 9 insertions, 22 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index fca443c58..70d44cee4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -505,11 +505,11 @@ public class Launcher extends Activity } /** - * To be overridden by subclasses to create the custom content and call + * To be overridden by subclasses to populate the custom content container and call * {@link #addToCustomContentPage}. This will only be invoked if * {@link #hasCustomContentToLeft()} is {@code true}. */ - protected void addCustomContentToLeft() { + protected void populateCustomContentContainer() { } /** @@ -539,8 +539,8 @@ public class Launcher extends Activity if (!mWorkspace.hasCustomContent() && hasCustomContentToLeft()) { // Create the custom content page and call the subclass to populate it. - mWorkspace.createCustomContentPage(); - addCustomContentToLeft(); + mWorkspace.createCustomContentContainer(); + populateCustomContentContainer(); } else if (mWorkspace.hasCustomContent() && !hasCustomContentToLeft()) { mWorkspace.removeCustomContentPage(); } @@ -1033,12 +1033,6 @@ public class Launcher extends Activity } } - protected void onFinishBindingItems() { - if (mWorkspace != null && hasCustomContentToLeft() && mWorkspace.hasCustomContent()) { - addCustomContentToLeft(); - } - } - QSBScroller mQsbScroller = new QSBScroller() { int scrollY = 0; @@ -3796,9 +3790,9 @@ public class Launcher extends Activity // Create the custom content page (this call updates mDefaultScreen which calls // setCurrentPage() so ensure that all pages are added before calling this). - // The actual content of the custom page will be added during onFinishBindingItems(). - if (!mWorkspace.hasCustomContent() && hasCustomContentToLeft()) { - mWorkspace.createCustomContentPage(); + if (hasCustomContentToLeft()) { + mWorkspace.createCustomContentContainer(); + populateCustomContentContainer(); } } @@ -4080,13 +4074,6 @@ public class Launcher extends Activity mWorkspace.getUniqueComponents(true, null); mIntentsOnWorkspaceFromUpgradePath = mWorkspace.getUniqueComponents(true, null); } - - mWorkspace.post(new Runnable() { - @Override - public void run() { - onFinishBindingItems(); - } - }); } public boolean isAllAppsButtonRank(int rank) { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 687b02def..751b4c67a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -425,7 +425,7 @@ public class Workspace extends SmoothPagedView setClipChildren(false); setClipToPadding(false); setChildrenDrawnWithCacheEnabled(true); - + setMinScale(mOverviewModeShrinkFactor); setupLayoutTransition(); @@ -566,7 +566,7 @@ public class Workspace extends SmoothPagedView return screenId; } - public void createCustomContentPage() { + public void createCustomContentContainer() { CellLayout customScreen = (CellLayout) mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null); customScreen.disableBackground(); |