Merge "Issue 3418: Show statusbar on ADW swype and fix velocity" into gingerbread (5e241b6d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1038,7 +1038,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks
	// We are expanded, but they didn't move sufficiently to cause		// We are expanded, but they didn't move sufficiently to cause
	// us to retract. Animate back to the expanded position.		// us to retract. Animate back to the expanded position.
	mAnimAccel = 2000.0f;		mAnimAccel = 2000.0f;
	if ((mBottomBar && vel > 0) \|\| (!mBottomBar && vel < 0)) {		if (vel < 0) {
	mAnimVel = 0;		mAnimVel = 0;
	}		}
	}		}
	@@ -1056,7 +1056,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks
	// We are collapsed, and they moved enough to allow us to		// We are collapsed, and they moved enough to allow us to
	// expand. Animate in the notifications.		// expand. Animate in the notifications.
	mAnimAccel = 2000.0f;		mAnimAccel = 2000.0f;
	if ((mBottomBar && vel < 0) \|\| (!mBottomBar && vel > 0)) {		if (vel < 0) {
	mAnimVel = 0;		mAnimVel = 0;
	}		}
	}		}