Merge "Update shelf offset earlier when in gesture nav" into ub-launcher3-rvc-dev (054b0ae3) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		@Override
		public void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);
		onStateOrResumeChanged();
		onStateOrResumeChanging(false /* inTransition */);
		}

		@Override
		@@ -115,11 +115,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		@Override
		protected void onActivityFlagsChanged(int changeBits) {
		super.onActivityFlagsChanged(changeBits);

		if ((changeBits & (ACTIVITY_STATE_DEFERRED_RESUMED \| ACTIVITY_STATE_STARTED
		\| ACTIVITY_STATE_USER_ACTIVE \| ACTIVITY_STATE_TRANSITION_ACTIVE)) != 0
		&& (getActivityFlags() & ACTIVITY_STATE_TRANSITION_ACTIVE) == 0) {
		onStateOrResumeChanged();
		\| ACTIVITY_STATE_USER_ACTIVE \| ACTIVITY_STATE_TRANSITION_ACTIVE)) != 0) {
		onStateOrResumeChanging((getActivityFlags() & ACTIVITY_STATE_TRANSITION_ACTIVE) == 0);
		}

		if (mHotseatPredictionController != null && ((changeBits & ACTIVITY_STATE_STARTED) != 0
		@@ -164,14 +162,16 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		/**
		* Recents logic that triggers when launcher state changes or launcher activity stops/resumes.
		*/
		private void onStateOrResumeChanged() {
		private void onStateOrResumeChanging(boolean inTransition) {
		LauncherState state = getStateManager().getState();
		DeviceProfile profile = getDeviceProfile();
		boolean visible = (state == NORMAL \|\| state == OVERVIEW) && isUserActive()
		boolean willUserBeActive = (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
		boolean visible = (state == NORMAL \|\| state == OVERVIEW)
		&& (willUserBeActive \|\| isUserActive())
		&& !profile.isVerticalBarLayout();
		UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,
		profile.hotseatBarSizePx);
		if (state == NORMAL) {
		if (state == NORMAL && !inTransition) {
		((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false);
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,11 @@ public final class LauncherActivityInterface extends
		return true;
		}

		@Override
		public void setHintUserWillBeActive() {
		getCreatedActivity().setHintUserWillBeActive();
		}

		@Override
		public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
		return deviceState.isInDeferredGestureRegion(ev);

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -939,6 +939,7 @@ public class LauncherSwipeHandler extends BaseSwipeUpHandler<Launcher, RecentsVi
		: null;

		mActivity.getRootView().setForceHideBackArrow(true);
		mActivityInterface.setHintUserWillBeActive();

		homeAnimFactory = new HomeAnimationFactory(floatingIconView) {

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -304,4 +304,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
		public ShelfPeekAnim getShelfPeekAnim() {
		return mShelfPeekAnim;
		}

		public void setHintUserWillBeActive() {
		addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
		}
		}

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,8 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
		recentsView.switchToScreenshot(thumbnailData, runnable);
		}

		public void setHintUserWillBeActive() {}

		/**
		* Sets the expected window size in multi-window mode
		*/