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

Commit 83c23bd9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't clear requested SysUI visibility if the source doesn't exist"... 

Merge "Don't clear requested SysUI visibility if the source doesn't exist" into rvc-dev am: 9e1a5ebb am: d75315ca am: 1dc0f452 am: 0bf65803

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

Change-Id: I4d9db1b3878046c24ad4cfc9fe4c17631e37e703
parents 56f2e22e 0bf65803

core/java/android/view/InsetsSourceConsumer.java

+4 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.view; 


import static android.view.InsetsController.ANIMATION_TYPE_NONE;

import static android.view.InsetsController.AnimationType;

import static android.view.InsetsState.getDefaultVisibility;

import static android.view.InsetsController.DEBUG;

import static android.view.InsetsState.getDefaultVisibility;

import static android.view.InsetsState.toPublicType;



import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;
@@ -221,9 +221,10 @@ public class InsetsSourceConsumer { 
        final boolean hasControl = mSourceControl != null;



        // We still need to let the legacy app know the visibility change even if we don't have the

        // control.

        // control. If we don't have the source, we don't change the requested visibility for making

        // the callback behavior compatible.

        mController.updateCompatSysUiVisibility(

                mType, hasControl ? mRequestedVisible : isVisible, hasControl);

                mType, (hasControl || source == null) ? mRequestedVisible : isVisible, hasControl);



        // If we don't have control, we are not able to change the visibility.

        if (!hasControl) {