Merge "Panel physics changes." into jb-mr1-dev

dsandler · Android (Google) Code Review · commit cbfcf5a329b0 · 2012-10-03T11:43:13.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
@@ -21,14 +21,16 @@ public static final void LOG(String fmt, Object... args) {
     public static final int STATE_OPENING = 1;
     public static final int STATE_OPEN = 2;
 
-    private PanelHolder mPanelHolder;
-    private ArrayList<PanelView> mPanels = new ArrayList<PanelView>();
-    protected PanelView mTouchingPanel;
+    PanelHolder mPanelHolder;
+    ArrayList<PanelView> mPanels = new ArrayList<PanelView>();
+    PanelView mTouchingPanel;
     private int mState = STATE_CLOSED;
     private boolean mTracking;
 
+    float mPanelExpandedFractionSum;
+
     public void go(int state) {
-        LOG("go state: %d -> %d", mState, state);
+        if (DEBUG) LOG("go state: %d -> %d", mState, state);
         mState = state;
     }
 
@@ -84,7 +86,7 @@ public boolean onTouchEvent(MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             final PanelView panel = selectPanelForTouchX(event.getX());
             boolean enabled = panel.isEnabled();
-            LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s %s", mState, panel,
+            if (DEBUG) LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s %s", mState, panel,
                     (enabled ? "" : " (disabled)"));
             if (!enabled)
                 return false;
@@ -96,15 +98,21 @@ public boolean onTouchEvent(MotionEvent event) {
 
     // called from PanelView when self-expanding, too
     public void startOpeningPanel(PanelView panel) {
-        LOG("startOpeningPanel: " + panel);
+        if (DEBUG) LOG("startOpeningPanel: " + panel);
         mTouchingPanel = panel;
         mPanelHolder.setSelectedPanel(mTouchingPanel);
+        for (PanelView pv : mPanels) {
+            if (pv != panel) {
+                pv.collapse();
+            }
+        }
     }
 
     public void panelExpansionChanged(PanelView panel, float frac) {
         boolean fullyClosed = true;
         PanelView fullyOpenedPanel = null;
-        LOG("panelExpansionChanged: start state=%d panel=%s", mState, panel.getName());
+        if (DEBUG) LOG("panelExpansionChanged: start state=%d panel=%s", mState, panel.getName());
+        mPanelExpandedFractionSum = 0f;
         for (PanelView pv : mPanels) {
             final boolean visible = pv.getVisibility() == View.VISIBLE;
             // adjust any other panels that may be partially visible
@@ -115,11 +123,10 @@ public void panelExpansionChanged(PanelView panel, float frac) {
                 }
                 fullyClosed = false;
                 final float thisFrac = pv.getExpandedFraction();
-                LOG("panelExpansionChanged:  -> %s: f=%.1f", pv.getName(), thisFrac);
+                mPanelExpandedFractionSum += (visible ? thisFrac : 0);
+                if (DEBUG) LOG("panelExpansionChanged:  -> %s: f=%.1f", pv.getName(), thisFrac);
                 if (panel == pv) {
                     if (thisFrac == 1f) fullyOpenedPanel = panel;
-                } else {
-                    pv.setExpandedFraction(1f-frac);
                 }
             }
             if (pv.getExpandedHeight() > 0f) {
@@ -128,6 +135,7 @@ public void panelExpansionChanged(PanelView panel, float frac) {
                 if (visible) pv.setVisibility(View.GONE);
             }
         }
+        mPanelExpandedFractionSum /= mPanels.size();
         if (fullyOpenedPanel != null && !mTracking) {
             go(STATE_OPEN);
             onPanelFullyOpened(fullyOpenedPanel);
@@ -136,7 +144,7 @@ public void panelExpansionChanged(PanelView panel, float frac) {
             onAllPanelsCollapsed();
         }
 
-        LOG("panelExpansionChanged: end state=%d [%s%s ]", mState,
+        if (DEBUG) LOG("panelExpansionChanged: end state=%d [%s%s ]", mState,
                 (fullyOpenedPanel!=null)?" fullyOpened":"", fullyClosed?" fullyClosed":"");
     }
 
@@ -148,9 +156,10 @@ public void collapseAllPanels(boolean animate) {
                 waiting = true;
             } else {
                 pv.setExpandedFraction(0); // just in case
+                pv.setVisibility(View.GONE);
             }
-            pv.setVisibility(View.GONE);
         }
+        if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting);
         if (!waiting) {
             // it's possible that nothing animated, so we replicate the termination 
             // conditions of panelExpansionChanged here
@@ -160,20 +169,20 @@ public void collapseAllPanels(boolean animate) {
     }
 
     public void onPanelPeeked() {
-        LOG("onPanelPeeked");
+        if (DEBUG) LOG("onPanelPeeked");
     }
 
     public void onAllPanelsCollapsed() {
-        LOG("onAllPanelsCollapsed");
+        if (DEBUG) LOG("onAllPanelsCollapsed");
     }
 
     public void onPanelFullyOpened(PanelView openPanel) {
-        LOG("onPanelFullyOpened");
+        if (DEBUG) LOG("onPanelFullyOpened");
     }
 
     public void onTrackingStarted(PanelView panel) {
         mTracking = true;
-        if (panel != mTouchingPanel) {
+        if (DEBUG && panel != mTouchingPanel) {
             LOG("shouldn't happen: onTrackingStarted(%s) != mTouchingPanel(%s)",
                     panel, mTouchingPanel);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java
@@ -7,7 +7,7 @@
 
 public class PanelHolder extends FrameLayout {
 
-    private int mSelectedPanelIndex;
+    private int mSelectedPanelIndex = -1;
     private PanelBar mBar;
 
     public PanelHolder(Context context, AttributeSet attrs) {
@@ -53,6 +53,7 @@ protected int getChildDrawingOrder(int childCount, int i) {
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
+                PanelBar.LOG("PanelHolder got touch in open air, closing panels");
                 mBar.collapseAllPanels(true);
                 break;
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -9,14 +9,9 @@
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.android.systemui.R;
-import com.android.systemui.statusbar.policy.BatteryController;
-import com.android.systemui.statusbar.policy.BluetoothController;
-import com.android.systemui.statusbar.policy.LocationController;
-import com.android.systemui.statusbar.policy.NetworkController;
 
 public class PanelView extends FrameLayout {
     public static final boolean DEBUG = PanelBar.DEBUG;
@@ -70,12 +65,16 @@ public void onTimeUpdate(TimeAnimator animation, long totalTime, long deltaTime)
         }
     };
 
-    private final Runnable mStopAnimator = new Runnable() { public void run() {
-        if (mTimeAnimator.isStarted()) {
-            mTimeAnimator.end();
-            mRubberbanding = false;
+    private final Runnable mStopAnimator = new Runnable() {
+        @Override
+        public void run() {
+            if (mTimeAnimator.isStarted()) {
+                mTimeAnimator.end();
+                mRubberbanding = false;
+                mClosing = false;
+            }
         }
-    }};
+    };
 
     private float mVel, mAccel;
     private int mFullHeight = 0;
@@ -90,20 +89,22 @@ private void animationTick(long dtms) {
             mTimeAnimator.setTimeListener(mAnimationCallback);
 
             mTimeAnimator.start();
-            
-            mRubberbanding = STRETCH_PAST_CONTENTS && mExpandedHeight > getFullHeight();
+
+            mRubberbanding = STRETCH_PAST_CONTENTS // is it enabled at all?
+                    && mExpandedHeight > getFullHeight() // are we past the end?
+                    && mVel >= -mFlingGestureMinDistPx; // was this not possibly a "close" gesture?
             if (mRubberbanding) {
                 mClosing = true;
             } else if (mVel == 0) {
-                // if the panel is less than halfway open, close it 
+                // if the panel is less than halfway open, close it
                 mClosing = (mFinalTouchY / getFullHeight()) < 0.5f;
             } else {
                 mClosing = mExpandedHeight > 0 && mVel < 0;
             }
         } 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);
+            if (DEBUG) LOG("tick: v=%.2fpx/s dt=%.4fs", mVel, dt);
+            if (DEBUG) LOG("tick: before: h=%d", (int) mExpandedHeight);
 
             final float fh = getFullHeight();
             boolean braking = false;
@@ -136,12 +137,12 @@ private void animationTick(long dtms) {
             }
 
             float h = mExpandedHeight + mVel * dt;
-            
+
             if (mRubberbanding && h < fh) {
                 h = fh;
             }
 
-            LOG("tick: new h=%d closing=%s", (int) h, mClosing?"true":"false");
+            if (DEBUG) LOG("tick: new h=%d closing=%s", (int) h, mClosing?"true":"false");
 
             setExpandedHeightInternal(h);
 
@@ -205,14 +206,14 @@ protected void onFinishInflate() {
         loadDimens();
 
         mHandleView = findViewById(R.id.handle);
-        LOG("handle view: " + mHandleView);
+        if (DEBUG) LOG("handle view: " + mHandleView);
         if (mHandleView != null) {
             mHandleView.setOnTouchListener(new View.OnTouchListener() {
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
                     final float y = event.getY();
                     final float rawY = event.getRawY();
-                    LOG("handle.onTouch: a=%s y=%.1f rawY=%.1f off=%.1f",
+                    if (DEBUG) LOG("handle.onTouch: a=%s y=%.1f rawY=%.1f off=%.1f",
                             MotionEvent.actionToString(event.getAction()),
                             y, rawY, mTouchOffset);
                     PanelView.this.getLocationOnScreen(mAbsPos);
@@ -224,6 +225,7 @@ public boolean onTouch(View v, MotionEvent event) {
                             mInitialTouchY = y;
                             mVelocityTracker = VelocityTracker.obtain();
                             trackMovement(event);
+                            mTimeAnimator.cancel(); // end any outstanding animations
                             mBar.onTrackingStarted(PanelView.this);
                             mTouchOffset = (rawY - mAbsPos[1]) - PanelView.this.getExpandedHeight();
                             break;
@@ -263,7 +265,7 @@ public boolean onTouch(View v, MotionEvent event) {
 
                             // if you've barely moved your finger, we treat the velocity as 0
                             // preventing spurious flings due to touch screen jitter
-                            final float deltaY = (float)Math.abs(mFinalTouchY - mInitialTouchY);
+                            final float deltaY = Math.abs(mFinalTouchY - mInitialTouchY);
                             if (deltaY < mFlingGestureMinDistPx
                                     || vel < mFlingGestureMinDistPx) {
                                 vel = 0;
@@ -273,7 +275,7 @@ public boolean onTouch(View v, MotionEvent event) {
                                 vel = -vel;
                             }
 
-                            LOG("gesture: dy=%f vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f",
+                            if (DEBUG) LOG("gesture: dy=%f vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f",
                                     deltaY,
                                     mVelocityTracker.getXVelocity(),
                                     mVelocityTracker.getYVelocity(),
@@ -312,7 +314,7 @@ public String getName() {
 
     @Override
     protected void onViewAdded(View child) {
-        LOG("onViewAdded: " + child);
+        if (DEBUG) LOG("onViewAdded: " + child);
     }
 
     public View getHandle() {
@@ -324,15 +326,15 @@ public View getHandle() {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
-        LOG("onMeasure(%d, %d) -> (%d, %d)",
+        if (DEBUG) LOG("onMeasure(%d, %d) -> (%d, %d)",
                 widthMeasureSpec, heightMeasureSpec, getMeasuredWidth(), getMeasuredHeight());
 
         // Did one of our children change size?
         int newHeight = getMeasuredHeight();
         if (newHeight != mFullHeight) {
             mFullHeight = newHeight;
             // If the user isn't actively poking us, let's rubberband to the content
-            if (!mTracking && !mRubberbanding && !mTimeAnimator.isStarted() 
+            if (!mTracking && !mRubberbanding && !mTimeAnimator.isStarted()
                     && mExpandedHeight > 0 && mExpandedHeight != mFullHeight) {
                 mExpandedHeight = mFullHeight;
             }
@@ -351,7 +353,7 @@ public void setExpandedHeight(float height) {
 
     @Override
     protected void onLayout (boolean changed, int left, int top, int right, int bottom) {
-        LOG("onLayout: changed=%s, bottom=%d eh=%d fh=%d", changed?"T":"f", bottom, (int)mExpandedHeight, (int)mFullHeight);
+        if (DEBUG) LOG("onLayout: changed=%s, bottom=%d eh=%d fh=%d", changed?"T":"f", bottom, (int)mExpandedHeight, mFullHeight);
         super.onLayout(changed, left, top, right, bottom);
     }
 
@@ -365,7 +367,7 @@ public void setExpandedHeightInternal(float h) {
         if (!(STRETCH_PAST_CONTENTS && (mTracking || mRubberbanding)) && h > fh) h = fh;
         mExpandedHeight = h;
 
-        LOG("setExpansion: height=%.1f fh=%.1f tracking=%s rubber=%s", h, fh, mTracking?"T":"f", mRubberbanding?"T":"f");
+        if (DEBUG) LOG("setExpansion: height=%.1f fh=%.1f tracking=%s rubber=%s", h, fh, mTracking?"T":"f", mRubberbanding?"T":"f");
 
         requestLayout();
 //        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
@@ -377,9 +379,9 @@ public void setExpandedHeightInternal(float h) {
 
     private float getFullHeight() {
         if (mFullHeight <= 0) {
-            LOG("Forcing measure() since fullHeight=" + mFullHeight);
-            measure(MeasureSpec.makeMeasureSpec(LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY));
+            if (DEBUG) LOG("Forcing measure() since fullHeight=" + mFullHeight);
+            measure(MeasureSpec.makeMeasureSpec(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY));
         }
         return mFullHeight;
     }
@@ -397,11 +399,15 @@ public float getExpandedFraction() {
     }
 
     public boolean isFullyExpanded() {
-        return mExpandedHeight == getFullHeight();
+        return mExpandedHeight >= getFullHeight();
     }
 
     public boolean isFullyCollapsed() {
-        return mExpandedHeight == 0;
+        return mExpandedHeight <= 0;
+    }
+
+    public boolean isCollapsing() {
+        return mClosing;
     }
 
     public void setBar(PanelBar panelBar) {
@@ -411,17 +417,19 @@ public void setBar(PanelBar panelBar) {
     public void collapse() {
         // TODO: abort animation or ongoing touch
         if (!isFullyCollapsed()) {
+            // collapse() should never be a rubberband, even if an animation is already running
+            mRubberbanding = false;
             fling(-mSelfCollapseVelocityPx, /*always=*/ true);
         }
     }
 
     public void expand() {
         if (isFullyCollapsed()) {
             mBar.startOpeningPanel(this);
-            LOG("expand: calling fling(%s, true)", mSelfExpandVelocityPx);
+            if (DEBUG) LOG("expand: calling fling(%s, true)", mSelfExpandVelocityPx);
             fling (mSelfExpandVelocityPx, /*always=*/ true);
         } else if (DEBUG) {
-            LOG("skipping expansion: is expanded");
+            if (DEBUG) LOG("skipping expansion: is expanded");
         }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
