diff options
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout-sw600dp/heads_up.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/flip_settings.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/heads_up.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 67 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 37 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_flip_button.xml | 27 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/super_status_bar.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-sw600dp-land/dimens.xml | 22 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-sw600dp/dimens.xml | 7 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-sw720dp/dimens.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 21 |
12 files changed, 78 insertions, 116 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/heads_up.xml b/packages/SystemUI/res/layout-sw600dp/heads_up.xml index 71f7c21..f7035fe 100644 --- a/packages/SystemUI/res/layout-sw600dp/heads_up.xml +++ b/packages/SystemUI/res/layout-sw600dp/heads_up.xml @@ -25,7 +25,6 @@ android:id="@+id/content_holder" android:layout_height="wrap_content" android:layout_width="@dimen/notification_panel_width" - android:layout_marginStart="@dimen/notification_panel_margin_left" android:background="@drawable/heads_up_window_bg" /> </com.android.systemui.statusbar.policy.HeadsUpNotificationView> diff --git a/packages/SystemUI/res/layout/flip_settings.xml b/packages/SystemUI/res/layout/flip_settings.xml index f3c1b90..28d9625 100644 --- a/packages/SystemUI/res/layout/flip_settings.xml +++ b/packages/SystemUI/res/layout/flip_settings.xml @@ -22,5 +22,4 @@ android:layout_height="wrap_content" android:background="#5f000000" android:animateLayoutChanges="true" - android:visibility="gone" android:columnCount="@integer/quick_settings_num_columns" />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/heads_up.xml b/packages/SystemUI/res/layout/heads_up.xml index 3a58b84..e4954e7 100644 --- a/packages/SystemUI/res/layout/heads_up.xml +++ b/packages/SystemUI/res/layout/heads_up.xml @@ -22,6 +22,5 @@ android:layout_height="wrap_content" android:layout_width="@dimen/notification_panel_width" android:id="@+id/content_holder" - android:layout_marginStart="@dimen/notification_panel_margin_left" android:background="@drawable/notification_panel_bg" />
\ 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 761ad42..3267c36 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -23,9 +23,7 @@ xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/notification_panel" android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingTop="@dimen/notification_panel_padding_top" - android:layout_marginStart="@dimen/notification_panel_margin_left" + android:layout_height="match_parent" > <include @@ -36,15 +34,6 @@ android:layout_gravity="bottom" /> - <include - layout="@layout/status_bar_flip_button" - android:id="@+id/keyguard_flipper" - android:layout_width="50dp" - android:layout_height="50dp" - android:layout_gravity="right|top" - android:layout_marginTop="@dimen/status_bar_height" - android:visibility="gone" /> - <com.android.keyguard.CarrierText android:id="@+id/keyguard_carrier_text" android:layout_width="wrap_content" @@ -54,11 +43,6 @@ android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" /> - <include layout="@layout/status_bar_expanded_header" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_panel_header_height" - /> - <include layout="@layout/keyguard_status_view" android:layout_height="wrap_content" @@ -74,27 +58,54 @@ android:visibility="gone" /> - <FrameLayout + <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer android:id="@+id/notification_container_parent" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/close_handle_underlap" - > - <include - layout="@layout/flip_settings" - android:layout_marginTop="@dimen/notification_panel_header_height" + android:clipToPadding="false" + android:clipChildren="false"> + + <com.android.systemui.statusbar.phone.ObservableScrollView + android:id="@+id/scroll_view" android:layout_width="match_parent" - android:layout_height="wrap_content" - /> + android:layout_height="match_parent" + android:visibility="invisible" + android:scrollbars="none" + android:fillViewport="true"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <include + layout="@layout/flip_settings" + android:layout_marginTop="@dimen/status_bar_header_height_expanded" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <!-- A view to reserve space for the collapsed stack --> + <View + android:layout_height="@dimen/collapsed_stack_height" + android:layout_width="match_parent"/> + </LinearLayout> + </com.android.systemui.statusbar.phone.ObservableScrollView> + <com.android.systemui.statusbar.stack.NotificationStackScrollLayout android:id="@+id/notification_stack_scroller" android:layout_width="match_parent" - android:layout_height="wrap_content" - /> - </FrameLayout> + android:layout_height="match_parent" + android:layout_marginBottom="@dimen/close_handle_underlap"/> + + </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> + + + <include layout="@layout/status_bar_expanded_header" + android:layout_width="match_parent" + android:layout_height="@dimen/status_bar_header_height" + /> <include layout="@layout/keyguard_bottom_area" android:visibility="gone" /> + </com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel --> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 8975728..460dd4b 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -15,21 +15,30 @@ ** limitations under the License. --> -<LinearLayout +<!-- Extends RelativeLayout --> +<com.android.systemui.statusbar.phone.StatusBarHeaderView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="@dimen/notification_panel_header_height" - android:background="@drawable/notification_header_bg" + android:layout_height="@dimen/status_bar_header_height" android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="false" > + + <View + android:id="@+id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/notification_header_bg" + android:clickable="true" + /> <RelativeLayout android:id="@+id/datetime" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_gravity="start" android:paddingStart="8dp" android:paddingEnd="8dp" android:background="@drawable/ic_notify_button_bg" @@ -55,12 +64,6 @@ /> </RelativeLayout> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1" - /> - <TextView android:id="@+id/header_debug_info" android:visibility="invisible" @@ -74,18 +77,22 @@ android:padding="2dp" /> + <include layout="@layout/status_bar_flip_button" + android:id="@+id/header_flipper" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_alignParentEnd="true"/> + <ImageView android:id="@+id/clear_all_button" android:layout_width="50dp" android:layout_height="50dp" + android:layout_toStartOf="@id/header_flipper" android:scaleType="center" android:src="@drawable/ic_notify_clear" android:background="@drawable/ic_notify_button_bg" android:contentDescription="@string/accessibility_clear_all" /> - <include layout="@layout/status_bar_flip_button" - android:id="@+id/header_flipper" - android:layout_width="50dp" - android:layout_height="50dp" - android:layout_marginStart="12dp" /> -</LinearLayout> + + +</com.android.systemui.statusbar.phone.StatusBarHeaderView> diff --git a/packages/SystemUI/res/layout/status_bar_flip_button.xml b/packages/SystemUI/res/layout/status_bar_flip_button.xml index b7dff8c..f4d7033 100644 --- a/packages/SystemUI/res/layout/status_bar_flip_button.xml +++ b/packages/SystemUI/res/layout/status_bar_flip_button.xml @@ -15,22 +15,11 @@ ~ limitations under the License --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="50dp" - android:layout_height="50dp"> - <ImageView android:id="@+id/settings_button" - android:layout_width="50dp" - android:layout_height="50dp" - android:scaleType="center" - android:src="@drawable/ic_notify_settings" - android:background="@drawable/ic_notify_button_bg" - android:contentDescription="@string/accessibility_desc_quick_settings" /> - <ImageView android:id="@+id/notification_button" - android:layout_width="50dp" - android:layout_height="50dp" - android:scaleType="center" - android:src="@drawable/ic_notifications" - android:background="@drawable/ic_notify_button_bg" - android:visibility="gone" - android:contentDescription="@string/accessibility_notifications_button" /> -</FrameLayout>
\ No newline at end of file +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/settings_button" + android:layout_width="50dp" + android:layout_height="50dp" + android:scaleType="center" + android:src="@drawable/ic_notify_quicksettings" + android:background="@drawable/ic_notify_button_bg" + android:contentDescription="@string/accessibility_desc_quick_settings"/>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 61d43d7..f9b022c 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -33,11 +33,10 @@ <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_height="match_parent" > <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="start|top" /> </com.android.systemui.statusbar.phone.PanelHolder> diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml deleted file mode 100644 index c6c0719..0000000 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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. -*/ ---> -<resources> - <!-- Layout parameters for the notification panel --> - <dimen name="notification_panel_margin_bottom">0dp</dimen> - <dimen name="notification_panel_margin_left">32dp</dimen> -</resources> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 92e3885..7372181 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -19,10 +19,6 @@ <!-- The width of the notification panel window: 446 + 16 + 16 (padding in the bg drawable) --> <dimen name="notification_panel_width">478dp</dimen> - <!-- Layout parameters for the notification panel --> - <dimen name="notification_panel_margin_bottom">192dp</dimen> - <dimen name="notification_panel_margin_left">16dp</dimen> - <!-- Gravity for the notification panel --> <!-- 0x31 = top|center_horizontal --> <integer name="notification_panel_layout_gravity">0x31</integer> @@ -43,9 +39,6 @@ <dimen name="status_bar_recents_thumbnail_width">200dp</dimen> <dimen name="status_bar_recents_thumbnail_height">177dp</dimen> - <!-- On tablets, panels drop from the statusbar instead of overlapping it. --> - <dimen name="panel_holder_padding_top">@*android:dimen/status_bar_height</dimen> - <!-- Minimum fraction of the screen that should be taken up by the notification panel. --> <item type="dimen" name="notification_panel_min_height_frac">40%</item> diff --git a/packages/SystemUI/res/values-sw720dp/dimens.xml b/packages/SystemUI/res/values-sw720dp/dimens.xml index b1fc00a..a1c5b66 100644 --- a/packages/SystemUI/res/values-sw720dp/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp/dimens.xml @@ -24,8 +24,6 @@ <!-- The width of the ticker, including the icon --> <dimen name="notification_ticker_width">360dp</dimen> - <!-- Status bar panel bottom offset (height of status bar - overlap) --> - <dimen name="status_bar_panel_bottom_offset">36dp</dimen> <!-- gap on either side of status bar notification icons --> <dimen name="status_bar_icon_padding">1dp</dimen> <!-- The width of the notification panel window --> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index c3ccb59..93a75bc 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -99,9 +99,6 @@ <integer name="blinds_pop_duration_ms">10</integer> - <!-- The device supports quick settings. --> - <bool name="config_hasQuickSettings">true</bool> - <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? --> <bool name="config_show4GForLTE">true</bool> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index d763bd6..8d3a565 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -152,21 +152,11 @@ <!-- Amount of close_handle that will NOT overlap the notification list --> <dimen name="close_handle_underlap">32dp</dimen> - <!-- Height of the notification panel header bar --> - <dimen name="notification_panel_header_height">48dp</dimen> + <!-- Height of the status bar header bar --> + <dimen name="status_bar_header_height">48dp</dimen> - <!-- Extra space above the panel --> - <dimen name="notification_panel_padding_top">0dp</dimen> - - <!-- Extra space above the clock in the panel --> - <dimen name="notification_panel_header_padding_top">0dp</dimen> - - <!-- Extra space above the panel holder --> - <dimen name="panel_holder_padding_top">0dp</dimen> - - <!-- Layout parameters for the notification panel --> - <dimen name="notification_panel_margin_bottom">0dp</dimen> - <dimen name="notification_panel_margin_left">0dp</dimen> + <!-- Height of the status bar header bar when expanded --> + <dimen name="status_bar_header_height_expanded">144dp</dimen> <!-- Gravity for the notification panel --> <!-- 0x37 = fill_horizontal|top --> @@ -261,6 +251,9 @@ <!-- The padding between the individual notification cards. --> <dimen name="notification_padding">3dp</dimen> + <!-- The total height of the stack in its collapsed size (i.e. when quick settings is open) --> + <dimen name="collapsed_stack_height">94dp</dimen> + <!-- Width of the zen mode interstitial dialog. --> <dimen name="zen_mode_dialog_width">320dp</dimen> |