Merge "Controls Ui - Redline adjustments" into rvc-dev am: fff9a30417 (f6fe5651) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/controls_base_item.xml

+9 −2

Original line number	Diff line number	Diff line
		@@ -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"/>

packages/SystemUI/res/layout/controls_no_favorites.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

packages/SystemUI/res/layout/controls_spinner_item.xml

+10 −13

Original line number	Diff line number	Diff line
		@@ -15,21 +15,21 @@
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="4dp">

		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="12dp"
		android:paddingBottom="12dp">
		android:gravity="center">

		<Space
		android:layout_weight="1"
		android:layout_width="0dp"
		android:layout_height="1dp" />
		<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>

packages/SystemUI/res/layout/controls_with_favorites.xml

+6 −4

Original line number	Diff line number	Diff line
		@@ -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>

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -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"