Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new sample rate dialog layout for new Bluetooth developer option"

Browse Source
This commit is contained in:
tim peng
2019-11-20 01:45:37 +00:00
committed by Android (Google) Code Review
parent 345dc2bf3a da9a2a1891
commit 426a2721d7
4 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
res/layout/bluetooth_audio_sample_rate_dialog.xml Normal file
View File

@@ -0,0 +1,61 @@
<?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.
-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<RadioGroup
android:id="@+id/bluetooth_audio_sample_rate_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/developer_option_dialog_margin_start">
<include
android:id="@+id/bluetooth_audio_sample_rate_default"
layout="@layout/preference_widget_dialog_radiobutton"/>
<include
android:id="@+id/bluetooth_audio_sample_rate_441"
layout="@layout/preference_widget_dialog_radiobutton"/>
<include
android:id="@+id/bluetooth_audio_sample_rate_480"
layout="@layout/preference_widget_dialog_radiobutton"/>
<include
android:id="@+id/bluetooth_audio_sample_rate_882"
layout="@layout/preference_widget_dialog_radiobutton"/>
<include
android:id="@+id/bluetooth_audio_sample_rate_960"
layout="@layout/preference_widget_dialog_radiobutton"/>
</RadioGroup>
<include
android:id="@+id/bluetooth_audio_codec_help_info"
layout="@layout/preference_widget_dialog_summary"/>
</LinearLayout>
</ScrollView>

23
res/layout/preference_widget_dialog_radiobutton.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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.
-->
<!-- Layout used by BaseBluetoothDialogPreference for the radio button in developer option dialog. -->
<RadioButton
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/developer_option_dialog_min_height"/>

27
res/layout/preference_widget_dialog_summary.xml Normal file
View File

@@ -0,0 +1,27 @@
<?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.
-->
<!-- Layout used by BaseBluetoothDialogPreference for the summary in developer option dialog. -->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/bluetooth_select_a2dp_codec_type_help_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/developer_option_dialog_margin_top"
android:minHeight="@dimen/developer_option_dialog_min_height"
android:paddingStart="@dimen/developer_option_dialog_padding_start"
android:textAppearance="?android:attr/textAppearanceSmall"/>

6
res/values/dimens.xml
View File

@@ -409,4 +409,10 @@
<!-- Battery meter icon size of advanced bluetooth device --> <!-- Battery meter icon size of advanced bluetooth device -->
<dimen name="advanced_bluetooth_battery_meter_width">7.8dp</dimen> <dimen name="advanced_bluetooth_battery_meter_width">7.8dp</dimen>
<dimen name="advanced_bluetooth_battery_meter_height">13dp</dimen> <dimen name="advanced_bluetooth_battery_meter_height">13dp</dimen>
<!-- Developer option bluetooth settings dialog -->
<dimen name="developer_option_dialog_margin_start">8dp</dimen>
<dimen name="developer_option_dialog_margin_top">8dp</dimen>
<dimen name="developer_option_dialog_min_height">48dp</dimen>
<dimen name="developer_option_dialog_padding_start">16dp</dimen>
</resources> </resources>