Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf (4e2683a4) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Workspace.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -2110,7 +2110,8 @@ public class Workspace extends SmoothPagedView
		if (stateIsSmall) {
		finalAlpha = 0f;
		} else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) {
		finalAlpha = i == getNextPage() ? 1f : 0f;

		finalAlpha = (i == getNextPage() \|\| i < numCustomPages()) ? 1f : 0f;
		} else {
		finalAlpha = 1f;
		}
		@@ -2351,6 +2352,11 @@ public class Workspace extends SmoothPagedView
		final CellLayout cl = (CellLayout) getChildAt(i);
		cl.setShortcutAndWidgetAlpha(1f);
		}
		} else {
		for (int i = 0; i < numCustomPages(); i++) {
		final CellLayout cl = (CellLayout) getChildAt(i);
		cl.setShortcutAndWidgetAlpha(1f);
		}
		}
		showCustomContentIfNecessary();
		}
		@@ -4568,6 +4574,7 @@ public class Workspace extends SmoothPagedView
		child.requestFocus();
		}
		}
		exitWidgetResizeMode();
		}

		@Override