Merge "Ignore signals from RecentTasks for frozen task list" into rvc-dev am: 83315682fc (08efd725) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -113,16 +113,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		}
		};

		private TaskStackChangeListener mTaskStackChangeListener = new TaskStackChangeListener() {
		@Override
		public void onRecentTaskListFrozenChanged(boolean frozen) {
		if (!frozen) {
		mStartingQuickstepRotation = -1;
		mDisabledForQuickstep = false;
		}
		}
		};

		private final ContentObserver mFixedRotationObserver = new ContentObserver(
		new Handler(Looper.getMainLooper())) {
		@Override
		@@ -287,12 +277,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa

		private void setRotationCallbacks(boolean enable) {
		if (enable) {
		ActivityManagerWrapper.getInstance().registerTaskStackListener(
		mTaskStackChangeListener);
		mOverviewProxyService.addCallback(mQuickSwitchListener);
		} else {
		ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
		mTaskStackChangeListener);
		mOverviewProxyService.removeCallback(mQuickSwitchListener);
		}
		}

+1 −11

Original line number	Diff line number	Diff line
		@@ -305,14 +305,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		}
		};

		private TaskStackChangeListener mTasksFrozenListener = new TaskStackChangeListener() {
		@Override
		public void onRecentTaskListFrozenChanged(boolean frozen) {
		mFrozenTasks = frozen;
		orientSecondaryHomeHandle();
		}
		};

		private NavigationBarTransitions.DarkIntensityListener mOrientationHandleIntensityListener =
		new NavigationBarTransitions.DarkIntensityListener() {
		@Override
		@@ -510,7 +502,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		}

		initSecondaryHomeHandleForRotation();
		ActivityManagerWrapper.getInstance().registerTaskStackListener(mTasksFrozenListener);
		}

		@Override
		@@ -527,7 +518,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		}
		mOverviewProxyService.removeCallback(mOverviewProxyListener);
		mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);
		ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTasksFrozenListener);
		if (mOrientationHandle != null) {
		resetSecondaryHandle();
		getContext().getSystemService(DisplayManager.class).unregisterDisplayListener(this);
		@@ -594,7 +584,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
		return;
		}

		if (!mFrozenTasks) {
		if (mStartingQuickSwitchRotation == -1) {
		resetSecondaryHandle();
		} else {
		int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);