Merge changes I77671bd4,I22021266 into rvc-dev am: 2c2afb92e3 am: 3cd2cc819f... (98e5c12d) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/controls_list_divider.xml

0 → 100644

+23 −0

Original line number	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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:tint="@color/control_secondary_text">
		<solid android:color="#33000000" />
		<size
		android:height="1dp"
		android:width="1dp" />
		</shape>

packages/SystemUI/res/drawable/ic_more_vert.xml

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		<!--
		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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#FF000000"
		android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
		</vector>

packages/SystemUI/res/layout/controls_spinner_item.xml

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2019 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.
		-->
		<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">

		<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_marginEnd="10dp" />

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

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

packages/SystemUI/res/layout/controls_with_favorites.xml

+30 −27

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

		<androidx.constraintlayout.widget.ConstraintLayout
		<LinearLayout
		android:id="@+id/controls_header"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="20dp">
		android:paddingTop="12dp">

		<TextView
		android:text="@string/quick_controls_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:gravity="center"
		android:textSize="25sp"
		android:textColor="@*android:color/foreground_material_dark"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />
		<Space
		android:layout_weight="1"
		android:layout_width="0dp"
		android:layout_height="1dp" />

		<ImageView
		android:id="@+id/controls_more"
		android:src="@drawable/ic_more_vert"
		android:layout_width="34dp"
		android:id="@+id/app_icon"
		android:layout_gravity="center"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginEnd="10dp"
		android:tint="@*android:color/foreground_material_dark"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintTop_toTopOf="parent" />
		android:layout_marginEnd="10dp" />

		<TextView
		style="@style/Control.Spinner.Header"
		android:clickable="false"
		android:id="@+id/app_or_structure_spinner"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:layout_gravity="center"
		android:ellipsize="end" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		<Space
		android:layout_weight="1"
		android:layout_width="0dp"
		android:layout_height="1dp" />
		</LinearLayout>

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

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1222,6 +1222,7 @@

		<!-- Home Controls -->
		<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>