Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev (1ca7d063) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import com.android.systemui.Interpolators;
		import com.android.systemui.R;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.events.EventBus;
		import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent;
		import com.android.systemui.recents.events.activity.DockedTopTaskEvent;
		import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent;
		import com.android.systemui.recents.events.activity.UndockingTaskEvent;
		@@ -1210,6 +1211,10 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		}
		}

		public final void onBusEvent(DockedFirstAnimationFrameEvent event) {
		saveSnapTargetBeforeMinimized(mSnapAlgorithm.getMiddleTarget());
		}

		public final void onBusEvent(DockedTopTaskEvent event) {
		if (event.dragMode == NavigationBarGestureHelper.DRAG_MODE_NONE) {
		mState.growAfterRecentsDrawn = false;