Merge "CDM device profiles UI" (40d11f38) · Commits · e / os / android_frameworks_base

packages/CompanionDeviceManager/res/layout/buttons.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -29,14 +29,15 @@
		android:id="@+id/button_cancel"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@android:string/cancel"
		android:text="@string/consent_no"
		android:textColor="?android:attr/textColorSecondary"
		style="@android:style/Widget.Material.Button.Borderless.Colored"
		/>
		<Button
		android:id="@+id/button_pair"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@android:string/ok"
		android:text="@string/consent_yes"
		style="@android:style/Widget.Material.Button.Borderless.Colored"
		/>
		</LinearLayout>
		No newline at end of file

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,11 +23,13 @@

		<include layout="@layout/title" />

		<include layout="@layout/profile_summary" />

		<ListView
		android:id="@+id/device_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_below="@+id/title"
		android:layout_below="@+id/profile_summary"
		android:layout_above="@+id/buttons"
		style="@android:style/Widget.Material.ListView"
		/>

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@

		<include layout="@layout/title" />

		<include layout="@layout/profile_summary" />

		<include layout="@layout/buttons" />

		</LinearLayout>
		No newline at end of file

0 → 100644

+30 −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.
		-->


		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/profile_summary"
		android:layout_below="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		android:textColor="?android:attr/textColorSecondary"
		android:textSize="14sp"
		android:gravity="center"
		/>
		No newline at end of file

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,5 +20,6 @@
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		style="@*android:style/TextAppearance.Widget.Toolbar.Title"
		/>
		No newline at end of file