diff options
3 files changed, 14 insertions, 4 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 453ff06591d8..0ef4fa392618 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 @@ -8,6 +8,16 @@ flag { } flag { + name: "disable_thin_letterboxing_policy" + namespace: "large_screen_experiences_app_compat" + description: "Whether reachability is disabled in case of thin letterboxing" + bug: "341027847" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "allows_screen_size_decoupled_from_status_bar_and_cutout" namespace: "large_screen_experiences_app_compat" description: "When necessary, configuration decoupled from status bar and display cutout" diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index eea8b6a76d08..18225285a4a8 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -1049,7 +1049,7 @@ final class LetterboxUiController { * thin letteboxing */ boolean allowVerticalReachabilityForThinLetterbox() { - if (!Flags.disableThinLetterboxingReachability()) { + if (!Flags.disableThinLetterboxingPolicy()) { return true; } // When the flag is enabled we allow vertical reachability only if the @@ -1062,7 +1062,7 @@ final class LetterboxUiController { * thin letteboxing */ boolean allowHorizontalReachabilityForThinLetterbox() { - if (!Flags.disableThinLetterboxingReachability()) { + if (!Flags.disableThinLetterboxingPolicy()) { return true; } // When the flag is enabled we allow horizontal reachability only if the diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java index ed205a5a3ffb..f559de8838a6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java @@ -1553,7 +1553,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { } @Test - @EnableFlags(Flags.FLAG_DISABLE_THIN_LETTERBOXING_REACHABILITY) + @EnableFlags(Flags.FLAG_DISABLE_THIN_LETTERBOXING_POLICY) public void testAllowReachabilityForThinLetterboxWithFlagEnabled() { spyOn(mController); doReturn(true).when(mController).isVerticalThinLetterboxed(); @@ -1568,7 +1568,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { } @Test - @DisableFlags(Flags.FLAG_DISABLE_THIN_LETTERBOXING_REACHABILITY) + @DisableFlags(Flags.FLAG_DISABLE_THIN_LETTERBOXING_POLICY) public void testAllowReachabilityForThinLetterboxWithFlagDisabled() { spyOn(mController); doReturn(true).when(mController).isVerticalThinLetterboxed(); |