Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-10-05 09:56:19 -07:00
committed by Android (Google) Code Review
parent 20de160ca3 a801f68624
commit d7620196e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ public class PanelView extends FrameLayout {
mTimeAnimator = new TimeAnimator();
mTimeAnimator.setTimeListener(mAnimationCallback);
mPeekAnimator.cancel();
if (mPeekAnimator != null) mPeekAnimator.cancel();
mTimeAnimator.start();
@@ -261,7 +261,7 @@ public class PanelView extends FrameLayout {
case MotionEvent.ACTION_MOVE:
final float h = rawY - mAbsPos[1] - mTouchOffset;
if (h > mPeekHeight) {
if (mPeekAnimator.isRunning()) {
if (mPeekAnimator != null && mPeekAnimator.isRunning()) {
mPeekAnimator.cancel();
}
mJustPeeked = false;
@@ -385,7 +385,7 @@ public class PanelView extends FrameLayout {
public void setExpandedHeight(float height) {
if (DEBUG) LOG("setExpandedHeight(%.1f)", height);
mTracking = mRubberbanding = false;
mRubberbanding = false;
if (mTimeAnimator.isRunning()) {
post(mStopAnimator);
}