Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7207750 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Replace thin Letterbox policy flag" into 24D1-dev am: becfdb07 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27379638



Change-Id: I08e4755a3cca321836eb8f5a7777ac232ff844cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 412a1d55 becfdb07

core/java/android/window/flags/large_screen_experiences_app_compat.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -8,6 +8,16 @@ flag { 
  bug: "334077350"

}



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"

services/core/java/com/android/server/wm/LetterboxUiController.java

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,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
@@ -1081,7 +1081,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

services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -1594,7 +1594,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();
@@ -1609,7 +1609,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();