Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84dfb76f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Avoid settingslib.widget.preference.radio 

Which is deprecated and will be cleaned up.

Bug: 289155281
Test: m Settings
Change-Id: Ie91835fa98ed71b5b9c73d1bc4d953a1e3ef3d02
parent 41fab98b

src/com/android/settings/applications/appcompat/RadioWithImagePreference.java

+1 −2
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/widget/AppCheckBoxPreference.java

+3 −6
Original line number Diff line number Diff line
@@ -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);