Controls Ui - Redline adjustments
Match current UX specs. Fix structure selection ellipses
Bug: 150789261
Test: visual
Change-Id: Ife0b98449b2135e7bbe22262fc2908eabb90d072
diff --git a/packages/SystemUI/res/layout/controls_base_item.xml b/packages/SystemUI/res/layout/controls_base_item.xml
index c571b9b..374e3b1 100644
--- a/packages/SystemUI/res/layout/controls_base_item.xml
+++ b/packages/SystemUI/res/layout/controls_base_item.xml
@@ -31,6 +31,7 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingTop="@dimen/control_padding_adjustment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -39,6 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Control.Status"
+ android:paddingTop="@dimen/control_padding_adjustment"
android:paddingStart="@dimen/control_status_padding"
app:layout_constraintBottom_toBottomOf="@+id/icon"
app:layout_constraintStart_toEndOf="@+id/icon" />
@@ -48,6 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Control.Status"
+ android:paddingTop="@dimen/control_padding_adjustment"
android:paddingStart="@dimen/control_status_padding"
app:layout_constraintBottom_toBottomOf="@+id/icon"
app:layout_constraintStart_toEndOf="@+id/status" />
@@ -57,15 +60,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Control.Title"
+ android:paddingLeft="@dimen/control_padding_adjustment"
+ android:paddingRight="@dimen/control_padding_adjustment"
app:layout_constraintBottom_toTopOf="@+id/subtitle"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/icon"/>
+ app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Control.Subtitle"
+ android:paddingLeft="@dimen/control_padding_adjustment"
+ android:paddingRight="@dimen/control_padding_adjustment"
+ android:paddingBottom="@dimen/control_padding_adjustment"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
diff --git a/packages/SystemUI/res/layout/controls_no_favorites.xml b/packages/SystemUI/res/layout/controls_no_favorites.xml
index 3e0699d..8074efd 100644
--- a/packages/SystemUI/res/layout/controls_no_favorites.xml
+++ b/packages/SystemUI/res/layout/controls_no_favorites.xml
@@ -28,6 +28,7 @@
android:paddingBottom="40dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
+ android:layout_marginTop="@dimen/controls_top_margin"
android:background="@drawable/control_no_favorites_background">
<LinearLayout
diff --git a/packages/SystemUI/res/layout/controls_spinner_item.xml b/packages/SystemUI/res/layout/controls_spinner_item.xml
index cb2ad94..44ae3b1 100644
--- a/packages/SystemUI/res/layout/controls_spinner_item.xml
+++ b/packages/SystemUI/res/layout/controls_spinner_item.xml
@@ -15,21 +15,21 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="12dp"
- android:paddingBottom="12dp">
+ android:padding="4dp">
- <Space
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="1dp" />
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center">
+
<ImageView
android:id="@+id/app_icon"
android:layout_gravity="center"
- android:layout_width="34dp"
- android:layout_height="24dp"
+ android:layout_width="@dimen/controls_header_app_icon_size"
+ android:layout_height="@dimen/controls_header_app_icon_size"
android:layout_marginEnd="10dp" />
<TextView
@@ -38,9 +38,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
+ </LinearLayout>
- <Space
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="1dp" />
</LinearLayout>
diff --git a/packages/SystemUI/res/layout/controls_with_favorites.xml b/packages/SystemUI/res/layout/controls_with_favorites.xml
index fd72273..d3de4cd 100644
--- a/packages/SystemUI/res/layout/controls_with_favorites.xml
+++ b/packages/SystemUI/res/layout/controls_with_favorites.xml
@@ -20,7 +20,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="20dp">
+ android:layout_marginTop="@dimen/controls_top_margin">
<LinearLayout
android:id="@+id/controls_header"
@@ -38,8 +38,8 @@
<ImageView
android:id="@+id/app_icon"
android:layout_gravity="center"
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="@dimen/controls_header_app_icon_size"
+ android:layout_height="@dimen/controls_header_app_icon_size"
android:layout_marginEnd="10dp" />
<TextView
@@ -58,5 +58,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingTop="12dp" />
+ android:paddingTop="30dp"
+ android:layout_marginLeft="@dimen/controls_list_side_margin"
+ android:layout_marginRight="@dimen/controls_list_side_margin" />
</merge>
diff --git a/packages/SystemUI/res/layout/global_actions_grid_v2.xml b/packages/SystemUI/res/layout/global_actions_grid_v2.xml
index 4fe21e5..ff0c6a7 100644
--- a/packages/SystemUI/res/layout/global_actions_grid_v2.xml
+++ b/packages/SystemUI/res/layout/global_actions_grid_v2.xml
@@ -63,8 +63,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_marginRight="@dimen/global_actions_grid_horizontal_padding"
- android:layout_marginLeft="@dimen/global_actions_grid_horizontal_padding"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/global_actions_panel"
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index e61d804..80c1ac8 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -219,10 +219,10 @@
<color name="magnification_border_color">#FF9900</color>
<!-- controls -->
- <color name="control_primary_text">@*android:color/foreground_material_dark</color>
- <color name="control_secondary_text">@*android:color/dim_foreground_dark</color>
- <color name="control_default_foreground">@*android:color/foreground_material_dark</color>
- <color name="control_default_background">@*android:color/background_floating_material_dark</color>
+ <color name="control_primary_text">@color/GM2_grey_100</color>
+ <color name="control_secondary_text">@color/GM2_grey_500</color>
+ <color name="control_default_foreground">@color/GM2_grey_500</color>
+ <color name="control_default_background">@color/GM2_grey_900</color>
<color name="control_list_popup_background">@*android:color/background_floating_material_dark</color>
<color name="control_spinner_dropdown">@*android:color/foreground_material_dark</color>
</resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index a5bb9d7..2dc0f5f 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1217,12 +1217,17 @@
<!-- Home Controls -->
<dimen name="controls_header_side_margin">32dp</dimen>
- <dimen name="control_header_text">24sp</dimen>
+ <dimen name="controls_header_app_icon_size">40dp</dimen>
+ <dimen name="controls_list_side_margin">16dp</dimen>
+ <dimen name="controls_top_margin">44dp</dimen>
+ <dimen name="control_header_text_size">22sp</dimen>
+ <dimen name="control_text_size">14sp</dimen>
<dimen name="control_spacing">4dp</dimen>
<dimen name="control_list_divider">1dp</dimen>
- <dimen name="control_corner_radius">15dp</dimen>
- <dimen name="control_height">100dp</dimen>
- <dimen name="control_padding">15dp</dimen>
+ <dimen name="control_corner_radius">12dp</dimen>
+ <dimen name="control_height">106dp</dimen>
+ <dimen name="control_padding">12dp</dimen>
+ <dimen name="control_padding_adjustment">4dp</dimen>
<dimen name="control_status_normal">12sp</dimen>
<dimen name="control_status_expanded">18sp</dimen>
<dimen name="control_base_item_margin">2dp</dimen>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index ecbe598..bcf3a26 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2639,6 +2639,4 @@
<string name="controls_favorite_load_error">The list of all controls could not be loaded.</string>
<!-- Controls management controls screen header for Other zone [CHAR LIMIT=60] -->
<string name="controls_favorite_other_zone_header">Other</string>
-
-
</resources>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a6c1eb0..2eccf58 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -659,8 +659,8 @@
<style name="Control" />
<style name="Control.Spinner">
- <item name="android:textSize">@dimen/control_header_text</item>
- <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+ <item name="android:textSize">@dimen/control_header_text_size</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
@@ -675,16 +675,20 @@
</style>
<style name="TextAppearance.Control.Status">
- <item name="android:textSize">12sp</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+ <item name="android:textSize">@dimen/control_text_size</item>
<item name="android:textColor">@color/control_primary_text</item>
</style>
<style name="TextAppearance.Control.Title">
- <item name="android:textSize">14sp</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+ <item name="android:textSize">@dimen/control_text_size</item>
+ <item name="android:lineSpacingExtra">6sp</item>
<item name="android:textColor">@color/control_primary_text</item>
</style>
<style name="TextAppearance.Control.Subtitle">
- <item name="android:textSize">12sp</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+ <item name="android:textSize">@dimen/control_text_size</item>
<item name="android:textColor">@color/control_secondary_text</item>
</style>
<style name="Control.ListPopupWindow" parent="@*android:style/Widget.DeviceDefault.ListPopupWindow">
@@ -693,5 +697,4 @@
<!-- used to override dark/light theming -->
<item name="*android:colorPopupBackground">@color/control_list_popup_background</item>
</style>
-
</resources>