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

Commit 457a729d authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Hide background of IllustrationPreference" into main

parents 0a9496a9 f96fe81c

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -138,11 +138,14 @@ public class IllustrationPreference extends Preference implements GroupSectionDi 
        ImageView backgroundViewTablet =

        ImageView backgroundViewTablet =

                (ImageView) holder.findViewById(R.id.background_view_tablet);

                (ImageView) holder.findViewById(R.id.background_view_tablet);





        boolean isExpressive = SettingsThemeHelper.isExpressiveTheme(getContext());

        if (backgroundView != null) {

        if (backgroundView != null) {

            backgroundView.setVisibility(mIsTablet ? View.GONE : View.VISIBLE);

            backgroundView.setVisibility(

                    isExpressive || mIsTablet ? View.GONE : View.VISIBLE);

        }

        }

        if (backgroundViewTablet != null) {

        if (backgroundViewTablet != null) {

            backgroundViewTablet.setVisibility(mIsTablet ? View.VISIBLE : View.GONE);

            backgroundViewTablet.setVisibility(

                    isExpressive || !mIsTablet ? View.GONE : View.VISIBLE);

        }

        }

        if (mIsTablet) {

        if (mIsTablet) {

            backgroundView = backgroundViewTablet;

            backgroundView = backgroundViewTablet;