PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-11 23:35:13 +00:00
committed by Android (Google) Code Review
parent 15f963bed9 00d8ff5d6e
commit fd29aada6b
8 changed files with 147 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
res/layout/preference_bluetooth.xml
View File

@@ -1,33 +0,0 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<!-- Details button -->
<ImageView
android:id="@+id/deviceDetails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="8dip"
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_settings"
android:contentDescription="@string/bluetooth_device_details" />
</LinearLayout>

4
res/layout/preference_progress_category.xml
View File

@@ -35,7 +35,6 @@
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="?android:attr/textColorPrimary"
android:maxWidth="18dp"
android:maxHeight="18dp"/>
</LinearLayout>
@@ -47,7 +46,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="start|center"
android:textAppearance="@android:style/TextAppearance.Material.Body2"/>
android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/colorAccent"/>
<ProgressBar
android:id="@+id/scanning_progress"