Merge "Fix Recent Apps jumping artifact" (c8bf9561) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -165,6 +165,13 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView
		@Override
		protected void onSizeChanged(int w, int h, int oldw, int oldh) {
		super.onSizeChanged(w, h, oldw, oldh);

		// Skip this work if a transition is running; it sets the scroll values independently
		// and should not have those animated values clobbered by this logic
		LayoutTransition transition = mLinearLayout.getLayoutTransition();
		if (transition != null && transition.isRunning()) {
		return;
		}
		// Keep track of the last visible item in the list so we can restore it
		// to the bottom when the orientation changes.
		mLastScrollPosition = scrollPositionOfMostRecent();
		@@ -172,8 +179,13 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView
		// This has to happen post-layout, so run it "in the future"
		post(new Runnable() {
		public void run() {
		// Make sure we're still not clobbering the transition-set values, since this
		// runnable launches asynchronously
		LayoutTransition transition = mLinearLayout.getLayoutTransition();
		if (transition == null \|\| !transition.isRunning()) {
		scrollTo(mLastScrollPosition, 0);
		}
		}
		});
		}

+13 −1

Original line number	Diff line number	Diff line
		@@ -166,6 +166,13 @@ public class RecentsVerticalScrollView extends ScrollView implements SwipeHelper
		@Override
		protected void onSizeChanged(int w, int h, int oldw, int oldh) {
		super.onSizeChanged(w, h, oldw, oldh);

		// Skip this work if a transition is running; it sets the scroll values independently
		// and should not have those animated values clobbered by this logic
		LayoutTransition transition = mLinearLayout.getLayoutTransition();
		if (transition != null && transition.isRunning()) {
		return;
		}
		// Keep track of the last visible item in the list so we can restore it
		// to the bottom when the orientation changes.
		mLastScrollPosition = scrollPositionOfMostRecent();
		@@ -173,8 +180,13 @@ public class RecentsVerticalScrollView extends ScrollView implements SwipeHelper
		// This has to happen post-layout, so run it "in the future"
		post(new Runnable() {
		public void run() {
		// Make sure we're still not clobbering the transition-set values, since this
		// runnable launches asynchronously
		LayoutTransition transition = mLinearLayout.getLayoutTransition();
		if (transition == null \|\| !transition.isRunning()) {
		scrollTo(0, mLastScrollPosition);
		}
		}
		});
		}