Merge "Fix black flash during rotation of -1 screen with GEL." into ub-now-lunchbox (93b92d08) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+7 −20

Original line number	Diff line number	Diff line
		@@ -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) {

src/com/android/launcher3/Workspace.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();