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

Commit 28391401 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix Restart and Resize hints flickering"" into main

parents 8e18d4b6 347c641e

libs/WindowManager/Shell/res/layout/compat_ui_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ 
    android:gravity="bottom|end">



    <include android:id="@+id/size_compat_hint"

        android:visibility="invisible"

        android:visibility="gone"

        android:layout_width="@dimen/compat_hint_width"

        android:layout_height="wrap_content"

        layout="@layout/compat_mode_hint"/>



    <ImageButton

        android:id="@+id/size_compat_restart_button"

        android:visibility="invisible"

        android:visibility="gone"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/compat_button_margin"

libs/WindowManager/Shell/res/layout/user_aspect_ratio_settings_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ 
    android:gravity="bottom|end">



    <include android:id="@+id/user_aspect_ratio_settings_hint"

        android:visibility="invisible"

        android:visibility="gone"

        android:layout_width="@dimen/compat_hint_width"

        android:layout_height="wrap_content"

        layout="@layout/compat_mode_hint"/>



    <ImageButton

        android:id="@+id/user_aspect_ratio_settings_button"

        android:visibility="invisible"

        android:visibility="gone"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/compat_button_margin"

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUILayout.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ class CompatUILayout extends LinearLayout { 


    private void setViewVisibility(@IdRes int resId, boolean show) {

        final View view = findViewById(resId);

        int visibility = show ? View.VISIBLE : View.INVISIBLE;

        int visibility = show ? View.VISIBLE : View.GONE;

        if (view.getVisibility() == visibility) {

            return;

        }

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class UserAspectRatioSettingsLayout extends LinearLayout { 


    private void setViewVisibility(@IdRes int resId, boolean show) {

        final View view = findViewById(resId);

        int visibility = show ? View.VISIBLE : View.INVISIBLE;

        int visibility = show ? View.VISIBLE : View.GONE;

        if (view.getVisibility() == visibility) {

            return;

        }
@@ -171,7 +171,7 @@ public class UserAspectRatioSettingsLayout extends LinearLayout { 
        fadeOut.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                view.setVisibility(View.INVISIBLE);

                view.setVisibility(View.GONE);

            }

        });

        fadeOut.start();