summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/drawable/qs_background_primary.xml (renamed from packages/SystemUI/res/drawable/qs_panel_background.xml)0
-rw-r--r--packages/SystemUI/res/drawable/qs_background_secondary.xml (renamed from packages/SystemUI/res/drawable/zen_alarm_hard_background.xml)2
-rw-r--r--packages/SystemUI/res/drawable/segmented_button.xml27
-rw-r--r--packages/SystemUI/res/drawable/segmented_buttons.xml21
-rw-r--r--packages/SystemUI/res/drawable/zen_alarm_soft_background.xml23
-rw-r--r--packages/SystemUI/res/layout/qs_panel.xml2
-rw-r--r--packages/SystemUI/res/layout/segmented_button.xml4
-rw-r--r--packages/SystemUI/res/layout/volume_dialog.xml2
-rw-r--r--packages/SystemUI/res/layout/volume_panel.xml11
-rw-r--r--packages/SystemUI/res/layout/volume_panel_item.xml18
-rw-r--r--packages/SystemUI/res/layout/zen_mode_panel.xml59
-rw-r--r--packages/SystemUI/res/values/colors.xml10
-rw-r--r--packages/SystemUI/res/values/styles.xml3
13 files changed, 57 insertions, 125 deletions
diff --git a/packages/SystemUI/res/drawable/qs_panel_background.xml b/packages/SystemUI/res/drawable/qs_background_primary.xml
index b4e311f..b4e311f 100644
--- a/packages/SystemUI/res/drawable/qs_panel_background.xml
+++ b/packages/SystemUI/res/drawable/qs_background_primary.xml
diff --git a/packages/SystemUI/res/drawable/zen_alarm_hard_background.xml b/packages/SystemUI/res/drawable/qs_background_secondary.xml
index 3620212..3662e5a 100644
--- a/packages/SystemUI/res/drawable/zen_alarm_hard_background.xml
+++ b/packages/SystemUI/res/drawable/qs_background_secondary.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/system_warning_color" />
+ <solid android:color="@color/system_secondary_color" />
<corners
android:topLeftRadius="0dp"
android:topRightRadius="0dp"
diff --git a/packages/SystemUI/res/drawable/segmented_button.xml b/packages/SystemUI/res/drawable/segmented_button.xml
deleted file mode 100644
index 9669985..0000000
--- a/packages/SystemUI/res/drawable/segmented_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true">
- <shape android:shape="rectangle">
- <solid android:color="@color/segmented_button_selected" />
- <corners android:radius="@dimen/segmented_button_radius" />
- </shape>
- </item>
- <item>
- <ripple android:color="@color/segmented_button_selected" />
- </item>
-</selector> \ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/segmented_buttons.xml b/packages/SystemUI/res/drawable/segmented_buttons.xml
deleted file mode 100644
index bfbac97..0000000
--- a/packages/SystemUI/res/drawable/segmented_buttons.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
- <solid android:color="@color/segmented_button_background" />
- <corners android:radius="@dimen/segmented_button_radius" />
-</shape> \ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/zen_alarm_soft_background.xml b/packages/SystemUI/res/drawable/zen_alarm_soft_background.xml
deleted file mode 100644
index a99c79c..0000000
--- a/packages/SystemUI/res/drawable/zen_alarm_soft_background.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/zen_alarm_soft_warning_background" />
- <corners
- android:topLeftRadius="0dp"
- android:topRightRadius="0dp"
- android:bottomLeftRadius="@dimen/notification_material_rounded_rect_radius"
- android:bottomRightRadius="@dimen/notification_material_rounded_rect_radius"/>
-</shape>
diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml
index d0a07ad..087bf07 100644
--- a/packages/SystemUI/res/layout/qs_panel.xml
+++ b/packages/SystemUI/res/layout/qs_panel.xml
@@ -18,7 +18,7 @@
android:id="@+id/quick_settings_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/qs_panel_background"
+ android:background="@drawable/qs_background_primary"
android:elevation="2dp">
<com.android.systemui.qs.QSPanel
diff --git a/packages/SystemUI/res/layout/segmented_button.xml b/packages/SystemUI/res/layout/segmented_button.xml
index 538e434..9953b46 100644
--- a/packages/SystemUI/res/layout/segmented_button.xml
+++ b/packages/SystemUI/res/layout/segmented_button.xml
@@ -20,7 +20,7 @@
android:layout_marginStart="@dimen/segmented_button_spacing"
android:layout_weight="1"
android:textColor="@color/segmented_button_text_selector"
- android:background="@drawable/segmented_button"
+ android:background="@drawable/btn_borderless_rect"
android:textAppearance="@style/TextAppearance.QS.SegmentedButton"
- android:minHeight="0dp"
+ android:minHeight="36dp"
android:padding="10dp" />
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 7bd0aea..112f3a9 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -17,7 +17,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/volume_panel_width"
android:layout_height="wrap_content"
- android:background="@drawable/qs_panel_background"
+ android:background="@drawable/qs_background_primary"
android:translationZ="@dimen/volume_panel_z"
android:layout_marginBottom="@dimen/volume_panel_z">
diff --git a/packages/SystemUI/res/layout/volume_panel.xml b/packages/SystemUI/res/layout/volume_panel.xml
index 6416308..c85a750 100644
--- a/packages/SystemUI/res/layout/volume_panel.xml
+++ b/packages/SystemUI/res/layout/volume_panel.xml
@@ -18,20 +18,21 @@
android:id="@+id/visible_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="8dp"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/slider_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="@color/system_secondary_color"
+ android:paddingTop="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
android:clipChildren="false" />
- <ViewStub
- android:id="@+id/zen_panel_stub"
+ <include
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inflatedId="@+id/zen_panel"
- android:layout="@layout/zen_mode_panel" />
+ layout="@layout/zen_mode_panel" />
</LinearLayout> \ No newline at end of file
diff --git a/packages/SystemUI/res/layout/volume_panel_item.xml b/packages/SystemUI/res/layout/volume_panel_item.xml
index b1dd237..18b496c 100644
--- a/packages/SystemUI/res/layout/volume_panel_item.xml
+++ b/packages/SystemUI/res/layout/volume_panel_item.xml
@@ -23,22 +23,20 @@
<ImageView
android:id="@+id/stream_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:paddingBottom="10dip"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- android:paddingTop="10dip" />
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:scaleType="center"
+ android:background="@drawable/btn_borderless_rect"
+ android:contentDescription="@null" />
<SeekBar
android:id="@+id/seekbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingBottom="0dip"
- android:paddingEnd="17dip"
- android:paddingStart="0dip"
+ android:paddingBottom="0dp"
+ android:paddingEnd="16dp"
+ android:paddingStart="8dp"
android:paddingTop="0dip" />
</LinearLayout> \ No newline at end of file
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index b0e43fc..aa8d114 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -19,51 +19,59 @@
android:id="@+id/zen_mode_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/qs_panel_background"
android:clipChildren="false"
- android:orientation="vertical"
- android:paddingBottom="@dimen/qs_panel_padding" >
+ android:orientation="vertical" >
- <com.android.systemui.volume.SegmentedButtons
- android:id="@+id/zen_buttons"
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/qs_panel_padding"
- android:layout_marginRight="@dimen/qs_panel_padding"
- android:layout_marginTop="12dp"
- android:background="@drawable/segmented_buttons"
- android:clipChildren="false" />
+ android:minHeight="12dp"
+ android:background="@drawable/qs_background_secondary" >
+
+ <com.android.systemui.volume.SegmentedButtons
+ android:id="@+id/zen_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/qs_panel_padding"
+ android:layout_marginRight="@dimen/qs_panel_padding"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="12dp"
+ android:clipChildren="false" />
+ </FrameLayout>
<FrameLayout
android:id="@+id/zen_subhead"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/qs_panel_padding"
- android:paddingRight="@dimen/qs_panel_padding"
- android:paddingTop="@dimen/qs_panel_padding" >
+ android:layout_height="62dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp" >
<TextView
android:id="@+id/zen_subhead_collapsed"
android:layout_width="wrap_content"
- android:layout_height="32dp"
+ android:layout_height="48dp"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
+ android:paddingLeft="8dp"
android:background="@drawable/btn_borderless_rect"
android:clickable="true"
android:drawableEnd="@drawable/qs_subhead_caret"
- android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.QS.Subhead" />
<TextView
android:id="@+id/zen_subhead_expanded"
android:layout_width="wrap_content"
- android:layout_height="32dp"
+ android:layout_height="48dp"
+ android:layout_gravity="center_vertical"
android:gravity="center_vertical"
+ android:paddingLeft="8dp"
android:textAppearance="@style/TextAppearance.QS.Subhead" />
<ImageView
android:id="@+id/zen_more_settings"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_gravity="end"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_gravity="end|center_vertical"
android:background="@drawable/btn_borderless_rect"
android:clickable="true"
android:contentDescription="@null"
@@ -76,15 +84,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingTop="3dp" />
+ android:paddingBottom="@dimen/qs_panel_padding" />
<TextView
android:id="@+id/zen_alarm_warning"
android:layout_width="match_parent"
- android:layout_height="48dp"
- android:layout_marginTop="@dimen/qs_panel_padding"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/qs_panel_padding"
android:paddingLeft="@dimen/qs_panel_padding"
android:paddingRight="@dimen/qs_panel_padding"
- android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.QS.DetailEmpty" />
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:textAppearance="@style/TextAppearance.QS.Subhead" />
</com.android.systemui.volume.ZenModePanel> \ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index f23486e..627f11c 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -34,17 +34,15 @@
<color name="batterymeter_charge_color">#FFFFFFFF</color>
<color name="batterymeter_bolt_color">#FFFFFFFF</color>
<color name="qs_batterymeter_frame_color">#FF404040</color>
- <color name="system_primary_color">#ff263238</color>
+ <color name="system_primary_color">#ff263238</color><!-- blue grey 900 -->
<color name="system_secondary_color">#ff384248</color>
<color name="system_accent_color">#ff80CBC4</color><!-- deep teal 200 -->
<color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
<color name="qs_text">#FFFFFFFF</color>
<color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
<color name="qs_tile_text">#B3FFFFFF</color><!-- 70% white -->
- <color name="qs_subhead">#66FFFFFF</color><!-- 40% white -->
+ <color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->
<color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200-->
- <color name="zen_alarm_soft_warning_text">#99FFFFFF</color><!-- 60% white -->
- <color name="zen_alarm_soft_warning_background">#15FFFFFF</color><!-- 8% white -->
<color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white -->
<color name="data_usage_graph_track">#33FFFFFF</color><!-- 20% white -->
<color name="data_usage_graph_warning">#FFFFFFFF</color>
@@ -94,7 +92,5 @@
<!-- The color of the circle around the primary user in the user switcher -->
<color name="current_user_border_color">@color/system_accent_color</color>
- <color name="segmented_button_selected">#ff3d4549</color><!-- #33afbdc4 = 20% #afbdc4 = #ff3d4549 composite -->
- <color name="segmented_button_background">#ff21272b</color>
- <color name="segmented_button_text_inactive">#b3afbdc4</color><!-- 70% -->
+ <color name="segmented_button_text_inactive">#99afbdc4</color><!-- 60% -->
</resources>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 419ecc7..abf9337 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -186,12 +186,11 @@
<style name="TextAppearance.QS.Subhead">
<item name="android:textSize">14sp</item>
- <item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/qs_subhead</item>
</style>
<style name="TextAppearance.QS.SegmentedButton">
- <item name="android:textSize">12sp</item>
+ <item name="android:textSize">14sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
generated by cgit v1.1 at 2024-07-26 04:42:37 +0000