diff options
Diffstat (limited to 'packages/SystemUI/res/layout')
48 files changed, 1312 insertions, 280 deletions
diff --git a/packages/SystemUI/res/layout/cmland.xml b/packages/SystemUI/res/layout/cmland.xml new file mode 100644 index 0000000..3c4e561 --- /dev/null +++ b/packages/SystemUI/res/layout/cmland.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2014-2015 The CyanogenMod 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:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + <com.android.systemui.egg.CMLand + android:id="@+id/world" + android:layout_width="match_parent" + android:layout_height="match_parent"> + </com.android.systemui.egg.CMLand> + <FrameLayout + android:id="@+id/welcome" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:background="#a0000000" + android:clickable="true" + > + <FrameLayout + android:id="@+id/play_button" + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_gravity="center" + android:clickable="true" + android:background="@drawable/ripplebg" + android:focusable="true" + android:onClick="startButtonPressed" + > + <ImageView + android:id="@+id/play_button_image" + android:layout_width="48dp" + android:layout_height="48dp" + android:scaleType="fitCenter" + android:layout_gravity="center" + android:tint="#000000" + android:src="@drawable/play" + /> + <TextView + android:id="@+id/play_button_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:alpha="0" + android:textSize="40dp" + android:textColor="#000000" + /> + </FrameLayout> + </FrameLayout> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top|center_horizontal" + android:orientation="horizontal" + android:gravity="center_vertical" + android:id="@+id/player_setup" + > + <ImageButton + style="@android:style/Widget.Material.Button.Borderless" + android:id="@+id/player_minus_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:padding="10dp" + android:scaleType="centerInside" + android:onClick="playerMinus" + android:src="@drawable/minus" + /> + <LinearLayout + android:id="@+id/scores" + android:layout_width="wrap_content" + android:layout_height="64dp" + android:padding="12dp" + android:orientation="horizontal" + android:clipToPadding="false" + > + </LinearLayout> + <ImageButton + style="@android:style/Widget.Material.Button.Borderless" + android:id="@+id/player_plus_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:padding="10dp" + android:scaleType="centerInside" + android:onClick="playerPlus" + android:src="@drawable/plus" + /> + </LinearLayout> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 444f0f0..afb98be 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -32,7 +32,7 @@ android:layout_gravity="bottom|center_horizontal" android:gravity="center_horizontal" android:textStyle="italic" - android:textColor="#ffffff" + android:textColor="@color/keyguard_indication_text_color" android:textAppearance="?android:attr/textAppearanceSmall" android:accessibilityLiveRegion="polite" /> @@ -47,7 +47,6 @@ android:layout_height="@dimen/keyguard_affordance_height" android:layout_width="@dimen/keyguard_affordance_width" android:layout_gravity="bottom|end" - android:tint="#ffffffff" android:src="@drawable/ic_camera_alt_24dp" android:scaleType="center" android:contentDescription="@string/accessibility_camera_button" /> @@ -57,7 +56,6 @@ android:layout_height="@dimen/keyguard_affordance_height" android:layout_width="@dimen/keyguard_affordance_width" android:layout_gravity="bottom|start" - android:tint="#ffffffff" android:src="@drawable/ic_phone_24dp" android:scaleType="center" android:contentDescription="@string/accessibility_phone_button" /> diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index b5f917a..fcd7e62 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -52,13 +52,23 @@ > <include layout="@layout/system_icons" /> </FrameLayout> - <TextView android:id="@+id/battery_level" + <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/header_battery_margin_keyguard" android:paddingEnd="@dimen/battery_level_padding_end" - android:textColor="#ffffff" + android:textColor="@color/status_bar_battery_level_text_color" + android:visibility="gone" + android:textSize="@dimen/battery_level_text_size" + android:importantForAccessibility="noHideDescendants"/> + <com.android.systemui.DockBatteryLevelTextView android:id="@+id/dock_battery_level_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="@dimen/header_battery_margin_keyguard" + android:paddingEnd="@dimen/battery_level_padding_end" + android:textColor="@color/status_bar_battery_level_text_color" android:visibility="gone" android:textSize="@dimen/battery_level_text_size" android:importantForAccessibility="noHideDescendants"/> @@ -73,7 +83,7 @@ android:gravity="center_vertical" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#ffffff" + android:textColor="@color/keyguard_carrier_text_color" android:singleLine="true" /> </com.android.systemui.statusbar.phone.KeyguardStatusBarView> diff --git a/packages/SystemUI/res/layout/lockscreen_shortcuts.xml b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml new file mode 100644 index 0000000..fec5e83 --- /dev/null +++ b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml @@ -0,0 +1,65 @@ +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <ImageView + android:id="@+id/phone_button" + android:gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_centerHorizontal="true" + android:src="@drawable/lockscreen_shortcuts_phone_background" /> + + <TextView + android:textSize="15sp" + android:textColor="@color/lockscreen_message_text_color" + android:gravity="center" + android:layout_below="@id/phone_button" + android:layout_alignStart="@id/phone_button" + android:layout_alignEnd="@id/phone_button" + android:text="@string/lockscreen_message" + android:layout_width="wrap_content" + android:layout_height="match_parent" /> + + <RelativeLayout + android:layout_alignEnd="@id/phone_button" + android:layout_alignStart="@id/phone_button" + android:layout_alignBottom="@id/phone_button" + android:layout_marginStart="@dimen/phone_side_padding" + android:layout_marginEnd="@dimen/phone_side_padding" + android:paddingBottom="@dimen/phone_bottom_padding" + android:clipChildren="false" + android:layout_width="match_parent" + android:layout_height="@dimen/phone_height"> + <ImageView + android:layout_marginStart="@dimen/lockscreen_icon_side_padding" + android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" + android:clickable="true" + android:scaleType="center" + android:id="@+id/left_button" + android:layout_width="@dimen/keyguard_affordance_width" + android:layout_height="@dimen/keyguard_affordance_height" /> + <ImageView + android:id="@+id/middle_button" + android:tint="@color/lockscreen_middle_button_tint_color" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" + android:scaleType="center" + android:src="@drawable/ic_lock_24dp" + android:layout_width="@dimen/keyguard_affordance_width" + android:layout_height="@dimen/keyguard_affordance_height" /> + <ImageView + android:layout_marginEnd="@dimen/lockscreen_icon_side_padding" + android:id="@+id/right_button" + android:clickable="true" + android:scaleType="center" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_width="@dimen/keyguard_affordance_width" + android:layout_height="@dimen/keyguard_affordance_height" /> + </RelativeLayout> +</RelativeLayout> diff --git a/packages/SystemUI/res/layout/mid_navigation_bar_land.xml b/packages/SystemUI/res/layout/mid_navigation_bar_land.xml new file mode 100644 index 0000000..6a1f7aa --- /dev/null +++ b/packages/SystemUI/res/layout/mid_navigation_bar_land.xml @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2015 The CyanogenMod 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 + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + android:clipChildren="false" + android:clipToPadding="false" + android:id="@+id/nav_buttons"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/ime_switcher" + android:layout_width="match_parent" + android:layout_height="40dp" + android:contentDescription="@string/accessibility_ime_switch_button" + android:scaleType="centerInside" + android:src="@drawable/ic_ime_switcher_default" + android:visibility="invisible" /> + + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/one" + android:scaleType="centerInside" + android:layout_height="40dp" + android:layout_width="match_parent" + android:layout_weight="0" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/dpad_left" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="40dp" + android:layout_weight="0" + android:scaleType="centerInside" + systemui:keyRepeat="true"/> + </FrameLayout> + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_weight="1" + android:orientation="vertical" + android:clipChildren="false" + android:gravity="center_vertical" + android:id="@+id/mid_nav_buttons" + android:layout_gravity="center_vertical" + android:clipToPadding="false" + android:animateLayoutChanges="true"> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/two" + android:scaleType="centerInside" + android:layout_height="80dp" + android:layout_width="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + <View + android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_weight="1" + android:visibility="invisible" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/three" + android:scaleType="centerInside" + android:layout_height="80dp" + android:layout_width="match_parent" + systemui:keyRepeat="true" + android:layout_weight="0" /> + <View + android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_weight="1" + android:visibility="invisible" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/four" + android:scaleType="centerInside" + android:layout_height="80dp" + android:layout_width="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + <View + android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_weight="1" + android:visibility="invisible" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/five" + android:scaleType="centerInside" + android:layout_height="80dp" + android:layout_width="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + </LinearLayout> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/dpad_right" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="40dp" + android:layout_weight="0" + android:scaleType="centerInside" + systemui:keyRepeat="true" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/six" + android:scaleType="centerInside" + android:layout_height="40dp" + android:layout_width="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + </FrameLayout> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/mid_navigation_bar_port.xml b/packages/SystemUI/res/layout/mid_navigation_bar_port.xml new file mode 100644 index 0000000..6dfdc16 --- /dev/null +++ b/packages/SystemUI/res/layout/mid_navigation_bar_port.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2015 The CyanogenMod 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 + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false" + android:id="@+id/nav_buttons"> + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" > + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/dpad_left" + android:visibility="gone" + android:layout_width="40dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:scaleType="centerInside" + systemui:keyRepeat="true" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/one" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:layout_weight="0" + android:scaleType="centerInside" /> + </FrameLayout> + <LinearLayout + android:layout_height="match_parent" + android:layout_width="0dp" + android:layout_weight="1" + android:clipChildren="false" + android:clipToPadding="false" + android:id="@+id/mid_nav_buttons" + android:gravity="center_horizontal" + android:layout_gravity="center_horizontal" + android:animateLayoutChanges="true"> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/two" + android:scaleType="centerInside" + android:layout_width="@dimen/navigation_key_width" + android:layout_height="match_parent" + systemui:keyRepeat="true" + android:layout_weight="0" /> + <View + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/three" + android:scaleType="centerInside" + android:layout_width="@dimen/navigation_key_width" + android:layout_height="match_parent" + systemui:keyRepeat="true" + android:layout_weight="0" /> + <View + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/four" + android:scaleType="centerInside" + android:layout_width="@dimen/navigation_key_width" + android:layout_height="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + <View + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/five" + android:scaleType="centerInside" + android:layout_width="@dimen/navigation_key_width" + android:layout_height="match_parent" + android:layout_weight="0" + systemui:keyRepeat="true" /> + </LinearLayout> + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" > + <com.android.systemui.statusbar.policy.KeyButtonView + android:background="#FFAA0000" + android:id="@+id/ime_switcher" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_weight="0" + android:layout_height="match_parent" + android:contentDescription="@string/accessibility_ime_switch_button" + android:scaleType="centerInside" + android:src="@drawable/ic_ime_switcher_default" + android:visibility="invisible" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/six" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:layout_weight="0" + android:scaleType="centerInside" /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/dpad_right" + android:visibility="gone" + android:layout_width="40dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:scaleType="centerInside" + systemui:keyRepeat="true"/> + </FrameLayout> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/mland.xml b/packages/SystemUI/res/layout/mland.xml index d1b6d00..5ec0f7f 100644 --- a/packages/SystemUI/res/layout/mland.xml +++ b/packages/SystemUI/res/layout/mland.xml @@ -48,7 +48,7 @@ android:layout_height="48dp" android:scaleType="fitCenter" android:layout_gravity="center" - android:tint="#000000" + android:tint="@color/play_button_image_tint_color" android:src="@drawable/play" /> <TextView @@ -58,7 +58,7 @@ android:layout_gravity="center" android:alpha="0" android:textSize="40dp" - android:textColor="#000000" + android:textColor="@color/play_button_text_color" /> </FrameLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/mland_scorefield.xml b/packages/SystemUI/res/layout/mland_scorefield.xml index 0ed72e4..31e4b4b 100644 --- a/packages/SystemUI/res/layout/mland_scorefield.xml +++ b/packages/SystemUI/res/layout/mland_scorefield.xml @@ -22,7 +22,7 @@ android:textStyle="bold" android:textSize="22sp" android:gravity="center" - android:textColor="#FFAAAAAA" + android:textColor="@color/mland_scorefield_text_color" android:paddingStart="12dp" android:paddingEnd="12dp" android:paddingTop="4dp" diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml index 6ae5cf3..abdbaf7 100644 --- a/packages/SystemUI/res/layout/mobile_signal_group.xml +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml @@ -17,31 +17,44 @@ ** limitations under the License. */ --> -<FrameLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/mobile_combo" android:layout_width="wrap_content" android:layout_height="wrap_content" - > - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneLightTheme" - android:id="@+id/mobile_signal" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - systemui:hasOverlappingRendering="false" - /> - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneDarkTheme" - android:id="@+id/mobile_signal_dark" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:alpha="0.0" - systemui:hasOverlappingRendering="false" - /> + android:orientation="horizontal"> + <FrameLayout + android:layout_height="wrap_content" + android:layout_width="wrap_content" + > + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneLightTheme" + android:id="@+id/mobile_signal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + systemui:hasOverlappingRendering="false" + /> + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/mobile_signal_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:alpha="0.0" + systemui:hasOverlappingRendering="false" + /> + <ImageView + android:id="@+id/mobile_type" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + /> + </FrameLayout> + <ImageView - android:id="@+id/mobile_type" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - /> -</FrameLayout> + android:id="@+id/mobile_roaming" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:visibility="gone" + android:src="@drawable/stat_sys_data_roaming" + /> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index d58664f..f8f59da 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -4,7 +4,7 @@ ** ** Copyright 2011, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); +** 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 ** @@ -37,81 +37,10 @@ android:orientation="horizontal" android:clipChildren="false" android:clipToPadding="false" - android:id="@+id/nav_buttons" - android:animateLayoutChanges="true" + android:id="@+id/container" > - <!-- navigation controls --> - <View - android:layout_width="@dimen/navigation_side_padding" - android:layout_height="match_parent" - android:layout_weight="0" - android:visibility="invisible" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" - android:layout_width="@dimen/navigation_key_width" - android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_back" - systemui:keyCode="4" - android:layout_weight="0" - android:scaleType="center" - android:contentDescription="@string/accessibility_back" - /> - <View - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:visibility="invisible" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" - android:layout_width="@dimen/navigation_key_width" - android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_home" - systemui:keyCode="3" - systemui:keyRepeat="false" - android:layout_weight="0" - android:scaleType="center" - android:contentDescription="@string/accessibility_home" - /> - <View - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:visibility="invisible" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" - android:layout_width="@dimen/navigation_key_width" - android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_recent" - android:layout_weight="0" - android:scaleType="center" - android:contentDescription="@string/accessibility_recent" - /> - <FrameLayout - android:layout_width="@dimen/navigation_side_padding" - android:layout_height="match_parent" - android:layout_weight="0" > - <com.android.systemui.statusbar.policy.KeyButtonView - android:id="@+id/menu" - android:layout_width="@dimen/navigation_extra_key_width" - android:layout_height="match_parent" - android:contentDescription="@string/accessibility_menu" - android:src="@drawable/ic_sysbar_menu" - android:visibility="invisible" - android:scaleType="centerInside" - android:layout_gravity="end" - systemui:keyCode="82" /> - - <com.android.systemui.statusbar.policy.KeyButtonView - android:id="@+id/ime_switcher" - android:layout_width="@dimen/navigation_extra_key_width" - android:layout_height="match_parent" - android:contentDescription="@string/accessibility_ime_switch_button" - android:scaleType="centerInside" - android:src="@drawable/ic_ime_switcher_default" - android:visibility="invisible" - android:layout_gravity="end" /> - </FrameLayout> + <include layout="@layout/mid_navigation_bar_port"/> </LinearLayout> @@ -120,20 +49,21 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="horizontal" + android:gravity="center_horizontal" + android:layout_marginStart="40dp" + android:layout_marginEnd="40dp" + android:layout_gravity="center_horizontal" android:id="@+id/lights_out" android:visibility="gone" > <ImageView android:layout_width="@dimen/navigation_key_width" android:layout_height="match_parent" - android:layout_marginStart="@dimen/navigation_side_padding" - android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_back" /> <View - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:visibility="invisible" @@ -143,23 +73,18 @@ android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_home" /> <View - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:visibility="invisible" /> <ImageView android:layout_width="@dimen/navigation_key_width" - android:layout_marginEnd="@dimen/navigation_side_padding" android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_recent" /> </LinearLayout> @@ -183,109 +108,41 @@ android:paddingTop="0dp" > - <LinearLayout + <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="vertical" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" android:clipChildren="false" android:clipToPadding="false" - android:id="@+id/nav_buttons" - android:animateLayoutChanges="true" + android:id="@+id/container" > - <!-- navigation controls --> - <FrameLayout - android:layout_weight="0" - android:layout_width="match_parent" - android:layout_height="@dimen/navigation_side_padding" > - <com.android.systemui.statusbar.policy.KeyButtonView - android:id="@+id/ime_switcher" - android:layout_width="match_parent" - android:layout_height="@dimen/navigation_extra_key_width" - android:contentDescription="@string/accessibility_ime_switch_button" - android:scaleType="centerInside" - android:src="@drawable/ic_ime_switcher_default" - android:layout_gravity="top" - android:visibility="invisible" /> - - <com.android.systemui.statusbar.policy.KeyButtonView - android:id="@+id/menu" - android:layout_width="match_parent" - android:layout_height="40dp" - android:contentDescription="@string/accessibility_menu" - android:src="@drawable/ic_sysbar_menu" - android:scaleType="centerInside" - android:layout_gravity="top" - android:visibility="invisible" - systemui:keyCode="82" /> - </FrameLayout> + <include layout="@layout/mid_navigation_bar_land"/> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" - android:layout_height="@dimen/navigation_key_width" - android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_recent" - android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_recent" - /> - <View - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_weight="1" - android:visibility="invisible" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" - android:layout_height="@dimen/navigation_key_width" - android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_home" - android:scaleType="center" - systemui:keyCode="3" - systemui:keyRepeat="false" - android:layout_weight="0" - android:contentDescription="@string/accessibility_home" - /> - <View - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_weight="1" - android:visibility="invisible" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" - android:layout_height="@dimen/navigation_key_width" - android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_back" - android:scaleType="center" - systemui:keyCode="4" - android:layout_weight="0" - android:contentDescription="@string/accessibility_back" - /> - <View - android:layout_height="@dimen/navigation_side_padding" - android:layout_width="match_parent" - android:layout_weight="0" - android:visibility="invisible" - /> </LinearLayout> <!-- lights out layout to match exactly --> - <LinearLayout + <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="vertical" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_marginTop="40dp" + android:layout_marginBottom="40dp" android:id="@+id/lights_out" android:visibility="gone" > <ImageView android:layout_height="@dimen/navigation_key_width" - android:layout_marginTop="@dimen/navigation_side_padding" android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_recent" /> <View - android:layout_height="match_parent" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1" android:visibility="invisible" @@ -295,23 +152,18 @@ android:layout_width="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_home" /> <View - android:layout_height="match_parent" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1" android:visibility="invisible" /> <ImageView android:layout_height="@dimen/navigation_key_width" - android:layout_marginBottom="@dimen/navigation_side_padding" android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_lights_out_dot_small" + android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" - android:layout_weight="0" - android:contentDescription="@string/accessibility_back" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/navigation_bar_edit_menu_item.xml b/packages/SystemUI/res/layout/navigation_bar_edit_menu_item.xml new file mode 100644 index 0000000..d951f5b --- /dev/null +++ b/packages/SystemUI/res/layout/navigation_bar_edit_menu_item.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/key_icon" + android:layout_width="80dip" + android:layout_height="match_parent" + android:padding="4dip" + android:scaleType="centerInside"/> + + <TextView + android:id="@+id/key_text" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:textColor="?android:attr/textColorAlertDialogListItem" + android:gravity="center_vertical" + android:paddingEnd="16dip" + android:ellipsize="marquee"/> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml index d52c274..effa302 100644 --- a/packages/SystemUI/res/layout/notification_guts.xml +++ b/packages/SystemUI/res/layout/notification_guts.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 2014, The Android Open Source Project + Copyright (C) 2015 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -82,11 +82,21 @@ android:layout_height="match_parent" android:layout_weight="0" android:gravity="center" - android:src="@drawable/ic_settings" + android:src="@drawable/notification_guts_ic_settings" android:visibility="gone" /> <ImageButton style="@android:style/Widget.Material.Light.Button.Borderless.Small" + android:id="@+id/notification_inspect_filter_notification" + android:layout_width="52dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:gravity="center" + android:src="@drawable/notification_guts_ic_ringer_mute" + android:visibility="gone" + /> + + <ImageButton style="@android:style/Widget.Material.Light.Button.Borderless.Small" android:id="@+id/notification_inspect_item" android:layout_width="52dp" android:layout_height="match_parent" diff --git a/packages/SystemUI/res/layout/profiles_detail_view.xml b/packages/SystemUI/res/layout/profiles_detail_view.xml new file mode 100644 index 0000000..c366868 --- /dev/null +++ b/packages/SystemUI/res/layout/profiles_detail_view.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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.qs.tiles.ProfilesDetailView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:orientation="vertical"> + + <ListView + android:id="@android:id/list" + android:divider="@null" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + +</com.android.systemui.qs.tiles.ProfilesDetailView> diff --git a/packages/SystemUI/res/layout/qs_custom_detail.xml b/packages/SystemUI/res/layout/qs_custom_detail.xml new file mode 100644 index 0000000..6aa1fc0 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_custom_detail.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingTop="@dimen/detail_exterior_padding" + android:paddingStart="@dimen/detail_exterior_padding" + android:paddingEnd="@dimen/detail_exterior_padding"> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="match_parent" + android:orientation="horizontal"> + + <ImageView android:id="@+id/custom_qs_tile_icon" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_marginEnd="12dp" /> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:orientation="vertical"> + + <TextView android:id="@+id/custom_qs_tile_title" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary"/> + + <TextView android:id="@+id/custom_qs_tile_package " + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="2dp" + android:textAppearance="@style/TextAppearance.QS.DetailItemSub"/> + + <TextView android:id="@+id/custom_qs_tile_content_description" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="2dp" + android:textAppearance="@style/TextAppearance.QS.DetailItemSub" /> + + </LinearLayout> + + </LinearLayout> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_custom_detail_remote.xml b/packages/SystemUI/res/layout/qs_custom_detail_remote.xml new file mode 100644 index 0000000..bdbe6bb --- /dev/null +++ b/packages/SystemUI/res/layout/qs_custom_detail_remote.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingTop="@dimen/detail_exterior_padding" + android:paddingStart="@dimen/detail_exterior_padding" + android:paddingEnd="@dimen/detail_exterior_padding"> + +</LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index ddff0f0..5058314 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -18,7 +18,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/qs_detail_background" - android:paddingBottom="8dp" + android:paddingTop="@dimen/detail_exterior_padding" + android:paddingBottom="@dimen/detail_exterior_padding" android:orientation="vertical"> <FrameLayout @@ -44,6 +45,16 @@ android:focusable="true" /> <TextView + android:id="@android:id/button3" + style="@style/QSBorderlessButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:minWidth="88dp" + android:textAppearance="@style/TextAppearance.QS.DetailButton" + android:focusable="true" /> + + <TextView android:id="@android:id/button1" style="@style/QSBorderlessButton" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index 5a96dc3..6f07543 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -37,4 +37,15 @@ android:clickable="false" android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> -</com.android.keyguard.AlphaOptimizedLinearLayout>
\ No newline at end of file + <TextView + android:id="@+id/done" + android:text="@string/quick_settings_done" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center" + android:minWidth="88dp" + android:paddingRight="12dp" + android:textAppearance="@style/TextAppearance.QS.DetailButton" + android:clickable="false" + android:focusable="false" /> +</com.android.keyguard.AlphaOptimizedLinearLayout> diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index ccdddf7..1ec4952 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -19,8 +19,6 @@ android:layout_height="wrap_content" android:minHeight="@dimen/qs_detail_item_height" android:background="@drawable/btn_borderless_rect" - android:clickable="true" - android:focusable="true" android:gravity="center_vertical" android:orientation="horizontal" > diff --git a/packages/SystemUI/res/layout/qs_detail_items.xml b/packages/SystemUI/res/layout/qs_detail_items.xml index c22e42c..4ad82cb 100644 --- a/packages/SystemUI/res/layout/qs_detail_items.xml +++ b/packages/SystemUI/res/layout/qs_detail_items.xml @@ -18,9 +18,9 @@ <com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp"> + android:paddingTop="@dimen/detail_exterior_padding" + android:paddingStart="@dimen/detail_exterior_padding" + android:paddingEnd="@dimen/detail_exterior_padding"> <LinearLayout android:id="@android:id/list" diff --git a/packages/SystemUI/res/layout/qs_detail_items_grid.xml b/packages/SystemUI/res/layout/qs_detail_items_grid.xml new file mode 100644 index 0000000..617acfb --- /dev/null +++ b/packages/SystemUI/res/layout/qs_detail_items_grid.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2015 The CyanogenMod 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 + --> + +<!-- GridView --> +<com.android.systemui.qs.QSDetailItemsGrid + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:sysui="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:numColumns="3" + sysui:verticalSpacing="4dp" + sysui:horizontalSpacing="4dp" />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/qs_detail_items_list.xml b/packages/SystemUI/res/layout/qs_detail_items_list.xml new file mode 100644 index 0000000..09021f9 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_detail_items_list.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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 LinearLayout --> +<com.android.systemui.qs.QSDetailItemsList xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:minHeight="200dp" + android:paddingTop="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp"> + + <ListView + android:id="@android:id/list" + android:divider="@null" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + + <LinearLayout + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical" > + + <ImageView + android:id="@android:id/icon" + android:layout_width="56dp" + android:layout_height="56dp" /> + + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:textAppearance="@style/TextAppearance.QS.DetailEmpty" /> + </LinearLayout> + +</com.android.systemui.qs.QSDetailItemsList> diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index 1873168..2807bb0 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -19,13 +19,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/qs_background_primary" - android:paddingTop="8dp" - android:paddingBottom="8dp" + android:paddingBottom="12dp" android:elevation="2dp"> - <com.android.systemui.qs.QSPanel + <com.android.systemui.qs.QSDragPanel android:id="@+id/quick_settings_panel" - android:background="#0000" + android:background="@color/quick_settings_panel_background" android:layout_width="match_parent" android:layout_height="wrap_content" /> </com.android.systemui.qs.QSContainer> diff --git a/packages/SystemUI/res/layout/qs_settings.xml b/packages/SystemUI/res/layout/qs_settings.xml new file mode 100644 index 0000000..b7c8d60 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_settings.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The CyanogenMod 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.qs.QSSettings + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:id="@+id/quick_settings_settings_recursion_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="48dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical" + android:textColor="@color/qs_title_text_color" + android:text="@string/quick_settings_title_header"/> + + <!-- show weather --> + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:key="status_bar_show_weather" + android:title="@string/quick_settings_title_show_weather" + systemui:defaultValue="1" + systemui:table="cm_system"/> + + <!-- brightness slider --> + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:key="qs_show_brightness_slider" + android:title="@string/quick_settings_title_show_brightness_slider" + systemui:defaultValue="1" + systemui:table="cm_system"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="48dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical" + android:textColor="@color/qs_title_text_color" + android:text="@string/quick_settings_title_tiles"/> + + <!-- first row large --> + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:title="@string/quick_settings_title_enlarge_first_row" + android:key="sysui_qs_main_tiles" + systemui:defaultValue="1" + systemui:table="cm_secure"/> + + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:title="@string/quick_settings_title_advanced_location" + android:key="qs_location_advanced" + systemui:defaultValue="0" + systemui:table="cm_secure"/> + + <LinearLayout + android:id="@+id/reset_tiles" + style="@style/SettingRow"> + <TextView + android:layout_width="0dp" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:id="@+id/title" + android:textColor="@color/qs_tile_reset_to_default_text_color" + android:text="@string/quick_settings_tile_reset_to_default" + android:contentDescription="@null"/> + + </LinearLayout> + + </LinearLayout> +</com.android.systemui.qs.QSSettings> + diff --git a/packages/SystemUI/res/layout/qs_settings_row.xml b/packages/SystemUI/res/layout/qs_settings_row.xml new file mode 100644 index 0000000..bc7f909 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_settings_row.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The CyanogenMod 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. +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <TextView + android:layout_width="0dp" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:id="@+id/title" + android:textColor="@color/qs_row_text_color" + android:contentDescription="@null"/> + + <Switch + android:id="@+id/switcher" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + /> +</merge> diff --git a/packages/SystemUI/res/layout/qs_tile_category_row.xml b/packages/SystemUI/res/layout/qs_tile_category_row.xml new file mode 100644 index 0000000..1736221 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_tile_category_row.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/qs_detail_item_height" + android:background="@drawable/btn_borderless_rect" + android:gravity="center_vertical" + android:orientation="horizontal" > + + <ImageView + android:id="@android:id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" /> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + android:layout_weight="1" + android:orientation="vertical" > + + <TextView + android:id="@android:id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textStyle="bold" + android:ellipsize="end" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + </LinearLayout> + + <ImageView + android:id="@android:id/icon2" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_tile_child_row.xml b/packages/SystemUI/res/layout/qs_tile_child_row.xml new file mode 100644 index 0000000..bb30729 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_tile_child_row.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/qs_detail_item_height" + android:background="@drawable/btn_borderless_rect" + android:gravity="center_vertical" + android:orientation="horizontal" > + + <ImageView + android:id="@android:id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginStart="72dp" + android:layout_marginEnd="12dp" /> + + <TextView + android:id="@android:id/title" + android:layout_weight="1" + android:layout_marginStart="12dp" + android:layout_width="0dp" + android:gravity="center_vertical" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_tile_top.xml b/packages/SystemUI/res/layout/qs_tile_top.xml new file mode 100644 index 0000000..a302c73 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_tile_top.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The CyanogenMod 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.qs.QSPanelTopView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/qs_panel_top" + android:layout_width="match_parent" + android:paddingTop="@dimen/qs_brightness_padding_top" + android:clipToPadding="false" + android:layout_height="wrap_content"> + + <!-- brightness --> + <include android:id="@+id/brightness_container" + layout="@layout/quick_settings_brightness_dialog"/> + + <!-- delete target --> + <LinearLayout + android:id="@+id/delete_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/delete_target" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:layout_gravity="center" + android:src="@drawable/ic_delete" + /> + </LinearLayout> + + <!-- edit instructions & add target --> + <LinearLayout + android:id="@+id/edit_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="horizontal"> + + <TextView + android:layout_width="0dp" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:layout_weight="1" + android:textColor="@color/qs_edit_header_instruction_text_color" + android:text="@string/qs_tile_edit_header_instruction" + android:contentDescription="@null"/> + + <ImageView + android:id="@+id/add_target" + android:layout_width="20dp" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:src="@drawable/ic_add_circle_qs" + /> + </LinearLayout> + + <TextView + android:id="@+id/qs_toast" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:textColor="@color/quick_settings_toast_color"/> + + +</com.android.systemui.qs.QSPanelTopView> + diff --git a/packages/SystemUI/res/layout/qs_user_detail_item.xml b/packages/SystemUI/res/layout/qs_user_detail_item.xml index af22f03..666f878 100644 --- a/packages/SystemUI/res/layout/qs_user_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_user_detail_item.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="top|center_horizontal" - android:paddingTop="16dp" + android:paddingTop="@dimen/detail_exterior_padding" android:minHeight="112dp" android:clipChildren="false" android:clipToPadding="false" diff --git a/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml new file mode 100644 index 0000000..1f51fe3 --- /dev/null +++ b/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012-2015 The CyanogenMod 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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:paddingLeft="16dp" + android:paddingRight="16dp" + style="@style/BrightnessDialogContainer"> + + <com.android.systemui.settings.ToggleSlider + android:id="@+id/notification_brightness_slider" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:contentDescription="@string/accessibility_notification_brightness" + android:importantForAccessibility="no" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/recents_empty.xml b/packages/SystemUI/res/layout/recents_empty.xml index 4b68e77..bd3e3bc 100644 --- a/packages/SystemUI/res/layout/recents_empty.xml +++ b/packages/SystemUI/res/layout/recents_empty.xml @@ -21,8 +21,8 @@ android:layout_gravity="center" android:gravity="center" android:textSize="16sp" - android:textColor="#ffffffff" + android:textColor="@color/recents_empty_message_text_color" android:text="@string/recents_empty_message" android:fontFamily="sans-serif" - android:background="#80000000" - android:visibility="gone" />
\ No newline at end of file + android:background="@color/recents_empty_background_color" + android:visibility="gone" /> diff --git a/packages/SystemUI/res/layout/recents_search_bar.xml b/packages/SystemUI/res/layout/recents_search_bar.xml index 915283e..f9bd02c 100644 --- a/packages/SystemUI/res/layout/recents_search_bar.xml +++ b/packages/SystemUI/res/layout/recents_search_bar.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/recents_search_bar_label" - android:textColor="#99ffffff" + android:textColor="@color/recents_search_bar_label_text_color" android:textSize="18sp" android:textAllCaps="true" /> </FrameLayout> diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml index 477d9d7..423ecb8 100644 --- a/packages/SystemUI/res/layout/recents_task_view_header.xml +++ b/packages/SystemUI/res/layout/recents_task_view_header.xml @@ -36,7 +36,7 @@ android:layout_marginStart="64dp" android:layout_marginEnd="64dp" android:textSize="16sp" - android:textColor="#ffffffff" + android:textColor="@color/task_view_header_text_color" android:text="@string/recents_empty_message" android:fontFamily="sans-serif-medium" android:singleLine="true" @@ -63,4 +63,4 @@ android:background="@drawable/recents_button_bg" android:visibility="invisible" android:src="@drawable/recents_dismiss_light" /> -</com.android.systemui.recents.views.TaskViewHeader>
\ No newline at end of file +</com.android.systemui.recents.views.TaskViewHeader> diff --git a/packages/SystemUI/res/layout/screen_pinning_request.xml b/packages/SystemUI/res/layout/screen_pinning_request.xml index fea45cc..af203ce 100644 --- a/packages/SystemUI/res/layout/screen_pinning_request.xml +++ b/packages/SystemUI/res/layout/screen_pinning_request.xml @@ -28,12 +28,6 @@ android:layout_height="wrap_content" layout="@layout/screen_pinning_request_text_area" /> - <View - android:id="@+id/spacer" - android:layout_width="@dimen/screen_pinning_request_width" - android:layout_height="18dp" - android:background="@color/screen_pinning_request_bg" /> - <include android:layout_width="@dimen/screen_pinning_request_width" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml index df957f4..6d24b0c 100644 --- a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml +++ b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:paddingEnd="48dp" android:paddingStart="48dp" - android:paddingTop="43dp" + android:paddingTop="18dp" android:text="@string/screen_pinning_title" android:textColor="@color/screen_pinning_primary_text" android:textSize="24sp" /> @@ -50,7 +50,7 @@ android:id="@+id/screen_pinning_ok_button" style="@android:style/Widget.Material.Button" android:layout_width="wrap_content" - android:layout_height="36dp" + android:layout_height="54dp" android:layout_alignParentEnd="true" android:layout_below="@+id/screen_pinning_description" android:layout_marginEnd="40dp" @@ -59,14 +59,14 @@ android:paddingEnd="8dp" android:paddingStart="8dp" android:text="@string/screen_pinning_positive" - android:textColor="@android:color/white" + android:textColor="@color/screen_pinning_description_text_color" android:textSize="14sp" /> <Button android:id="@+id/screen_pinning_cancel_button" style="@android:style/Widget.Material.Button" android:layout_width="wrap_content" - android:layout_height="36dp" + android:layout_height="54dp" android:layout_alignTop="@id/screen_pinning_ok_button" android:layout_marginEnd="4dp" android:layout_toStartOf="@id/screen_pinning_ok_button" @@ -74,7 +74,7 @@ android:paddingEnd="8dp" android:paddingStart="8dp" android:text="@string/screen_pinning_negative" - android:textColor="@android:color/white" + android:textColor="@color/screen_pinning_cancel_button_text_color" android:textSize="14sp" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index f8bd6fd..e2c1810 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -25,7 +25,6 @@ android:layout_width="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingEnd="@dimen/signal_cluster_battery_padding" > <ImageView android:id="@+id/vpn" diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index a5b3a83..51f7df7 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -62,6 +62,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" > + <com.android.systemui.statusbar.policy.Clock + android:id="@+id/left_clock" + android:textAppearance="@style/TextAppearance.StatusBar.Clock" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:singleLine="true" + android:paddingEnd="6dip" + android:gravity="center" + android:visibility="gone" + /> <com.android.systemui.statusbar.StatusBarIconView android:id="@+id/moreIcon" android:layout_width="@dimen/status_bar_icon_size" android:layout_height="match_parent" @@ -85,6 +95,23 @@ <include layout="@layout/system_icons" /> + <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="@dimen/header_battery_margin_keyguard" + android:textColor="@color/status_bar_battery_level_text_color" + android:textSize="@dimen/battery_level_text_size" /> + + <com.android.systemui.BatteryLevelTextView android:id="@+id/dock_battery_level_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="@dimen/header_battery_margin_keyguard" + android:textColor="@color/status_bar_battery_level_text_color" + android:textSize="@dimen/battery_level_text_size" + android:visibility="gone"/> + <com.android.systemui.statusbar.policy.Clock android:id="@+id/clock" android:textAppearance="@style/TextAppearance.StatusBar.Clock" @@ -97,4 +124,22 @@ </com.android.keyguard.AlphaOptimizedLinearLayout> </LinearLayout> + <com.android.keyguard.AlphaOptimizedLinearLayout + android:id="@+id/center_clock_layout" + android:gravity="center" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + + <com.android.systemui.statusbar.policy.Clock + android:id="@+id/center_clock" + android:textAppearance="@style/TextAppearance.StatusBar.Clock" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:singleLine="true" + android:gravity="center" + android:visibility="gone" + /> + </com.android.keyguard.AlphaOptimizedLinearLayout> </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 f7bbce0..996fb71 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -57,8 +57,8 @@ android:layout_marginTop="@dimen/status_bar_header_height_expanded" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/notification_side_padding" - android:layout_marginRight="@dimen/notification_side_padding"/> + android:layout_marginStart="@dimen/qs_panel_side_padding" + android:layout_marginEnd="@dimen/qs_panel_side_padding"/> <!-- A view to reserve space for the collapsed stack --> <!-- Layout height: notification_min_height + bottom_stack_peek_amount --> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 5eca471..a017a2e 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -23,10 +23,10 @@ android:layout_width="@dimen/notification_panel_width" android:layout_height="@dimen/status_bar_header_height" android:layout_gravity="@integer/notification_panel_layout_gravity" - android:paddingStart="@dimen/notification_side_padding" - android:paddingEnd="@dimen/notification_side_padding" + android:paddingStart="@dimen/notification_header_side_padding" + android:paddingEnd="@dimen/notification_header_side_padding" android:baselineAligned="false" - android:elevation="4dp" + android:elevation="@dimen/status_bar_expanded_header_elevation" android:background="@drawable/notification_header_bg" android:clickable="true" android:focusable="true" @@ -63,7 +63,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="36dp" - android:tint="#4DFFFFFF" + android:tint="@color/tuner_icon_tint" android:tintMode="src_in" android:visibility="invisible" android:src="@drawable/tuner" /> @@ -85,15 +85,25 @@ > <include layout="@layout/system_icons" /> </FrameLayout> - <TextView android:id="@+id/battery_level" + <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/header_battery_margin_expanded" android:paddingEnd="@dimen/battery_level_padding_end" - android:textColor="#ffffff" + android:textColor="@color/status_bar_battery_level_text_color" android:textSize="@dimen/battery_level_text_size" android:importantForAccessibility="noHideDescendants"/> + <com.android.systemui.DockBatteryLevelTextView android:id="@+id/dock_battery_level_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="@dimen/header_battery_margin_expanded" + android:paddingEnd="@dimen/battery_level_padding_end" + android:textColor="@color/status_bar_battery_level_text_color" + android:textSize="@dimen/battery_level_text_size" + android:importantForAccessibility="noHideDescendants" + android:visibility="gone"/> </LinearLayout> <TextView @@ -122,6 +132,7 @@ android:layout_marginStart="16dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" + android:background="@drawable/ripple_drawable" android:layout_below="@id/clock" systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" /> @@ -132,18 +143,24 @@ android:layout_marginStart="16dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" + android:background="@drawable/ripple_drawable" android:layout_below="@id/clock" systemui:datePattern="eeeeMMMMd" /> </FrameLayout> - <include layout="@layout/split_clock_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_above="@id/date_group" - android:id="@+id/clock" - /> + <FrameLayout + android:id="@+id/clock" + android:layout_marginStart="16dp" + android:layout_above="@id/date_group" + android:background="@drawable/ripple_drawable" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <include layout="@layout/split_clock_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + </FrameLayout> <com.android.systemui.statusbar.AlphaOptimizedButton android:id="@+id/alarm_status" android:layout_width="wrap_content" @@ -153,16 +170,48 @@ android:layout_marginBottom="4dp" android:drawablePadding="6dp" android:drawableStart="@drawable/ic_access_alarms_small" - android:textColor="#64ffffff" + android:textColor="@color/status_bar_alarm_status_text_color" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" android:paddingEnd="6dp" android:paddingStart="6dp" android:paddingTop="16dp" android:paddingBottom="16dp" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/ripple_drawable" android:visibility="gone" /> + <LinearLayout + android:id="@+id/weather_container" + android:background="@drawable/ripple_drawable" + android:orientation="vertical" + android:layout_marginBottom="@dimen/clock_collapsed_bottom_margin" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_width="wrap_content"> + <TextView + android:id="@+id/weather_line_1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingEnd="@dimen/status_bar_weather_padding_end" + android:gravity="right" + android:textColor="@color/status_bar_temperature_text_color" + android:textSize="@dimen/weather_text_size" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.WeatherTemp" + android:importantForAccessibility="noHideDescendants"/> + <TextView + android:id="@+id/weather_line_2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingEnd="@dimen/status_bar_weather_padding_end" + android:gravity="right" + android:textColor="@color/status_bar_temperature_location_text_color" + android:textSize="@dimen/weather_text_size" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.WeatherLocation" + android:importantForAccessibility="noHideDescendants"/> + </LinearLayout> + <include android:id="@+id/qs_detail_header" layout="@layout/qs_detail_header" @@ -191,7 +240,7 @@ android:fontFamily="sans-serif-condensed" android:textSize="11dp" android:textStyle="bold" - android:textColor="#00A040" + android:textColor="@color/header_debug_info_text_color" android:padding="2dp" /> diff --git a/packages/SystemUI/res/layout/status_bar_no_notifications.xml b/packages/SystemUI/res/layout/status_bar_no_notifications.xml index dd501d4..f4d1f1b 100644 --- a/packages/SystemUI/res/layout/status_bar_no_notifications.xml +++ b/packages/SystemUI/res/layout/status_bar_no_notifications.xml @@ -27,7 +27,7 @@ android:layout_height="64dp" android:paddingTop="12dp" android:gravity="top|center_horizontal" - android:textColor="#ffffff" + android:textColor="@color/no_notifications_text_color" android:textSize="20sp" android:text="@string/empty_shade_text"/> </com.android.systemui.statusbar.EmptyShadeView> diff --git a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml index 1675773..be18569 100644 --- a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml +++ b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="20dp" - android:textColor="@android:color/holo_blue_light" + android:textColor="@color/no_recent_apps_text_color" android:text="@string/status_bar_no_recent_apps" android:gravity="center_horizontal" android:layout_gravity="center" diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml index f699fce..bc8086d 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml @@ -44,7 +44,7 @@ android:layout_gravity="center_vertical" android:background="@drawable/keyguard_overflow_number_background" android:gravity="center" - android:textColor="#ff686868" + android:textColor="@color/keyguard_overflow_number_text_color" android:textStyle="bold" android:textSize="14dp" /> diff --git a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml index e220a16..d99a9f6 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml @@ -25,6 +25,6 @@ android:id="@+id/speedbump_line" android:layout_width="match_parent" android:layout_height="1dp" - android:background="#6fdddddd" + android:background="@color/speedbump_line_divider" android:layout_gravity="center_vertical"/> </com.android.systemui.statusbar.SpeedBumpView> diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml index 062e6cb..d28b870 100644 --- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml +++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml @@ -55,7 +55,7 @@ android:layout_centerVertical="true" android:gravity="center" android:paddingTop="26dp" - android:textColor="#666666" + android:textColor="@color/toggle_slider_text_color" android:textSize="12sp" android:visibility="gone" /> diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index e42ce66..c6178a0 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -18,12 +18,14 @@ --> <!-- This is the combined status bar / notification panel window. --> -<com.android.systemui.statusbar.phone.StatusBarWindowView +<com.android.systemui.statusbar.phone.NavBarInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:sysui="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:focusable="true" + android:fitsSystemWindows="true" + android:descendantFocusability="afterDescendants"> <com.android.systemui.statusbar.BackDropView android:id="@+id/backdrop" @@ -43,19 +45,34 @@ android:visibility="invisible" /> </com.android.systemui.statusbar.BackDropView> - <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:importantForAccessibility="no" - sysui:ignoreRightInset="true" - /> - - <com.android.systemui.statusbar.AlphaOptimizedView - android:id="@+id/heads_up_scrim" - android:layout_width="match_parent" - android:layout_height="@dimen/heads_up_scrim_height" - android:background="@drawable/heads_up_scrim" - android:importantForAccessibility="no"/> + <com.android.systemui.statusbar.phone.NavBarInsetLayout + android:id="@+id/scrimview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="visible" + sysui:ignoreRightInset="true" + android:fitsSystemWindows="true"> + <com.android.systemui.statusbar.ScrimView + android:id="@+id/scrim_behind" + android:layout_width="match_parent" + android:layout_height="match_parent" + sysui:ignoreRightInset="true" + android:importantForAccessibility="no"/> + <com.android.systemui.statusbar.AlphaOptimizedView + android:id="@+id/heads_up_scrim" + android:layout_width="match_parent" + android:layout_height="@dimen/heads_up_scrim_height" + android:background="@drawable/heads_up_scrim" + android:importantForAccessibility="no"/> + <com.android.systemui.statusbar.VisualizerView + android:id="@+id/visualizerview" + android:gravity="bottom" + android:layout_gravity="bottom" + android:layout_width="match_parent" + android:layout_height="match_parent" + sysui:ignoreRightInset="true" + android:visibility="visible"/> + </com.android.systemui.statusbar.phone.NavBarInsetLayout> <include layout="@layout/status_bar" android:layout_width="match_parent" @@ -97,4 +114,4 @@ sysui:ignoreRightInset="true" /> -</com.android.systemui.statusbar.phone.StatusBarWindowView> +</com.android.systemui.statusbar.phone.NavBarInsetLayout> diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 943e846..82e0667 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -36,5 +36,14 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="14.5dp" android:layout_width="9.5dp" - android:layout_marginBottom="@dimen/battery_margin_bottom"/> -</LinearLayout>
\ No newline at end of file + android:layout_marginBottom="@dimen/battery_margin_bottom" + android:layout_marginStart="@dimen/signal_cluster_battery_padding"/> + + <com.android.systemui.DockBatteryMeterView android:id="@+id/dock_battery" + android:layout_height="14.5dp" + android:layout_width="9.5dp" + android:layout_marginBottom="@dimen/battery_margin_bottom" + android:layout_marginStart="@dimen/signal_cluster_battery_padding" + android:visibility="gone"/> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/unlock_fab.xml b/packages/SystemUI/res/layout/unlock_fab.xml new file mode 100644 index 0000000..c80bc19 --- /dev/null +++ b/packages/SystemUI/res/layout/unlock_fab.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/show_bouncer" + android:layout_width="@dimen/unlock_fab_size" + android:layout_height="@dimen/unlock_fab_size" + android:layout_gravity="bottom|center_horizontal" + android:alpha="0.5" + android:src="@drawable/ic_lock_open_24dp" /> diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 7617ed4..a766261 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -22,7 +22,7 @@ android:layout_marginLeft="@dimen/notification_side_padding" android:layout_marginRight="@dimen/notification_side_padding" android:background="@drawable/volume_dialog_background" - android:translationZ="4dp" > + android:translationZ="@dimen/volume_panel_z"> <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/volume_expand_button" @@ -48,4 +48,4 @@ <include layout="@layout/volume_zen_footer" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 43ab4bb..1f88ef3 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -53,7 +53,7 @@ android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" android:src="@drawable/ic_close" - android:tint="@android:color/white" /> + android:tint="@color/zen_ic_close_tint_color" /> <TextView android:id="@+id/zen_introduction_message" |