summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tiger Huang <tigerhuang@google.com> 2022-03-25 06:46:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-25 06:46:23 +0000
commit29b8170f55b089fb8ef153da334a811e284c6087 (patch)
tree93269f84d25b0cfafb67247038f5bc9d01d92a86
parent6594433069c1546869a24bb5c976dd53ae9d1fac (diff)
parent491d11350430ce88bc7bb63fc31811376d90310d (diff)
Merge "Fix setSystemBarsAppearances" into sc-v2-dev am: baedc4fdda am: 491d113504
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378203 Change-Id: Idf7d59382d9cae3161c10655e4533a42ebc5b080 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/view/ViewRootInsetsControllerHost.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootInsetsControllerHost.java b/core/java/android/view/ViewRootInsetsControllerHost.java
index 9793f8cfc83b..4387701f7a24 100644
--- a/core/java/android/view/ViewRootInsetsControllerHost.java
+++ b/core/java/android/view/ViewRootInsetsControllerHost.java
@@ -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();
}