e5f7ec0576
This was already working fine for the area of the panel below the ScrollView, but intuitively it seems that dragging in the unused portion of a partially-filled row would behave the same way. Because it's part of the scrolling content, though, drags in that region are (correctly) interpreted by the ScrollView as scrolling requests. The new QuickSettingsScrollView works around this by ignoring touch events if its contents are too small to be scrolled. So in the common case (QS tiles on a phone) you will be able to drag in any empty area and have your taps interpreted by the PanelView (which hands them off to the handle to collapse the view). We don't handle drags in empty areas when there are too many tiles to show on-screen, and really, it's impossible to do so: this gesture should then definitely be interpreted as a scroll. Bug: 7203193 Change-Id: I4cfcb029481a88d3604c7105185e8bcb7dbde8a5
45 lines
1.9 KiB
XML
45 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- 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.
|
|
-->
|
|
|
|
<com.android.systemui.statusbar.phone.SettingsPanelView
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/settings_panel"
|
|
android:background="@drawable/notification_panel_bg"
|
|
>
|
|
<!-- TODO: Put into 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"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:animateLayoutChanges="true"
|
|
android:columnCount="@integer/quick_settings_num_columns"
|
|
/>
|
|
</com.android.systemui.statusbar.phone.QuickSettingsScrollView>
|
|
|
|
<View
|
|
android:id="@+id/handle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="@dimen/close_handle_height"
|
|
/>
|
|
</com.android.systemui.statusbar.phone.SettingsPanelView > |