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

Avoid settingslib.widget.preference.radio

Browse Source 
Which is deprecated and will be cleaned up.

Bug: 289155281
Test: m Settings
Change-Id: Ie91835fa98ed71b5b9c73d1bc4d953a1e3ef3d02
This commit is contained in:
Chaohui Wang
2023-09-24 00:41:19 +08:00
parent 41fab98b6a
commit 84dfb76f4a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
View File

@@ -127,8 +127,7 @@ public class RadioWithImagePreference extends CheckBoxPreference {
} }
private void init() { private void init() {
setWidgetLayoutResource( setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
com.android.settingslib.widget.preference.radio.R.layout.preference_widget_radiobutton);
setLayoutResource(R.layout.radio_with_image_preference); setLayoutResource(R.layout.radio_with_image_preference);
setIconSpaceReserved(false); setIconSpaceReserved(false);
} }

9
src/com/android/settings/widget/AppCheckBoxPreference.java
View File

@@ -25,6 +25,8 @@ import android.widget.LinearLayout;
import androidx.preference.CheckBoxPreference; import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
/** /**
* {@link CheckBoxPreference} that used only to display app * {@link CheckBoxPreference} that used only to display app
*/ */
@@ -43,12 +45,7 @@ public class AppCheckBoxPreference extends CheckBoxPreference {
public void onBindViewHolder(PreferenceViewHolder holder) { public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
// NOTE: All the summary_container resources IDs in the different dependency widget packages final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.summary_container);
// are equivalent, so it does not matter which one we use. For example,
// com.android.settingslib.widget.preference.radio.R.id.summary_container ==
// com.android.settingslib.widget.preference.selector.R.id.summary_container
final LinearLayout layout = (LinearLayout) holder.findViewById(
com.android.settingslib.widget.preference.radio.R.id.summary_container);
if (layout != null) { if (layout != null) {
// If summary doesn't exist, make it gone // If summary doesn't exist, make it gone
layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE); layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);