Merge "Fix: Color Inversion Preference Animation & Layout Glitch" into main (a1ef1d8e) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -140,12 +140,16 @@ public class IllustrationPreference extends Preference implements GroupSectionDi

		boolean isExpressive = SettingsThemeHelper.isExpressiveTheme(getContext());
		if (backgroundView != null) {
		backgroundView.setVisibility(
		isExpressive \|\| mIsTablet ? View.GONE : View.VISIBLE);
		// Setting visibility to INVISIBLE instead of GONE to prevent unnecessary layout
		// recalculations and redraws when dealing with dynamic set image.
		backgroundView.setVisibility(isExpressive
		? View.INVISIBLE : (mIsTablet ? View.GONE : View.VISIBLE));
		}
		if (backgroundViewTablet != null) {
		backgroundViewTablet.setVisibility(
		isExpressive \|\| !mIsTablet ? View.GONE : View.VISIBLE);
		// Setting visibility to INVISIBLE instead of GONE to prevent unnecessary layout
		// recalculations and redraws when dealing with dynamic set image.
		backgroundViewTablet.setVisibility(isExpressive
		? View.INVISIBLE : (!mIsTablet ? View.GONE : View.VISIBLE));
		}
		if (mIsTablet) {
		backgroundView = backgroundViewTablet;