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

Set Default APN radio button's size to 48dp

Browse Source 
Which is the minimum tap size.

Also set ApnPreference not selectable, since itspPrimary target and
radio button could be selectable, but entire preference itself is not
selectable.

Fix: 330812055
Fix: 330290274
Test: manual - with APNs
Change-Id: I651642e8a275932be6b8bcb365198e5dc1ad92f8
This commit is contained in:
Chaohui Wang
2024-03-25 15:09:59 +08:00
parent 8e2324d9e0
commit 1ea5a786e2
3 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/network/apn/ApnPreference.java Executable file → Normal file
View File

@@ -49,7 +49,7 @@ public class ApnPreference extends Preference
private static CompoundButton sCurrentChecked = null;
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private boolean mProtectFromCheckedChange = false;
private boolean mSelectable = true;
private boolean mDefaultSelectable = true;
private boolean mHideDetails = false;
/**
@@ -57,6 +57,9 @@ public class ApnPreference extends Preference
*/
public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
// Primary target and radio button could be selectable, but entire preference itself is not
// selectable.
setSelectable(false);
}
/**
@@ -80,25 +83,25 @@ public class ApnPreference extends Preference
final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout);
textArea.setOnClickListener(this);
final View widget = view.findViewById(R.id.apn_radiobutton);
if ((widget != null) && widget instanceof RadioButton) {
final RadioButton rb = (RadioButton) widget;
if (mSelectable) {
rb.setOnCheckedChangeListener(this);
final RadioButton rb = view.itemView.requireViewById(R.id.apn_radiobutton);
if (mDefaultSelectable) {
view.itemView.requireViewById(R.id.apn_radio_button_frame).setOnClickListener((v) -> {
rb.performClick();
});
rb.setOnCheckedChangeListener(this);
final boolean isChecked = getKey().equals(sSelectedKey);
if (isChecked) {
sCurrentChecked = rb;
sSelectedKey = getKey();
}
mProtectFromCheckedChange = true;
rb.setChecked(isChecked);
mProtectFromCheckedChange = false;
rb.setVisibility(View.VISIBLE);
} else {
rb.setVisibility(View.GONE);
final boolean isChecked = getKey().equals(sSelectedKey);
if (isChecked) {
sCurrentChecked = rb;
sSelectedKey = getKey();
}
mProtectFromCheckedChange = true;
rb.setChecked(isChecked);
mProtectFromCheckedChange = false;
rb.setVisibility(View.VISIBLE);
} else {
rb.setVisibility(View.GONE);
}
}
@@ -167,12 +170,8 @@ public class ApnPreference extends Preference
}
}
public boolean getSelectable() {
return mSelectable;
}
public void setSelectable(boolean selectable) {
mSelectable = selectable;
public void setDefaultSelectable(boolean defaultSelectable) {
mDefaultSelectable = defaultSelectable;
}
public void setSubId(int subId) {