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

Commit 9b2b0dcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev am: 588c4e15 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4781c62bb219050d67cbe7f58debd1847b8cb19b
parents 062c0ea9 588c4e15

res/layout/preference_widget_dialog_summary.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


<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"

src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java

+6 −2
Original line number Diff line number Diff line
@@ -97,10 +97,14 @@ public abstract class BaseBluetoothDialogPreference extends CustomDialogPreferen 
            radioButton.setText(mRadioButtonStrings.get(i));

            radioButton.setEnabled(selectableIndex.contains(i));

        }

        // View will be invisible when all options are enabled.

        if (selectableIndex.size() == mRadioButtonIds.size()) {

        // Initial help information text view

        final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);

        if (selectableIndex.size() == mRadioButtonIds.size()) {

            // View will be invisible when all options are enabled.

            helpTextView.setVisibility(View.GONE);

        } else {

            helpTextView.setText(R.string.bluetooth_select_a2dp_codec_type_help_info);

            helpTextView.setVisibility(View.VISIBLE);

        }

    }