Merge "Companion device chooser UI enchancements" (d5015bec) · Commits · e / os / android_frameworks_base

packages/CompanionDeviceManager/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@

		<activity
		android:name=".DeviceChooserActivity"
		android:theme="@*android:style/Theme.Dialog.NoFrame"
		android:theme="@style/ChooserActivity"
		android:permission="android.permission.BIND_COMPANION_DEVICE_MANAGER_SERVICE">
		<!--TODO include url scheme filter similar to PrintSpooler -->
		<intent-filter>

packages/CompanionDeviceManager/res/drawable/dialog_background.xml

0 → 100644

+22 −0

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

		<inset xmlns:android="http://schemas.android.com/apk/res/android">
		<shape android:shape="rectangle">
		<corners android:radius="2dp" />
		<solid android:color="?android:attr/colorBackground" />
		</shape>
		</inset>

packages/CompanionDeviceManager/res/layout/buttons.xml

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2017 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:id="@+id/buttons"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_alignParentBottom="true"
		android:layout_alignParentEnd="true"
		android:gravity="end"
		>
		<Button
		android:id="@+id/button_cancel"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/cancel"
		style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
		/>
		<Button
		android:id="@+id/button_pair"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/pair"
		style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
		/>
		</LinearLayout>
		No newline at end of file

packages/CompanionDeviceManager/res/layout/device_chooser.xml

+6 −36

Original line number	Diff line number	Diff line
		@@ -16,52 +16,22 @@

		<RelativeLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_weight="0.1"
		android:id="@+id/container"
		android:layout_height="400dp"
		style="@style/ContainerLayout"
		>

		<TextView
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textColor="@android:color/black"
		style="@*android:style/TextAppearance.Widget.Toolbar.Title"
		/>
		<include layout="@layout/title" />

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

		<LinearLayout
		android:id="@+id/buttons"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_alignParentBottom="true"
		android:layout_alignParentEnd="true"
		android:gravity="end"
		>
		<Button
		android:id="@+id/button_cancel"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="Cancel"
		style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
		/>
		<Button
		android:id="@+id/button_pair"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="Pair"
		style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
		/>
		</LinearLayout>
		<include layout="@layout/buttons" />

		</RelativeLayout>
		No newline at end of file

packages/CompanionDeviceManager/res/layout/device_confirmation.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2017 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:id="@+id/container"
		android:layout_height="wrap_content"
		style="@style/ContainerLayout"
		>

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

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

		</LinearLayout>
		No newline at end of file