summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-10-20 17:44:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-20 17:44:47 +0000
commitbf26b5a9f49f4dccb0379f6e363d51726df5eaf2 (patch)
treeca645d34304cf1016732827d1a15955ca0fe7a0f
parent8570351c5a5f4ee3246b980d6c883716924580d2 (diff)
parent7ce178e6cb68d8c5b625ec7e01e8b4df30f2c6e2 (diff)
Merge "Call DecorView.drawableChanged() in PhoneWindow.setBackgroungDrawable" into rvc-qpr-dev am: 7ce178e6cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12685846 Change-Id: I438591f2faa40c9ab80a8d774b48de7e7a1f9e1b
-rw-r--r--core/java/com/android/internal/policy/PhoneWindow.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 046981cf2e8f..d90a0225608d 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -1510,11 +1510,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (drawable != mBackgroundDrawable) {
mBackgroundDrawable = drawable;
if (mDecor != null) {
+ mDecor.startChanging();
mDecor.setWindowBackground(drawable);
if (mBackgroundFallbackDrawable != null) {
mDecor.setBackgroundFallback(drawable != null ? null :
mBackgroundFallbackDrawable);
}
+ mDecor.finishChanging();
}
}
}