Merge "Introduce watch and multiple device icon" into tm-dev am: 8efcd0ba21 (6af2f39e) · Commits · e / os / android_frameworks_base

packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,6 @@
	<corners android:topLeftRadius="16dp" android:topRightRadius="16dp"		<corners android:topLeftRadius="16dp" android:topRightRadius="16dp"
	android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp"/>		android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp"/>
	<stroke		<stroke
	android:width="2dp"		android:width="1dp"
	android:color="@android:color/system_accent1_600" />		android:color="@android:color/system_accent1_600" />
	</shape>		</shape>
			No newline at end of file

packages/CompanionDeviceManager/res/drawable/ic_device_other.xml

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			~ Copyright (C) 2022 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"
			android:tint="?attr/colorControlNormal">
			<path android:fillColor="@android:color/white"
			android:pathData="M7,20H4Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20V6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18H7ZM9,20V18.2Q8.55,17.775 8.275,17.225Q8,16.675 8,16Q8,15.325 8.275,14.775Q8.55,14.225 9,13.8V12H13V13.8Q13.45,14.225 13.725,14.775Q14,15.325 14,16Q14,16.675 13.725,17.225Q13.45,17.775 13,18.2V20ZM11,17.5Q11.65,17.5 12.075,17.075Q12.5,16.65 12.5,16Q12.5,15.35 12.075,14.925Q11.65,14.5 11,14.5Q10.35,14.5 9.925,14.925Q9.5,15.35 9.5,16Q9.5,16.65 9.925,17.075Q10.35,17.5 11,17.5ZM21,20H16Q15.575,20 15.288,19.712Q15,19.425 15,19V10Q15,9.575 15.288,9.287Q15.575,9 16,9H21Q21.425,9 21.712,9.287Q22,9.575 22,10V19Q22,19.425 21.712,19.712Q21.425,20 21,20ZM17,18H20V11H17Z"/>
			</vector>
			No newline at end of file

packages/CompanionDeviceManager/res/drawable/ic_watch.xml

0 → 100644

+25 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			~ Copyright (C) 2022 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"
			android:tint="?attr/colorControlNormal">
			<path android:fillColor="@android:color/white"
			android:pathData="M9,22 L7.65,17.45Q6.45,16.5 5.725,15.075Q5,13.65 5,12Q5,10.35 5.725,8.925Q6.45,7.5 7.65,6.55L9,2H15L16.35,6.55Q17.55,7.5 18.275,8.925Q19,10.35 19,12Q19,13.65 18.275,15.075Q17.55,16.5 16.35,17.45L15,22ZM12,17Q14.075,17 15.538,15.537Q17,14.075 17,12Q17,9.925 15.538,8.462Q14.075,7 12,7Q9.925,7 8.463,8.462Q7,9.925 7,12Q7,14.075 8.463,15.537Q9.925,17 12,17ZM10.1,5.25Q11.075,4.975 12,4.975Q12.925,4.975 13.9,5.25L13.5,4H10.5ZM10.5,20H13.5L13.9,18.75Q12.925,19.025 12,19.025Q11.075,19.025 10.1,18.75ZM10.1,4H10.5H13.5H13.9Q12.925,4 12,4Q11.075,4 10.1,4ZM10.5,20H10.1Q11.075,20 12,20Q12.925,20 13.9,20H13.5Z"/>
			</vector>
			No newline at end of file

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+33 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,15 @@
	<!-- A header for selfManaged devices only. -->		<!-- A header for selfManaged devices only. -->
	<include layout="@layout/vendor_header" />		<include layout="@layout/vendor_header" />

			<ImageView
			android:id="@+id/profile_icon"
			android:layout_width="match_parent"
			android:layout_height="32dp"
			android:gravity="center"
			android:layout_marginBottom="12dp"
			android:layout_marginTop="1dp"
			android:tint="@android:color/system_accent1_600"/>

	<!-- Do NOT change the ID of the root LinearLayout above: it's referenced in CTS tests. -->		<!-- Do NOT change the ID of the root LinearLayout above: it's referenced in CTS tests. -->

	<TextView		<TextView
	@@ -28,6 +37,7 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:gravity="center"		android:gravity="center"
	android:paddingHorizontal="12dp"		android:paddingHorizontal="12dp"
			android:layout_marginBottom="12dp"
	style="@*android:style/TextAppearance.Widget.Toolbar.Title" />		style="@*android:style/TextAppearance.Widget.Toolbar.Title" />

	<TextView		<TextView
	@@ -45,12 +55,30 @@
	android:layout_height="0dp"		android:layout_height="0dp"
	android:layout_weight="1">		android:layout_weight="1">

			<LinearLayout
			android:id="@+id/multiple_device_list"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:visibility="gone">

			<View
			android:id="@+id/border_top"
			android:layout_marginTop="12dp"
			style="@style/DeviceListBorder" />

	<androidx.recyclerview.widget.RecyclerView		<androidx.recyclerview.widget.RecyclerView
	android:id="@+id/device_list"		android:id="@+id/device_list"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:scrollbars="vertical"		android:scrollbars="vertical"
	android:layout_height="200dp" />		android:layout_height="200dp" />

			<View
			android:id="@+id/border_bottom"
			style="@style/DeviceListBorder" />

			</LinearLayout>

	<androidx.recyclerview.widget.RecyclerView		<androidx.recyclerview.widget.RecyclerView
	android:id="@+id/permission_list"		android:id="@+id/permission_list"
	android:layout_width="match_parent"		android:layout_width="match_parent"

packages/CompanionDeviceManager/res/layout/list_item_device.xml

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,8 @@
	android:id="@android:id/icon"		android:id="@android:id/icon"
	android:layout_width="24dp"		android:layout_width="24dp"
	android:layout_height="24dp"		android:layout_height="24dp"
	android:layout_marginRight="12dp"/>		android:layout_marginRight="12dp"
			android:tint="@android:color/system_accent1_600"/>

	<TextView		<TextView
	android:id="@android:id/text1"		android:id="@android:id/text1"