00d8ff5d6e
This reverts commit 457c3cbec2.
Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through
Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
62 lines
2.5 KiB
XML
62 lines
2.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2006 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.
|
|
-->
|
|
|
|
<!-- Layout used for ProgressCategory in bluetooth settings. -->
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"
|
|
android:layout_marginBottom="16dp"
|
|
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
android:paddingTop="16dp"
|
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/icon_container"
|
|
android:layout_width="60dp"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="start|center_vertical"
|
|
android:orientation="horizontal">
|
|
<com.android.internal.widget.PreferenceImageView
|
|
android:id="@android:id/icon"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:maxWidth="18dp"
|
|
android:maxHeight="18dp"/>
|
|
</LinearLayout>
|
|
|
|
<!-- This text view has the style of the list separator text view without the background and padding. -->
|
|
<TextView
|
|
android:id="@android:id/title"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:layout_gravity="start|center"
|
|
android:textAppearance="@android:style/TextAppearance.Material.Body2"
|
|
android:textColor="?android:attr/colorAccent"/>
|
|
|
|
<ProgressBar
|
|
android:id="@+id/scanning_progress"
|
|
style="?android:attr/progressBarStyleSmallTitle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_marginStart="16dip"
|
|
android:text="@string/progress_scanning"/>
|
|
|
|
</LinearLayout>
|