Merge "Allow QS to be closed via drag on background." into jb-mr1-dev

2 files changed, 62 insertions, 2 deletions

diff --git a/packages/SystemUI/res/layout/quick_settings.xml b/packages/SystemUI/res/layout/quick_settings.xml
index c1bcdfe..d119cf5 100644
--- a/packages/SystemUI/res/layout/quick_settings.xml
+++ b/packages/SystemUI/res/layout/quick_settings.xml
@@ -22,10 +22,11 @@
     android:background="@drawable/notification_panel_bg"
     >
     <!-- TODO: Put into ScrollView -->
-    <ScrollView
+    <com.android.systemui.statusbar.phone.QuickSettingsScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/close_handle_underlap"
+        android:overScrollMode="ifContentScrolls"
         >
         <com.android.systemui.statusbar.phone.QuickSettingsContainerView
             android:id="@+id/quick_settings_container"
@@ -34,7 +35,7 @@
             android:animateLayoutChanges="true"
             android:columnCount="@integer/quick_settings_num_columns"
             />
-    </ScrollView>
+    </com.android.systemui.statusbar.phone.QuickSettingsScrollView>
 
     <View
         android:id="@+id/handle"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java
new file mode 100644
index 0000000..8a2f8d6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.phone;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ScrollView;
+
+public class QuickSettingsScrollView extends ScrollView {
+
+    public QuickSettingsScrollView(Context context) {
+        super(context);
+    }
+
+    public QuickSettingsScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public QuickSettingsScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    // Y U NO PROTECTED
+    private int getScrollRange() {
+        int scrollRange = 0;
+        if (getChildCount() > 0) {
+            View child = getChildAt(0);
+            scrollRange = Math.max(0,
+                    child.getHeight() - (getHeight() - mPaddingBottom - mPaddingTop));
+        }
+        return scrollRange;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        final int range = getScrollRange();
+        if (range == 0) {
+            return false;
+        }
+
+        return super.onTouchEvent(ev);
+    }
+}