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

Commit 4cc422ef authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Treat non-existing types as controllable types for compatibility" into... 

Merge "Treat non-existing types as controllable types for compatibility" into udc-dev am: 27a68f38 am: ad449deb

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



Change-Id: I8a4436a1fee5e66cd33a9b539d068b3eb0dbe999
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d392d860 ad449deb

core/java/android/view/InsetsController.java

+11 −1
Original line number Diff line number Diff line
@@ -658,6 +658,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
    /** Set of inset types which cannot be controlled by the user animation */

    private @InsetsType int mDisabledUserAnimationInsetsTypes;



    /** Set of inset types which are existing */

    private @InsetsType int mExistingTypes = 0;



    /** Set of inset types which are visible */

    private @InsetsType int mVisibleTypes = WindowInsets.Type.defaultVisible();
@@ -906,6 +909,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
            }

            mVisibleTypes = visibleTypes;

        }

        if (mExistingTypes != existingTypes) {

            if (WindowInsets.Type.hasCompatSystemBars(mExistingTypes ^ existingTypes)) {

                mCompatSysUiVisibilityStaled = true;

            }

            mExistingTypes = existingTypes;

        }

        InsetsState.traverse(mState, newState, mRemoveGoneSources);



        updateDisabledUserAnimationTypes(disabledUserAnimationTypes);
@@ -1662,7 +1671,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
        if (mCompatSysUiVisibilityStaled) {

            mCompatSysUiVisibilityStaled = false;

            mHost.updateCompatSysUiVisibility(

                    mVisibleTypes, mRequestedVisibleTypes, mControllableTypes);

                    // Treat non-existing types as controllable types for compatibility.

                    mVisibleTypes, mRequestedVisibleTypes, mControllableTypes | ~mExistingTypes);

        }

    }