Merge "Ignore QS touches if scrolling is not possible."

diff --cc packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
index 9cda75c,8e99afb..a44fd9a
--- 1/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
--- 2/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
@@@ -51,9 -49,27 +51,26 @@@ public class QSScrollLayout extends Nes
          addView(linearLayout);
      }
  
+ 
+     @Override
+     public boolean onInterceptTouchEvent(MotionEvent ev) {
+         if (canScrollVertically(1) || canScrollVertically(-1)) {
+             return super.onInterceptTouchEvent(ev);
+         }
+         return false;
+     }
+ 
+     @Override
+     public boolean onTouchEvent(MotionEvent ev) {
+         if (canScrollVertically(1) || canScrollVertically(-1)) {
+             return super.onTouchEvent(ev);
+         }
+         return false;
+     }
+ 
      public boolean shouldIntercept(MotionEvent ev) {
 -        getHitRect(mHitRect);
 -        if (!mHitRect.contains((int) ev.getX(), (int) ev.getY())) {
 -            // Do not intercept touches that are not within this view's bounds.
 +        if (ev.getY() > (getBottom() - mFooterHeight)) {
 +            // Do not intercept touches that are below the divider between QS and the footer.
              return false;
          }
          if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {