diff options
| -rw-r--r-- | core/java/android/window/flags/large_screen_experiences_app_compat.aconfig | 10 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig index b97bf0b54c1a..a42759e9e23f 100644 --- a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig +++ b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig @@ -145,4 +145,14 @@ flag { description: "Whether the API for forcing apps to be universal resizable on virtual display is available" bug: "372848702" is_exported: true +} + +flag { + name: "release_user_aspect_ratio_wm" + namespace: "large_screen_experiences_app_compat" + description: "Whether to release UserAspectRatioSettingsWindowManager when button is hidden" + bug: "385049711" + metadata { + purpose: PURPOSE_BUGFIX + } }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java index b141bebbe8b1..1cc58c870540 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java @@ -32,6 +32,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.window.flags.Flags; import com.android.wm.shell.R; /** @@ -172,6 +173,9 @@ public class UserAspectRatioSettingsLayout extends LinearLayout { @Override public void onAnimationEnd(Animator animation) { view.setVisibility(View.GONE); + if (Flags.releaseUserAspectRatioWm()) { + mWindowManager.release(); + } } }); fadeOut.start(); |