From ea455c58ddab063f57625fce0e24029de2e12c1e Mon Sep 17 00:00:00 2001 From: Gyehun Jeon Date: Fri, 27 Dec 2024 04:49:44 -0800 Subject: Add flag to show lock wallpaper in aod state This is a flag to show the lock wallpaper in aod state. Currently, there is no policy for showing wallpaper for appearing aod. So it will be implemented so that the lock wallpaper can be displayed when aod appears like keyguard appearing. Bug: 361438779 Test: N/A - just a flag Flag: com.android.window.flags.aod_transition (cherry picked from https://partner-android-review.googlesource.com/q/commit:3ae2b96dfc5a74b92855299d51c4fcf4a18b5bb7) Merged-In: Ibcb0b4ab5db4278380e474d1f40996de24244ff6 Change-Id: Ibcb0b4ab5db4278380e474d1f40996de24244ff6 --- core/java/android/window/flags/windowing_frontend.aconfig | 9 ++++++++- services/core/java/com/android/server/wm/WindowManagerFlags.java | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 409c3cd569ab..8b1fd6c50c99 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -432,6 +432,13 @@ flag { bug: "384976265" } +flag { + name: "aod_transition" + namespace: "windowing_frontend" + description: "Support to show lock wallpaper in aod state" + bug: "361438779" +} + flag { name: "check_disabled_snapshots_in_task_persister" namespace: "windowing_frontend" @@ -440,4 +447,4 @@ flag { metadata { purpose: PURPOSE_BUGFIX } -} +} \ No newline at end of file diff --git a/services/core/java/com/android/server/wm/WindowManagerFlags.java b/services/core/java/com/android/server/wm/WindowManagerFlags.java index 7ef8d8d0c16a..df70ed2e99a8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerFlags.java +++ b/services/core/java/com/android/server/wm/WindowManagerFlags.java @@ -58,6 +58,8 @@ class WindowManagerFlags { final boolean mEnsureWallpaperInTransitions; + final boolean mAodTransition = Flags.aodTransition(); + /* End Available Flags */ WindowManagerFlags() { -- cgit v1.2.3-59-g8ed1b