diff options
author | John Spurlock <jspurlock@google.com> | 2014-04-15 16:14:46 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2014-04-17 10:26:45 -0400 |
commit | 73203ebf976c403e40deabc15beb5ef01ac20cb0 (patch) | |
tree | f436960279bd2a7e533920dc25bd812d10fd1a00 /packages/SystemUI/res | |
parent | 33ac0dfc9f9480b71aa45436807682219e3e160b (diff) | |
download | frameworks_base-73203ebf976c403e40deabc15beb5ef01ac20cb0.zip frameworks_base-73203ebf976c403e40deabc15beb5ef01ac20cb0.tar.gz frameworks_base-73203ebf976c403e40deabc15beb5ef01ac20cb0.tar.bz2 |
Interim quick settings update.
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.
Don't allow QS to scroll, cap to max rows.
Add scrim over panel to indicate that this is purely temporary.
Bug:14081801
Bug:14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
Diffstat (limited to 'packages/SystemUI/res')
24 files changed, 46 insertions, 15 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png Binary files differindex 092b561..3c0dc4e 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png Binary files differindex 064860d..3b1944d 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png Binary files differdeleted file mode 100644 index 13f6b7f..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png Binary files differdeleted file mode 100644 index ecdb240..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png Binary files differdeleted file mode 100644 index c98911c..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png Binary files differdeleted file mode 100644 index bb99022..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png Binary files differdeleted file mode 100644 index d9d8b13..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png Binary files differdeleted file mode 100644 index 09e0a3c..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_open_normal.png Binary files differdeleted file mode 100644 index c0855b5..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_open_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_quicksettings_normal.png Binary files differdeleted file mode 100644 index e3fb992..0000000 --- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_quicksettings_normal.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png Binary files differindex ae5d263..8010ce7 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png Binary files differindex 32fbed4..807f607 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png Binary files differindex 990f8bb..6d46fdd 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png Binary files differindex 96eaafe..e562bc2 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png Binary files differindex 60579f9..7742207 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_quicksettings_normal.png Binary files differindex abb9b18..a2e8fe1 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_quicksettings_normal.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/layout/flip_settings.xml b/packages/SystemUI/res/layout/flip_settings.xml index 1b8898c5..28d9625 100644 --- a/packages/SystemUI/res/layout/flip_settings.xml +++ b/packages/SystemUI/res/layout/flip_settings.xml @@ -14,18 +14,12 @@ limitations under the License. --> -<com.android.systemui.statusbar.phone.QuickSettingsScrollView +<com.android.systemui.statusbar.phone.QuickSettingsContainerView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/quick_settings_container" + android:padding="@dimen/notification_side_padding" 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>
\ No newline at end of file + android:background="#5f000000" + android:animateLayoutChanges="true" + android:columnCount="@integer/quick_settings_num_columns" />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 8f4417e..8a3f090 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -41,7 +41,7 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_gravity="right|top" - android:layout_marginTop="@*android:dimen/status_bar_height" + android:layout_marginTop="@dimen/status_bar_height" android:visibility="gone" /> <LinearLayout diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 9176d24..2b01a06 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -27,14 +27,14 @@ <include layout="@layout/status_bar" android:layout_width="match_parent" - android:layout_height="@*android:dimen/status_bar_height" /> + android:layout_height="@dimen/status_bar_height" /> <com.android.systemui.statusbar.phone.PanelHolder android:id="@+id/panel_holder" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="@dimen/panel_holder_padding_top" - android:layout_marginBottom="@*android:dimen/navigation_bar_height"> + android:layout_marginBottom="@dimen/navigation_bar_height"> <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/values-land/config.xml b/packages/SystemUI/res/values-land/config.xml index 6476d88..7223773 100644 --- a/packages/SystemUI/res/values-land/config.xml +++ b/packages/SystemUI/res/values-land/config.xml @@ -27,6 +27,9 @@ <!-- The number of columns in the QuickSettings --> <integer name="quick_settings_num_columns">6</integer> + <!-- The maximum number of rows in the QuickSettings --> + <integer name="quick_settings_max_rows">2</integer> + <!-- The number of columns that the top level tiles span in the QuickSettings --> <integer name="quick_settings_user_time_settings_tile_span">2</integer> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/packages/SystemUI/res/values-sw600dp/config.xml index 440ead6..c6bc44d 100644 --- a/packages/SystemUI/res/values-sw600dp/config.xml +++ b/packages/SystemUI/res/values-sw600dp/config.xml @@ -26,6 +26,9 @@ <!-- The number of columns in the QuickSettings --> <integer name="quick_settings_num_columns">3</integer> + <!-- The maximum number of rows in the QuickSettings --> + <integer name="quick_settings_max_rows">4</integer> + <!-- The number of columns that the top level tiles span in the QuickSettings --> <integer name="quick_settings_user_time_settings_tile_span">1</integer> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 73e3e05..f908a1e 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -81,6 +81,12 @@ <!-- The number of columns in the QuickSettings --> <integer name="quick_settings_num_columns">3</integer> + <!-- The maximum number of rows in the QuickSettings --> + <integer name="quick_settings_max_rows">4</integer> + + <!-- The maximum number of rows in the QuickSettings when on the keyguard --> + <integer name="quick_settings_max_rows_keyguard">3</integer> + <!-- The number of columns that the top level tiles span in the QuickSettings --> <integer name="quick_settings_user_time_settings_tile_span">1</integer> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index e7959ab..9aacf42 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -269,4 +269,7 @@ <!-- Camera affordance drag distance --> <dimen name="camera_drag_distance">100dp</dimen> + + <dimen name="quick_settings_tmp_scrim_stroke_width">8dp</dimen> + <dimen name="quick_settings_tmp_scrim_text_size">30dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/internal.xml b/packages/SystemUI/res/values/internal.xml new file mode 100644 index 0000000..ddaab94 --- /dev/null +++ b/packages/SystemUI/res/values/internal.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<resources> + <dimen name="status_bar_height">@*android:dimen/status_bar_height</dimen> + <dimen name="navigation_bar_height">@*android:dimen/navigation_bar_height</dimen> + <drawable name="notification_quantum_bg">@*android:drawable/notification_quantum_bg</drawable> +</resources> + |