Merge "Fix Talkback can focus on blank area" into main

This commit is contained in:
Chaohui Wang
2024-06-25 06:51:12 +00:00
committed by Android (Google) Code Review

View File

@@ -85,10 +85,11 @@ public class ApnPreference extends Preference
final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout); final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout);
textArea.setOnClickListener(this); textArea.setOnClickListener(this);
final View radioButtonFrame = view.itemView.requireViewById(R.id.apn_radio_button_frame);
final RadioButton rb = view.itemView.requireViewById(R.id.apn_radiobutton); final RadioButton rb = view.itemView.requireViewById(R.id.apn_radiobutton);
mRadioButton = rb; mRadioButton = rb;
if (mDefaultSelectable) { if (mDefaultSelectable) {
view.itemView.requireViewById(R.id.apn_radio_button_frame).setOnClickListener((v) -> { radioButtonFrame.setOnClickListener((v) -> {
rb.performClick(); rb.performClick();
}); });
rb.setOnCheckedChangeListener(this); rb.setOnCheckedChangeListener(this);
@@ -96,9 +97,9 @@ public class ApnPreference extends Preference
mProtectFromCheckedChange = true; mProtectFromCheckedChange = true;
rb.setChecked(mIsChecked); rb.setChecked(mIsChecked);
mProtectFromCheckedChange = false; mProtectFromCheckedChange = false;
rb.setVisibility(View.VISIBLE); radioButtonFrame.setVisibility(View.VISIBLE);
} else { } else {
rb.setVisibility(View.GONE); radioButtonFrame.setVisibility(View.GONE);
} }
} }