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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4781c62bb219050d67cbe7f58debd1847b8cb19b
This commit is contained in:
TreeHugger Robot
2021-02-24 13:46:05 +00:00
committed by Automerger Merge Worker
parent 062c0ea933 588c4e1508
commit 9b2b0dcffb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/preference_widget_dialog_summary.xml
View File

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

8
src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
View File

@@ -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.
// Initial help information text view
final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
if (selectableIndex.size() == mRadioButtonIds.size()) {
final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
// 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);
}
}