Merge "Allow custom content to lock the workspace" into ub-now-master (ca424c67) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1089,6 +1089,9 @@ public class Launcher extends Activity

		// Custom content scroll progress changed. From 0 (not showing) to 1 (fully showing).
		public void onScrollProgressChanged(float progress);

		// Indicates whether the user is allowed to scroll away from the custom content.
		boolean isScrollingAllowed();
		}

		protected boolean hasSettings() {

+10 −2

Original line number	Diff line number	Diff line
		@@ -1159,12 +1159,20 @@ public class Workspace extends SmoothPagedView
		(mTouchDownTime - mCustomContentShowTime) > CUSTOM_CONTENT_GESTURE_DELAY;

		boolean swipeInIgnoreDirection = isLayoutRtl() ? deltaX < 0 : deltaX > 0;
		if (swipeInIgnoreDirection && getScreenIdForPageIndex(getCurrentPage()) ==
		CUSTOM_CONTENT_SCREEN_ID && passRightSwipesToCustomContent) {
		boolean onCustomContentScreen =
		getScreenIdForPageIndex(getCurrentPage()) == CUSTOM_CONTENT_SCREEN_ID;
		if (swipeInIgnoreDirection && onCustomContentScreen && passRightSwipesToCustomContent) {
		// Pass swipes to the right to the custom content page.
		return;
		}

		if (onCustomContentScreen && (mCustomContentCallbacks != null)
		&& !mCustomContentCallbacks.isScrollingAllowed()) {
		// Don't allow workspace scrolling if the current custom content screen doesn't allow
		// scrolling.
		return;
		}

		if (theta > MAX_SWIPE_ANGLE) {
		// Above MAX_SWIPE_ANGLE, we don't want to ever start scrolling the workspace
		return;