Avoid settingslib.widget.preference.radio
Which is deprecated and will be cleaned up.
Bug: 289155281
Test: m Settings
Change-Id: Ie91835fa98ed71b5b9c73d1bc4d953a1e3ef3d02
diff --git a/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java b/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
index 7d4f315..b47b679 100644
--- a/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
+++ b/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
@@ -127,8 +127,7 @@
}
private void init() {
- setWidgetLayoutResource(
- com.android.settingslib.widget.preference.radio.R.layout.preference_widget_radiobutton);
+ setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
setLayoutResource(R.layout.radio_with_image_preference);
setIconSpaceReserved(false);
}
diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java
index fa28b35..aa7e0e5 100644
--- a/src/com/android/settings/widget/AppCheckBoxPreference.java
+++ b/src/com/android/settings/widget/AppCheckBoxPreference.java
@@ -25,6 +25,8 @@
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* {@link CheckBoxPreference} that used only to display app
*/
@@ -43,12 +45,7 @@
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
- // NOTE: All the summary_container resources IDs in the different dependency widget packages
- // 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);
+ final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.summary_container);
if (layout != null) {
// If summary doesn't exist, make it gone
layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);