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

Commit d5eb62e8 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Default android:persistent to false for some widgets" into main

parents 2d6ae039 f8f1d3a0

packages/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ public class FooterPreference extends Preference 
            setKey(KEY_FOOTER);

        }

        setSelectable(false);

        setPersistent(false);

    }



    /** The builder is convenient to creat a dynamic FooterPreference. */

packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -595,5 +595,6 @@ public class IllustrationPreference extends Preference implements GroupSectionDi 
            setMaxHeight(context.getResources().getDimensionPixelSize(

                    R.dimen.settingslib_illustration_height_tablet));

        }

        setPersistent(false);

    }

}

packages/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ constructor( 
        initAttributes(context, attrs, defStyleAttr)



        isSelectable = false

        isPersistent = false

    }



    private fun initAttributes(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {