am 88c3a511: Merge "Fix a bug in double-swiping panels..." into jb-mr1-dev (d564f0c5) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -295,6 +295,7 @@ public class PanelView extends FrameLayout {
		}

		public void fling(float vel, boolean always) {
		if (DEBUG) LOG("fling: vel=%.3f, this=%s", vel, this);
		mVel = vel;

		if (always\|\|mVel != 0) {
		@@ -416,7 +417,10 @@ public class PanelView extends FrameLayout {

		public void collapse() {
		// TODO: abort animation or ongoing touch
		if (DEBUG) LOG("collapse: " + this);
		if (!isFullyCollapsed()) {
		mTimeAnimator.cancel();
		mClosing = true;
		// collapse() should never be a rubberband, even if an animation is already running
		mRubberbanding = false;
		fling(-mSelfCollapseVelocityPx, /always=/ true);
		@@ -424,9 +428,9 @@ public class PanelView extends FrameLayout {
		}

		public void expand() {
		if (DEBUG) LOG("expand: " + this);
		if (isFullyCollapsed()) {
		mBar.startOpeningPanel(this);
		if (DEBUG) LOG("expand: calling fling(%s, true)", mSelfExpandVelocityPx);
		fling(mSelfExpandVelocityPx, /always=/ true);
		} else if (DEBUG) {
		if (DEBUG) LOG("skipping expansion: is expanded");

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ public class PhoneStatusBarView extends PanelBar {

		@Override
		public void onPanelFullyOpened(PanelView openPanel) {
		super.onPanelFullyOpened(openPanel);
		mFadingPanel = openPanel;
		mShouldFade = true; // now you own the fade, mister
		}