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

Merge "Avoid settingslib.widget.preference.radio" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-25 01:39:23 +00:00
committed by Android (Google) Code Review
parent 5ed30f4672 84dfb76f4a
commit f696c8d1ac
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() {
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);
}

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.PreferenceViewHolder;
import com.android.settings.R;
/**
* {@link CheckBoxPreference} that used only to display app
*/
@@ -43,12 +45,7 @@ public class AppCheckBoxPreference extends CheckBoxPreference {
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);