commit 978f853d189c1857190b4a2e200c7a283e31ca14
author Daniel Sandler <dsandler@android.com> Wed Aug 15 15:48:16 2012 -0400
committer Daniel Sandler <dsandler@android.com> Wed Aug 15 15:48:43 2012 -0400
tree 8b630adc9de44ff3a4fb863584c0949b6fbacb4e
parent 2db99c56f74013ee51950ac53062536be2edcd14

Fix situations where the panel wouldn't descend.

Change-Id: I41c1d6a973b2693487062f3a5fbf922ff2025897

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index fa97299..b5a50c6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -16,9 +16,9 @@
 public class PanelView extends FrameLayout {
     public static final boolean DEBUG = false;
     public static final String TAG = PanelView.class.getSimpleName();
-    public static final void LOG(String fmt, Object... args) {
+    public final void LOG(String fmt, Object... args) {
         if (!DEBUG) return;
-        Log.v(TAG, String.format(fmt, args));
+        Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args));
     }
 
     public static final boolean BRAKES = false;
@@ -61,6 +61,7 @@
 
     private float mVel, mAccel;
     private int mFullHeight = 0;
+    private String mViewName; 
 
     private void animationTick(long dtms) {
         if (!mTimeAnimator.isStarted()) {
@@ -69,7 +70,7 @@
             mTimeAnimator.setTimeListener(mAnimationCallback);
 
             mTimeAnimator.start();
-        } else {
+        } else if (dtms > 0) {
             final float dt = dtms * 0.001f;                  // ms -> s
             LOG("tick: v=%.2fpx/s dt=%.4fs", mVel, dt);
             LOG("tick: before: h=%d", (int) mExpandedHeight);
@@ -170,13 +171,16 @@
                 public boolean onTouch(View v, MotionEvent event) {
                     final float y = event.getY();
                     final float rawY = event.getRawY();
-                    LOG("handle.onTouch: y=%.1f rawY=%.1f off=%.1f", y, rawY, mTouchOffset);
+                    LOG("handle.onTouch: a=%s y=%.1f rawY=%.1f off=%.1f",
+                            MotionEvent.actionToString(event.getAction()),
+                            y, rawY, mTouchOffset);
                     PanelView.this.getLocationOnScreen(mAbsPos);
 
                     switch (event.getAction()) {
                         case MotionEvent.ACTION_DOWN:
                             mVelocityTracker = VelocityTracker.obtain();
                             trackMovement(event);
+                            mBar.onTrackingStarted(PanelView.this);
                             mTouchOffset = (rawY - mAbsPos[1]) - PanelView.this.getExpandedHeight();
                             break;
 
@@ -190,6 +194,7 @@
 
                         case MotionEvent.ACTION_UP:
                         case MotionEvent.ACTION_CANCEL:
+                            mBar.onTrackingStopped(PanelView.this);
                             trackMovement(event);
                             mVelocityTracker.computeCurrentVelocity(1000);
 
@@ -241,6 +246,11 @@
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
+        mViewName = getResources().getResourceName(getId());
+    }
+
+    public String getName() {
+        return mViewName;
     }
 
     @Override
@@ -278,7 +288,7 @@
         }
 
         LOG("setExpansion: height=%.1f fh=%.1f", h, fh);
-        
+
         if (h < 0) h = 0;
         else if (h > fh) h = fh;