diff options
Diffstat (limited to 'packages/SystemUI/res/layout')
30 files changed, 632 insertions, 372 deletions
diff --git a/packages/SystemUI/res/layout/assist_orb.xml b/packages/SystemUI/res/layout/assist_orb.xml new file mode 100644 index 0000000..ab0a0a5 --- /dev/null +++ b/packages/SystemUI/res/layout/assist_orb.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* apps/common/assets/default/default/skins/StatusBar.xml +** +** Copyright 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. +*/ +--> + +<!-- Extends FrameLayout --> +<com.android.systemui.assist.AssistOrbContainer + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.systemui.statusbar.AlphaOptimizedView + android:layout_width="match_parent" + android:layout_height="@dimen/assist_orb_scrim_height" + android:layout_gravity="bottom" + android:id="@+id/assist_orb_scrim" + android:background="@drawable/assist_orb_scrim"/> + + <com.android.systemui.assist.AssistOrbView + android:id="@+id/assist_orb" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/search_logo"/> + </com.android.systemui.assist.AssistOrbView> + + <com.android.systemui.statusbar.AlphaOptimizedView + android:id="@+id/assist_orb_navbar_scrim" + android:layout_height="@dimen/assist_orb_navbar_scrim_height" + android:layout_width="match_parent" + android:layout_gravity="bottom" + android:elevation="50dp" + android:outlineProvider="none" + android:background="@drawable/assist_orb_navbar_scrim"/> + +</com.android.systemui.assist.AssistOrbContainer>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/carrier_label.xml b/packages/SystemUI/res/layout/carrier_label.xml deleted file mode 100644 index 41a1fff..0000000 --- a/packages/SystemUI/res/layout/carrier_label.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/carrier_label" - android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network" - android:layout_height="@dimen/carrier_label_height" - android:layout_width="match_parent" - android:layout_gravity="bottom" - android:layout_marginBottom="@dimen/close_handle_height" - android:gravity="center" - android:visibility="invisible" - />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 4cf4f52d..fca8231 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -21,7 +21,8 @@ android:id="@+id/keyguard_bottom_area" android:layout_height="match_parent" android:layout_width="match_parent" - > + android:outlineProvider="none" + android:elevation="5dp" > <!-- Put it above the status bar header --> <com.android.systemui.statusbar.phone.KeyguardIndicationTextView android:id="@+id/keyguard_indication_text" @@ -67,7 +68,6 @@ android:layout_gravity="bottom|center_horizontal" android:src="@drawable/ic_lock_24dp" android:scaleType="center" - android:tint="#ffffffff" android:contentDescription="@string/accessibility_unlock_button" /> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView> diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml index 97697189..6a4ac2c 100644 --- a/packages/SystemUI/res/layout/mobile_signal_group.xml +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml @@ -23,11 +23,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" > - <ImageView + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneLightTheme" android:id="@+id/mobile_signal" android:layout_height="wrap_content" android:layout_width="wrap_content" /> + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/mobile_signal_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:alpha="0.0" + /> <ImageView android:id="@+id/mobile_type" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/notification_children_container.xml b/packages/SystemUI/res/layout/notification_children_container.xml new file mode 100644 index 0000000..ac6a000 --- /dev/null +++ b/packages/SystemUI/res/layout/notification_children_container.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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.stack.NotificationChildrenContainer + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> diff --git a/packages/SystemUI/res/layout/notification_children_divider.xml b/packages/SystemUI/res/layout/notification_children_divider.xml new file mode 100644 index 0000000..f011afe --- /dev/null +++ b/packages/SystemUI/res/layout/notification_children_divider.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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.AlphaOptimizedView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/notification_more_divider" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_children_divider_height" + android:background="@*android:drawable/notification_template_divider" /> diff --git a/packages/SystemUI/res/layout/notification_collapse_button.xml b/packages/SystemUI/res/layout/notification_collapse_button.xml new file mode 100644 index 0000000..3ec5f63 --- /dev/null +++ b/packages/SystemUI/res/layout/notification_collapse_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_bottom_decor_height"> + <TextView + android:id="@+id/notification_expand_button" + android:layout_width="wrap_content" + android:layout_height="@dimen/notification_bottom_decor_height" + android:background="@null" + android:layout_gravity="top|center_horizontal" + android:gravity="center_vertical|center_horizontal" + android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title" + android:text="@string/notification_collapse_button_text" + android:drawableEnd="@drawable/ic_collapse_children" + android:drawablePadding="1dp" + /> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/notification_expand_button.xml b/packages/SystemUI/res/layout/notification_expand_button.xml new file mode 100644 index 0000000..3c478f7 --- /dev/null +++ b/packages/SystemUI/res/layout/notification_expand_button.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_bottom_decor_height"> + <TextView + android:id="@+id/notification_expand_button" + android:layout_width="wrap_content" + android:layout_height="@dimen/notification_bottom_decor_height" + android:background="@null" + android:layout_gravity="top|center_horizontal" + android:gravity="center_vertical|center_horizontal" + android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title" + android:text="@string/notification_expand_button_text" + android:drawableEnd="@drawable/ic_expand_children" + android:drawablePadding="1dp" + /> + <com.android.systemui.statusbar.AlphaOptimizedView + android:id="@+id/notification_expand_divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_gravity="top|center" + android:background="@*android:drawable/notification_template_divider" /> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/notification_public_default.xml b/packages/SystemUI/res/layout/notification_public_default.xml index acfc4bb..044ba09 100644 --- a/packages/SystemUI/res/layout/notification_public_default.xml +++ b/packages/SystemUI/res/layout/notification_public_default.xml @@ -16,12 +16,9 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" > <ImageView android:id="@+id/icon" android:layout_width="40dp" @@ -37,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:layout_alignParentEnd="true" - android:layout_alignBaseline="@id/title" + android:layout_alignBaseline="@+id/title" android:singleLine="true" android:gravity="center" android:paddingStart="8dp" diff --git a/packages/SystemUI/res/layout/recents.xml b/packages/SystemUI/res/layout/recents.xml index 8f367a6..bdda527 100644 --- a/packages/SystemUI/res/layout/recents.xml +++ b/packages/SystemUI/res/layout/recents.xml @@ -15,7 +15,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="match_parent"> <!-- Status Bar Scrim View --> <ImageView @@ -29,9 +29,10 @@ <!-- Recents View --> <com.android.systemui.recents.views.RecentsView android:id="@+id/recents_view" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="match_parent" - android:focusable="true" /> + android:focusable="true"> + </com.android.systemui.recents.views.RecentsView> <!-- Empty View --> <ViewStub android:id="@+id/empty_view_stub" diff --git a/packages/SystemUI/res/layout/recents_dismiss_button.xml b/packages/SystemUI/res/layout/recents_dismiss_button.xml new file mode 100644 index 0000000..6a2f782 --- /dev/null +++ b/packages/SystemUI/res/layout/recents_dismiss_button.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<!-- Extends Framelayout --> +<com.android.systemui.statusbar.DismissView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/recents_dismiss_all_button_size" + android:visibility="gone" + android:clipChildren="false" + android:clipToPadding="false"> + <com.android.systemui.statusbar.DismissViewButton + android:id="@+id/dismiss_text" + android:layout_width="@dimen/recents_dismiss_all_button_size" + android:layout_height="@dimen/recents_dismiss_all_button_size" + android:layout_gravity="end" + android:alpha="1.0" + android:background="@drawable/recents_button_bg" + android:contentDescription="@string/recents_dismiss_all_message"/> +</com.android.systemui.statusbar.DismissView> diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml index f1d8ad0..53047a3 100644 --- a/packages/SystemUI/res/layout/recents_task_view_header.xml +++ b/packages/SystemUI/res/layout/recents_task_view_header.xml @@ -43,6 +43,16 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" /> <com.android.systemui.recents.views.FixedSizeImageView + android:id="@+id/move_task" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginEnd="52dp" + android:layout_gravity="center_vertical|end" + android:padding="12dp" + android:background="@drawable/recents_button_bg" + android:src="@drawable/star" + android:visibility="gone" /> + <com.android.systemui.recents.views.FixedSizeImageView android:id="@+id/dismiss_task" android:layout_width="48dp" android:layout_height="48dp" diff --git a/packages/SystemUI/res/layout/remote_input.xml b/packages/SystemUI/res/layout/remote_input.xml new file mode 100644 index 0000000..8ca5634 --- /dev/null +++ b/packages/SystemUI/res/layout/remote_input.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2015 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 + --> + +<!-- FrameLayout --> +<com.android.systemui.statusbar.policy.RemoteInputView + xmlns:android="http://schemas.android.com/apk/res/android" + android:theme="@style/systemui_theme_light" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:paddingStart="4dp" + android:paddingEnd="2dp" + android:paddingBottom="4dp" + android:paddingTop="2dp"> + + <view class="com.android.systemui.statusbar.policy.RemoteInputView$RemoteEditText" + android:id="@+id/remote_input_text" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:singleLine="true" + android:imeOptions="actionSend" /> + + <ProgressBar + android:id="@+id/remote_input_progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:visibility="invisible" + android:indeterminate="true" + style="?android:attr/progressBarStyleHorizontal" /> + +</com.android.systemui.statusbar.policy.RemoteInputView> diff --git a/packages/SystemUI/res/layout/segmented_button.xml b/packages/SystemUI/res/layout/segmented_button.xml index e92f310..ead735f 100644 --- a/packages/SystemUI/res/layout/segmented_button.xml +++ b/packages/SystemUI/res/layout/segmented_button.xml @@ -19,10 +19,10 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/segmented_button_spacing" android:layout_weight="1" - android:gravity="center_horizontal|top" + android:paddingStart="8dp" + android:gravity="start|center_vertical" + android:maxLines="2" android:textColor="@color/segmented_button_text_selector" android:background="@drawable/btn_borderless_rect" - android:textAppearance="@style/TextAppearance.QS.SegmentedButton" - android:minHeight="64dp" - android:paddingTop="11dp" - android:drawablePadding="6dp" /> + android:textAppearance="@style/TextAppearance.Volume.ZenSwitchSummary" + android:minHeight="48dp" /> diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index 8fbd8f7..c9edef8 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -38,11 +38,19 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" > - <ImageView + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneLightTheme" android:id="@+id/wifi_signal" android:layout_height="wrap_content" android:layout_width="wrap_content" /> + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/wifi_signal_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:alpha="0.0" + /> </FrameLayout> <View android:id="@+id/wifi_signal_spacer" @@ -56,12 +64,25 @@ android:layout_width="wrap_content" > </LinearLayout> - <ImageView - android:id="@+id/no_sims" + <FrameLayout android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:src="@drawable/stat_sys_no_sims" - /> + android:layout_width="wrap_content"> + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneLightTheme" + android:id="@+id/no_sims" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/stat_sys_no_sims" + /> + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/no_sims_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/stat_sys_no_sims" + android:alpha="0.0" + /> + </FrameLayout> <View android:id="@+id/wifi_airplane_spacer" android:layout_width="4dp" diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 245c128..3118d08 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -97,12 +97,4 @@ </com.android.keyguard.AlphaOptimizedLinearLayout> </LinearLayout> - <ViewStub - android:id="@+id/ticker_stub" - android:inflatedId="@+id/ticker" - android:layout="@layout/status_bar_ticker" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> - </com.android.systemui.statusbar.phone.PhoneStatusBarView> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 5c41436..f7bbce0 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -28,28 +28,10 @@ > <include - layout="@layout/carrier_label" - android:layout_height="@dimen/carrier_label_height" - android:layout_width="match_parent" - android:layout_marginBottom="@dimen/close_handle_height" - android:layout_gravity="bottom" - /> - - <include layout="@layout/keyguard_status_view" android:layout_height="wrap_content" android:visibility="gone" /> - <TextView - android:id="@+id/emergency_calls_only" - android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network.EmergencyOnly" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:padding="4dp" - android:gravity="center" - android:visibility="gone" - /> - <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index f717ac7..0e1517f 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -128,7 +128,7 @@ android:id="@+id/clock" /> - <Button android:id="@+id/alarm_status" + <com.android.systemui.statusbar.AlphaOptimizedButton android:id="@+id/alarm_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index e9d86d6..ea7ce96 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -53,6 +53,22 @@ /> <ViewStub + android:layout="@layout/notification_children_container" + android:id="@+id/child_container_stub" + android:inflatedId="@+id/notification_children_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + + <ViewStub + android:layout="@layout/notification_expand_button" + android:id="@+id/more_button_stub" + android:inflatedId="@+id/notification_more_button_container" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_bottom_decor_height" + /> + + <ViewStub android:layout="@layout/notification_guts" android:id="@+id/notification_guts_stub" android:inflatedId="@+id/notification_guts" diff --git a/packages/SystemUI/res/layout/status_bar_recent_item.xml b/packages/SystemUI/res/layout/status_bar_recent_item.xml deleted file mode 100644 index 6290bb3..0000000 --- a/packages/SystemUI/res/layout/status_bar_recent_item.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* apps/common/assets/default/default/skins/StatusBar.xml -** -** Copyright 2006, 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. -*/ ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingTop="@dimen/status_bar_recents_item_padding" - android:paddingBottom="@dimen/status_bar_recents_item_padding" - android:clipChildren="false" - android:importantForAccessibility="no"> - - <RelativeLayout android:id="@+id/recent_item" - android:layout_gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:clipChildren="false"> - - <TextView android:id="@+id/app_label" - android:layout_width="@dimen/status_bar_recents_app_label_width" - android:layout_height="wrap_content" - android:textSize="@dimen/status_bar_recents_app_label_text_size" - android:fadingEdge="horizontal" - android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" - android:scrollHorizontally="true" - android:layout_alignParentStart="true" - android:layout_alignTop="@+id/app_icon" - android:paddingTop="2dp" - android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="@color/status_bar_recents_app_label_color" - android:importantForAccessibility="no" - android:textAlignment="viewStart" - /> - <FrameLayout android:id="@+id/app_thumbnail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_toEndOf="@id/app_label" - android:layout_marginStart="@dimen/status_bar_recents_thumbnail_left_margin" - android:background="@drawable/recents_thumbnail_bg" - android:foreground="@drawable/recents_thumbnail_fg" - android:visibility="invisible"> - <ImageView android:id="@+id/app_thumbnail_image" - android:layout_width="@dimen/status_bar_recents_thumbnail_width" - android:layout_height="@dimen/status_bar_recents_thumbnail_height" - /> - </FrameLayout> - <View android:id="@+id/recents_callout_line" - android:layout_width="@dimen/status_bar_recents_app_label_width" - android:layout_height="1dip" - android:layout_alignParentStart="true" - android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" - android:layout_toStartOf="@id/app_thumbnail" - android:layout_below="@id/app_label" - android:layout_marginEnd="3dip" - android:layout_marginTop="3dip" - android:background="@drawable/recents_callout_line" - /> - - <ImageView android:id="@id/app_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toEndOf="@id/app_label" - android:layout_marginStart="@dimen/status_bar_recents_app_icon_left_margin" - android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" - android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" - android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" - android:scaleType="centerInside" - android:adjustViewBounds="true" - android:visibility="invisible" - /> - - <TextView android:id="@+id/app_description" - android:layout_width="@dimen/status_bar_recents_app_label_width" - android:layout_height="wrap_content" - android:textSize="@dimen/status_bar_recents_app_description_text_size" - android:fadingEdge="horizontal" - android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" - android:scrollHorizontally="true" - android:layout_alignParentStart="true" - android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" - android:layout_below="@id/recents_callout_line" - android:layout_marginTop="3dip" - android:singleLine="true" - android:ellipsize="marquee" - android:textAlignment="viewStart" - /> - - </RelativeLayout> -</FrameLayout> diff --git a/packages/SystemUI/res/layout/status_bar_recent_panel.xml b/packages/SystemUI/res/layout/status_bar_recent_panel.xml deleted file mode 100644 index 588873a..0000000 --- a/packages/SystemUI/res/layout/status_bar_recent_panel.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* apps/common/assets/default/default/skins/StatusBar.xml -** -** Copyright 2010, 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.recent.RecentsPanelView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" - android:id="@+id/recents_root" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:foreground="@drawable/bg_protect" - systemui:recentItemLayout="@layout/status_bar_recent_item" - > - <FrameLayout - android:id="@+id/recents_bg_protect" - android:background="@drawable/status_bar_recents_background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentBottom="true"> - - <com.android.systemui.recent.RecentsVerticalScrollView - android:id="@+id/recents_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginEnd="0dp" - android:divider="@null" - android:stackFromBottom="true" - android:fadingEdge="vertical" - android:scrollbars="none" - android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" - android:layout_gravity="bottom|start" - android:clipToPadding="false" - android:clipChildren="false"> - - <LinearLayout android:id="@+id/recents_linear_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:fitsSystemWindows="true" - android:clipToPadding="false" - android:clipChildren="false"> - </LinearLayout> - - </com.android.systemui.recent.RecentsVerticalScrollView> - - </FrameLayout> - - <include layout="@layout/status_bar_no_recent_apps" - android:id="@+id/recents_no_apps" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="invisible" /> - -</com.android.systemui.recent.RecentsPanelView> diff --git a/packages/SystemUI/res/layout/status_bar_search_panel.xml b/packages/SystemUI/res/layout/status_bar_search_panel.xml deleted file mode 100644 index e0520ef..0000000 --- a/packages/SystemUI/res/layout/status_bar_search_panel.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* apps/common/assets/default/default/skins/StatusBar.xml -** -** Copyright 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. -*/ ---> - -<!-- Extends FrameLayout --> -<com.android.systemui.SearchPanelView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_panel_container" - android:layout_height="match_parent" - android:layout_width="match_parent"> - - <com.android.systemui.statusbar.AlphaOptimizedView - style="@style/SearchPanelScrim" - android:id="@+id/search_panel_scrim" - android:background="@drawable/search_panel_scrim" /> - - <com.android.systemui.SearchPanelCircleView - style="@style/SearchPanelCircle" - android:id="@+id/search_panel_circle"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/search_logo" /> - </com.android.systemui.SearchPanelCircleView> - -</com.android.systemui.SearchPanelView> diff --git a/packages/SystemUI/res/layout/status_bar_ticker.xml b/packages/SystemUI/res/layout/status_bar_ticker.xml deleted file mode 100644 index dd9b3ef..0000000 --- a/packages/SystemUI/res/layout/status_bar_ticker.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - - Copyright 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. - --> -<LinearLayout android:id="@+id/ticker" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingStart="6dip" - android:animationCache="false" - android:orientation="horizontal"> - - <ImageSwitcher android:id="@+id/tickerIcon" - android:layout_width="@dimen/status_bar_icon_size" - android:layout_height="@dimen/status_bar_icon_size" - android:layout_marginEnd="4dip" - > - <com.android.systemui.statusbar.AnimatedImageView - android:layout_width="@dimen/status_bar_icon_size" - android:layout_height="@dimen/status_bar_icon_size" - android:scaleType="center" - /> - <com.android.systemui.statusbar.AnimatedImageView - android:layout_width="@dimen/status_bar_icon_size" - android:layout_height="@dimen/status_bar_icon_size" - android:scaleType="center" - /> - </ImageSwitcher> - <com.android.systemui.statusbar.phone.TickerView android:id="@+id/tickerText" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingEnd="10dip"> - <TextView - android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - /> - <TextView - android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - /> - </com.android.systemui.statusbar.phone.TickerView> -</LinearLayout> - diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 3765fe8..7586227 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -1,6 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2015 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. @@ -14,15 +13,50 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/volume_dialog" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="4dp" android:layout_marginLeft="@dimen/notification_side_padding" android:layout_marginRight="@dimen/notification_side_padding" - android:background="@drawable/qs_background_primary" - android:translationZ="@dimen/volume_panel_z" - android:layout_marginBottom="@dimen/volume_panel_z"> + android:layout_marginTop="4dp" + android:background="@drawable/volume_dialog_background" + android:translationZ="4dp" > - <include layout="@layout/volume_panel" /> + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/volume_expand_button" + style="@style/VolumeButtons" + android:layout_alignParentLeft="true" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:clickable="true" + android:soundEffectsEnabled="false" + android:src="@drawable/ic_volume_collapse_animation" /> -</FrameLayout>
\ No newline at end of file + <LinearLayout + android:id="@+id/volume_dialog_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="4dp" + android:paddingEnd="4dp" + android:paddingStart="4dp" + android:paddingTop="6dp" > + + <!-- volume rows added and removed here! :-) --> + + <FrameLayout + android:id="@+id/volume_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:ignore="UselessParent" > + + <include layout="@layout/volume_text_footer" /> + + <include layout="@layout/volume_zen_footer" /> + </FrameLayout> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml new file mode 100644 index 0000000..af27cc4 --- /dev/null +++ b/packages/SystemUI/res/layout/volume_dialog_row.xml @@ -0,0 +1,64 @@ +<!-- + Copyright (C) 2015 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. +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" > + + <TextView + android:id="@+id/volume_row_header" + style="?android:attr/textAppearanceButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="@dimen/volume_secondary_alpha" + android:ellipsize="end" + android:maxLines="1" + android:paddingBottom="0dp" + android:paddingEnd="12dp" + android:paddingStart="13dp" + android:paddingTop="8dp" /> + + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/volume_row_icon" + style="@style/VolumeButtons" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:layout_below="@id/volume_row_header" + android:soundEffectsEnabled="false" /> + + <SeekBar + android:id="@+id/volume_row_slider" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/volume_row_icon" + android:layout_alignWithParentIfMissing="true" + android:layout_below="@id/volume_row_header" + android:layout_toEndOf="@id/volume_row_icon" + android:layout_toStartOf="@+id/volume_settings_button" + android:paddingEnd="4dp" + android:paddingStart="4dp" + android:progressTint="@android:color/white" + android:thumbTint="@android:color/white" /> + + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/volume_settings_button" + style="@style/VolumeButtons" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:layout_alignParentEnd="true" + android:layout_below="@id/volume_row_header" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/volume_panel_dialog.xml b/packages/SystemUI/res/layout/volume_panel_dialog.xml new file mode 100644 index 0000000..700102f --- /dev/null +++ b/packages/SystemUI/res/layout/volume_panel_dialog.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2015 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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/volume_panel_z" + android:layout_marginLeft="@dimen/notification_side_padding" + android:layout_marginRight="@dimen/notification_side_padding" + android:background="@drawable/qs_background_primary" + android:translationZ="@dimen/volume_panel_z" > + + <include layout="@layout/volume_panel" /> + +</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/volume_text_footer.xml b/packages/SystemUI/res/layout/volume_text_footer.xml new file mode 100644 index 0000000..7436488 --- /dev/null +++ b/packages/SystemUI/res/layout/volume_text_footer.xml @@ -0,0 +1,54 @@ +<!-- + Copyright (C) 2015 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. +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/volume_text_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + tools:ignore="UselessParent" > + + <TextView + android:id="@+id/volume_footline_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBaseline="@+id/volume_footline_action_button" + android:alpha="@dimen/volume_secondary_alpha" + android:fontFamily="sans-serif" + android:paddingEnd="8dp" + android:paddingStart="13dp" + android:textColor="?android:attr/textColorPrimary" /> + + <Button + android:id="@+id/volume_footline_action_button" + style="@android:style/Widget.Material.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="@dimen/volume_button_size" + android:layout_toEndOf="@id/volume_footline_text" + android:layout_toStartOf="@+id/volume_settings_button" + android:alpha="@dimen/volume_secondary_alpha" + android:paddingEnd="0dp" + android:paddingStart="0dp" /> + + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/volume_settings_button" + style="@style/VolumeButtons" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:layout_alignParentEnd="true" + android:src="@drawable/ic_volume_settings" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/volume_zen_footer.xml b/packages/SystemUI/res/layout/volume_zen_footer.xml new file mode 100644 index 0000000..c491e9c --- /dev/null +++ b/packages/SystemUI/res/layout/volume_zen_footer.xml @@ -0,0 +1,108 @@ +<!-- + Copyright (C) 2015 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.volume.ZenFooter xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/volume_zen_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > <!-- extends LinearLayout --> + + <LinearLayout + android:id="@+id/volume_zen_switch_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/volume_button_size" + android:clickable="true" + android:orientation="horizontal" > + + <ImageView + android:id="@+id/volume_zen_switch_bar_icon" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:scaleType="center" + android:src="@drawable/ic_dnd" /> + + <TextView + android:layout_width="0dp" + android:layout_height="fill_parent" + android:layout_weight="1" + android:gravity="center_vertical" + android:textDirection="locale" + android:padding="3dp" + android:text="@string/volume_zen_switch_text" + android:textAppearance="@style/TextAppearance.Volume.ZenSwitch" /> + + <Switch + android:id="@+id/volume_zen_switch" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_marginEnd="11dp" /> + </LinearLayout> + + <RelativeLayout + android:id="@+id/volume_zen_panel_summary" + android:layout_width="match_parent" + android:layout_height="@dimen/volume_button_size" + android:layout_marginStart="@dimen/volume_button_size" + android:paddingEnd="3dp" + android:paddingStart="3dp" > + + <TextView + android:id="@+id/volume_zen_panel_summary_line_1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Volume.ZenSwitchSummary" /> + + <TextView + android:id="@+id/volume_zen_panel_summary_line_2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/volume_zen_panel_summary_line_1" + android:textAppearance="@style/TextAppearance.Volume.ZenSwitchDetail" /> + </RelativeLayout> + + <include layout="@layout/zen_mode_panel" /> + + <LinearLayout + android:id="@+id/volume_zen_mode_panel_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="end" > + + <TextView + android:id="@+id/volume_zen_mode_panel_more" + style="@style/QSBorderlessButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:clickable="true" + android:focusable="true" + android:minWidth="132dp" + android:text="@string/quick_settings_more_settings" + android:textAppearance="@style/TextAppearance.QS.DetailButton" /> + + <TextView + android:id="@+id/volume_zen_mode_panel_done" + style="@style/QSBorderlessButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="true" + android:focusable="true" + android:minWidth="66dp" + android:text="@string/quick_settings_done" + android:textAppearance="@style/TextAppearance.QS.DetailButton" /> + </LinearLayout> + +</com.android.systemui.volume.ZenFooter>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index 0b91913..a169d1a 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="@dimen/qs_detail_item_height" android:layout_marginBottom="@dimen/zen_mode_condition_detail_item_spacing" - android:layout_marginStart="@dimen/zen_mode_condition_detail_button_padding" - android:layout_marginEnd="@dimen/zen_mode_condition_detail_button_padding" > + android:layout_marginStart="1dp" + android:layout_marginEnd="0dp" > <RadioButton android:id="@android:id/checkbox" diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 27353ff..3d73ff7 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -19,6 +19,7 @@ android:id="@+id/zen_mode_panel" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="35dp" android:clipChildren="false" android:orientation="vertical" > @@ -40,6 +41,16 @@ android:clipChildren="false" /> </FrameLayout> + <View + android:id="@+id/zen_embedded_divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:visibility="gone" + android:layout_marginStart="@dimen/qs_panel_padding" + android:layout_marginEnd="@dimen/qs_panel_padding" + android:layout_marginBottom="@dimen/qs_panel_padding" + android:background="#4dffffff" /> + <RelativeLayout android:id="@+id/zen_subhead" android:layout_width="match_parent" |