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

Commit 5e41b1eb authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev am: 42ff37a2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869506



Change-Id: I8dc2e62fe2c1357f82bffdc9af2f6b17acf2e81d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dde41aa8 42ff37a2

core/java/com/android/internal/policy/DecorView.java

+6 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; 
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;



import static com.android.internal.policy.PhoneWindow.FEATURE_OPTIONS_PANEL;
@@ -309,6 +310,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                R.integer.dock_enter_exit_duration);

        mForceWindowDrawsBarBackgrounds = context.getResources().getBoolean(

                R.bool.config_forceWindowDrawsStatusBarBackground)

                && params.type != TYPE_INPUT_METHOD

                && context.getApplicationInfo().targetSdkVersion >= N;

        mSemiTransparentBarColor = context.getResources().getColor(

                R.color.system_bar_background_semi_transparent, null /* theme */);
@@ -1164,8 +1166,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                    0 /* sideInset */, animate && !disallowAnimate,

                    mForceWindowDrawsBarBackgrounds, controller);

            boolean oldDrawLegacy = mDrawLegacyNavigationBarBackground;

            mDrawLegacyNavigationBarBackground = mNavigationColorViewState.visible

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

            mDrawLegacyNavigationBarBackground =

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

            if (oldDrawLegacy != mDrawLegacyNavigationBarBackground) {

                mDrawLegacyNavigationBarBackgroundHandled =

                        mWindow.onDrawLegacyNavigationBarBackgroundChanged(
@@ -1206,7 +1208,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        boolean hideNavigation = (sysUiVisibility & SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0

                || !(controller == null || controller.isRequestedVisible(ITYPE_NAVIGATION_BAR));

        boolean decorFitsSystemWindows = mWindow.mDecorFitsSystemWindows;

        boolean forceConsumingNavBar = (mForceWindowDrawsBarBackgrounds

        boolean forceConsumingNavBar =

                ((mForceWindowDrawsBarBackgrounds || mDrawLegacyNavigationBarBackgroundHandled)

                        && (attrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0

                        && (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0

                        && decorFitsSystemWindows