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

Commit bb9637bb authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Don't draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev

parents e60d6ed7 d4e3fe4f

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -2755,12 +2755,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                        SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS,

                        SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS,

                        mStatusBarColor, mLastTopInset, Gravity.TOP,

                        mStatusBarColor, mLastTopInset, Gravity.TOP,

                        STATUS_BAR_BACKGROUND_TRANSITION_NAME,

                        STATUS_BAR_BACKGROUND_TRANSITION_NAME,

                        com.android.internal.R.id.statusBarBackground);

                        com.android.internal.R.id.statusBarBackground,

                        (getAttributes().flags & FLAG_FULLSCREEN) != 0);

                mNavigationColorView = updateColorViewInt(mNavigationColorView,

                mNavigationColorView = updateColorViewInt(mNavigationColorView,

                        SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION,

                        SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION,

                        mNavigationBarColor, mLastBottomInset, Gravity.BOTTOM,

                        mNavigationBarColor, mLastBottomInset, Gravity.BOTTOM,

                        NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME,

                        NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME,

                        com.android.internal.R.id.navigationBarBackground);

                        com.android.internal.R.id.navigationBarBackground,

                        false /* hiddenByWindowFlag */);

            }

            }

            if (insets != null) {

            if (insets != null) {

                insets = insets.consumeStableInsets();

                insets = insets.consumeStableInsets();
@@ -2769,8 +2771,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        }

        }





        private View updateColorViewInt(View view, int systemUiHideFlag, int translucentFlag,

        private View updateColorViewInt(View view, int systemUiHideFlag, int translucentFlag,

                int color, int height, int verticalGravity, String transitionName, int id) {

                int color, int height, int verticalGravity, String transitionName, int id,

                boolean hiddenByWindowFlag) {

            boolean show = height > 0 && (mLastSystemUiVisibility & systemUiHideFlag) == 0

            boolean show = height > 0 && (mLastSystemUiVisibility & systemUiHideFlag) == 0

                    && !hiddenByWindowFlag

                    && (getAttributes().flags & translucentFlag) == 0

                    && (getAttributes().flags & translucentFlag) == 0

                    && (color & Color.BLACK) != 0

                    && (color & Color.BLACK) != 0

                    && (getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;

                    && (getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;