diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-03 07:59:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 07:59:09 -0700 |
| commit | 1fd3474585e2f2c5c87572e8b1c6c0c05b718b1a (patch) | |
| tree | a67ad6c3623d17ceb1d1310df78731577da17c39 /packages/SystemUI/res | |
| parent | 211f2309ab7feec435d8d64b732d17110d4ba999 (diff) | |
| parent | e5f7ec0576a25abc7a9754c72d61d86a251347e2 (diff) | |
| download | frameworks_base-1fd3474585e2f2c5c87572e8b1c6c0c05b718b1a.zip frameworks_base-1fd3474585e2f2c5c87572e8b1c6c0c05b718b1a.tar.gz frameworks_base-1fd3474585e2f2c5c87572e8b1c6c0c05b718b1a.tar.bz2 | |
Merge "Allow QS to be closed via drag on background." into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/quick_settings.xml | 5 |
1 files changed, 3 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" |