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

Merge changes Ifb5507cb,Ide044cf9

Browse Source 
* changes:
  Update BT header using BT metadata
  Add layout for advanced BT detail header
This commit is contained in:
Lei Yu
2019-01-29 01:29:23 +00:00
committed by Android (Google) Code Review
parent cb585a35ad 47123c8224
commit cda45e5d66
15 changed files with 501 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
res/layout/advanced_bt_entity_header.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 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/entity_header"
style="@style/EntityHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/entity_header_title"
style="@style/TextAppearance.EntityHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:singleLine="false"
android:ellipsize="marquee"
android:textDirection="locale"/>
<TextView
android:id="@+id/entity_header_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:singleLine="false"
android:ellipsize="marquee"
android:textDirection="locale"
android:text="test_summary"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<include
android:id="@+id/layout_left"
layout="@layout/advanced_bt_entity_sub"/>
<include
android:id="@+id/layout_middle"
layout="@layout/advanced_bt_entity_sub"/>
<include
android:id="@+id/layout_right"
layout="@layout/advanced_bt_entity_sub"/>
</LinearLayout>
</LinearLayout>

63
res/layout/advanced_bt_entity_sub.xml Normal file
View File

@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 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="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:id="@+id/header_icon"
android:layout_width="72dp"
android:layout_height="72dp"
android:scaleType="fitCenter"
android:layout_gravity="center_horizontal"
android:antialias="true"/>
<TextView
android:id="@+id/header_title"
style="@style/TextAppearance.EntityHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:singleLine="false"
android:ellipsize="marquee"
android:textDirection="locale"
android:layout_marginTop="24dp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/bt_battery_icon"
android:layout_width="13dp"
android:layout_height="20dp"/>
<TextView
android:id="@+id/bt_battery_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_gravity="center_horizontal"/>
</LinearLayout>
</LinearLayout>

7
res/values/strings.xml
View File

@@ -10513,6 +10513,13 @@
<!-- Title for no bluetooth devices in Bluetooth devices slice. [CHAR LIMIT=NONE] -->
<string name="no_bluetooth_devices">No Bluetooth devices</string>
<!-- Title for left bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_left_name">Left</string>
<!-- Title for right bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_right_name">Right</string>
<!-- Title for middle bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_middle_name">Case</string>
<!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
<string name="settings_panel_title">Settings Panel</string>

11
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -23,7 +23,16 @@
android:key="bluetooth_device_header"
android:layout="@layout/settings_entity_header"
android:selectable="false"
settings:allowDividerBelow="true"/>
settings:allowDividerBelow="true"
settings:searchable="false"/>
<com.android.settingslib.widget.LayoutPreference
android:key="advanced_bluetooth_device_header"
android:layout="@layout/advanced_bt_entity_header"
android:selectable="false"
settings:allowDividerBelow="true"
settings:searchable="false"
settings:controller="com.android.settings.bluetooth.AdvancedBluetoothDetailsHeaderController"/>
<com.android.settingslib.widget.ActionButtonsPreference
android:key="action_buttons"