SystemUI: improve one finger notification expansion

added missing setForceOneFinger method

Sometimes the quick settings ribbon would eat the initial ACTION_DOWN
setting mInitialTouchY in the expand helper, but we are clearly not in a
notification that we can expand here. So only set the initial y point if
we are inside the notification scrollview.

Change-Id: I628553ac15cc6b4ee3c682fe46bd1d96c6bc154d

Conflicts:
	packages/SystemUI/src/com/android/systemui/ExpandHelper.java

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

@@ -76,6 +76,7 @@ public interface Callback {
     private int mExpansionStyle = NONE;
     private boolean mWatchingForPull;
     private boolean mHasPopped;
+    private boolean mForcedOneFinger;
     private View mEventSource;
     private View mCurrView;
     private View mCurrViewTopGlow;
@@ -304,6 +305,10 @@ public void setScrollView(View scrollView) {
         mScrollView = scrollView;
     }
 
+    public void setForceOneFinger(boolean forceOneFinger) {
+        mForcedOneFinger = forceOneFinger;
+    }
+
     private float calculateGlow(float target, float actual) {
         // glow if overscale
         if (DEBUG_GLOW) Log.d(TAG, "target: " + target + " actual: " + actual);
@@ -407,7 +412,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 
             case MotionEvent.ACTION_DOWN:
                 final boolean inside = isInside(mScrollView, x, y);
-                mWatchingForPull = isInside(mScrollView, x, y);
+                mWatchingForPull = (inside || mForcedOneFinger);
                 mLastMotionY = y;
                 if (inside) {
                     mInitialTouchY = y;
@@ -528,6 +533,10 @@ private void startExpanding(View v, int expandType) {
         }
     }
 
+    public float getNaturalHeight() {
+        return mNaturalHeight;
+    }
+
     private void finishExpanding(boolean force) {
         if (!mExpanding) return;