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

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

Merge "Fix setSystemBarsAppearances" into sc-v2-dev am: baedc4fd am: 491d1135 am: 29b8170f 

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



Change-Id: I0b7679be5f2fa7dc6f85b50f86335b5a3cceb8d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d5fa3b0 29b8170f

core/java/android/view/ViewRootInsetsControllerHost.java

+3 −2
Original line number Diff line number Diff line
@@ -171,8 +171,9 @@ public class ViewRootInsetsControllerHost implements InsetsController.Host { 
    public void setSystemBarsAppearance(int appearance, int mask) {

        mViewRoot.mWindowAttributes.privateFlags |= PRIVATE_FLAG_APPEARANCE_CONTROLLED;

        final InsetsFlags insetsFlags = mViewRoot.mWindowAttributes.insetsFlags;

        if (insetsFlags.appearance != appearance) {

            insetsFlags.appearance = (insetsFlags.appearance & ~mask) | (appearance & mask);

        final int newAppearance = (insetsFlags.appearance & ~mask) | (appearance & mask);

        if (insetsFlags.appearance != newAppearance) {

            insetsFlags.appearance = newAppearance;

            mViewRoot.mWindowAttributesChanged = true;

            mViewRoot.scheduleTraversals();

        }