Merge "Controls UI - Spinner cleanup" into rvc-dev am: 5f35da6c5c am: d5f0606dfb am: 0c41624f5b (1ff58f86) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/control_spinner_background.xml

0 → 100644

+35 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2020 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.
			-->

			<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
			android:paddingMode="stack"
			android:paddingStart="0dp"
			android:paddingEnd="40dp"
			android:paddingLeft="0dp"
			android:paddingRight="0dp">
			<item
			android:gravity="end\|fill_vertical"
			android:width="40dp"
			android:drawable="@*android:drawable/control_background_40dp_material" />

			<item
			android:drawable="@drawable/ic_ksh_key_down"
			android:gravity="end\|bottom"
			android:paddingBottom="6dp"
			android:width="24dp"
			android:height="24dp"
			android:end="12dp" />
			</layer-list>

packages/SystemUI/res/layout/controls_spinner_item.xml

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -33,18 +33,14 @@
	android:layout_marginEnd="10dp" />		android:layout_marginEnd="10dp" />

	<TextView		<TextView
			style="@style/Control.Spinner.Item"
	android:id="@+id/controls_spinner_item"		android:id="@+id/controls_spinner_item"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:singleLine="true"		android:layout_gravity="center" />
	android:layout_gravity="center"
	android:textSize="25sp"
	android:textColor="@color/control_secondary_text"
	android:fontFamily="@*android:string/config_headlineFontFamily" />

	<Space		<Space
	android:layout_weight="1"		android:layout_weight="1"
	android:layout_width="0dp"		android:layout_width="0dp"
	android:layout_height="1dp" />		android:layout_height="1dp" />
	</LinearLayout>		</LinearLayout>

packages/SystemUI/res/layout/controls_with_favorites.xml

+32 −30

Original line number	Original line	Diff line number	Diff line
	@@ -14,19 +14,26 @@
	~ limitations under the License.		~ limitations under the License.
	-->		-->
	<merge		<merge
	xmlns:android="http://schemas.android.com/apk/res/android">		xmlns:android="http://schemas.android.com/apk/res/android"
			xmlns:app="http://schemas.android.com/apk/res-auto">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingTop="20dp">

	<LinearLayout		<LinearLayout
	android:id="@+id/controls_header"		android:id="@+id/controls_header"
	android:orientation="horizontal"		android:orientation="horizontal"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:paddingTop="12dp">		android:layout_marginStart="@dimen/controls_header_side_margin"
			android:layout_marginEnd="@dimen/controls_header_side_margin"
	<Space		android:gravity="center"
	android:layout_weight="1"		app:layout_constraintBottom_toBottomOf="parent"
	android:layout_width="0dp"		app:layout_constraintEnd_toEndOf="parent"
	android:layout_height="1dp" />		app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" >

	<ImageView		<ImageView
	android:id="@+id/app_icon"		android:id="@+id/app_icon"
	@@ -41,20 +48,15 @@
	android:id="@+id/app_or_structure_spinner"		android:id="@+id/app_or_structure_spinner"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:singleLine="true"		android:layout_gravity="center" />
	android:layout_gravity="center"
	android:ellipsize="end" />

	<Space
	android:layout_weight="1"
	android:layout_width="0dp"
	android:layout_height="1dp" />
	</LinearLayout>		</LinearLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>

	<LinearLayout		<LinearLayout
	android:id="@+id/global_actions_controls_list"		android:id="@+id/global_actions_controls_list"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:orientation="vertical"		android:orientation="vertical"
	android:paddingTop="20dp" />		android:paddingTop="12dp" />
	</merge>		</merge>

packages/SystemUI/res/values/colors.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,4 +223,6 @@
	<color name="control_secondary_text">@*android:color/dim_foreground_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_foreground">@*android:color/foreground_material_dark</color>
	<color name="control_default_background">@*android:color/background_floating_material_dark</color>		<color name="control_default_background">@*android:color/background_floating_material_dark</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>		</resources>

packages/SystemUI/res/values/dimens.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1216,6 +1216,8 @@
	<dimen name="magnifier_up_down_controls_height">40dp</dimen>		<dimen name="magnifier_up_down_controls_height">40dp</dimen>

	<!-- Home Controls -->		<!-- Home Controls -->
			<dimen name="controls_header_side_margin">32dp</dimen>
			<dimen name="control_header_text">24sp</dimen>
	<dimen name="control_spacing">4dp</dimen>		<dimen name="control_spacing">4dp</dimen>
	<dimen name="control_list_divider">1dp</dimen>		<dimen name="control_list_divider">1dp</dimen>
	<dimen name="control_corner_radius">15dp</dimen>		<dimen name="control_corner_radius">15dp</dimen>