Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 426a2721 authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

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

parents 345dc2bf da9a2a18

res/layout/bluetooth_audio_sample_rate_dialog.xml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
<?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>

res/layout/preference_widget_dialog_radiobutton.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?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"/>

res/layout/preference_widget_dialog_summary.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?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"/>

res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -409,4 +409,10 @@ 
    <!-- Battery meter icon size of advanced bluetooth device -->

    <dimen name="advanced_bluetooth_battery_meter_width">7.8dp</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>