diff options
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/LetterboxUiController.java | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a8638708824b..69273df2cce8 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2518,6 +2518,7 @@ public abstract class PackageManager { USER_MIN_ASPECT_RATIO_16_9, USER_MIN_ASPECT_RATIO_3_2, USER_MIN_ASPECT_RATIO_FULLSCREEN, + USER_MIN_ASPECT_RATIO_APP_DEFAULT, }) @Retention(RetentionPolicy.SOURCE) public @interface UserMinAspectRatio {} @@ -2571,6 +2572,16 @@ public abstract class PackageManager { */ public static final int USER_MIN_ASPECT_RATIO_FULLSCREEN = 6; + /** + * Aspect ratio override code: user sets to app's default aspect ratio. + * This resets both the user-forced aspect ratio, and the device manufacturer + * per-app override {@link ActivityInfo#OVERRIDE_ANY_ORIENTATION_TO_USER}. + * It is different from {@link #USER_MIN_ASPECT_RATIO_UNSET} as the latter may + * apply the device manufacturer per-app orientation override if any, + * @hide + */ + public static final int USER_MIN_ASPECT_RATIO_APP_DEFAULT = 7; + /** @hide */ @IntDef(flag = true, prefix = { "DELETE_" }, value = { DELETE_KEEP_DATA, diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index 9305396caa19..97cc982b69dd 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -46,6 +46,7 @@ import static android.content.pm.ActivityInfo.screenOrientationToString; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_16_9; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_3_2; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_4_3; +import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_APP_DEFAULT; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_DISPLAY_SIZE; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_FULLSCREEN; import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_SPLIT_SCREEN; @@ -1185,6 +1186,7 @@ final class LetterboxUiController { mUserAspectRatio = getUserMinAspectRatioOverrideCode(); return mUserAspectRatio != USER_MIN_ASPECT_RATIO_UNSET + && mUserAspectRatio != USER_MIN_ASPECT_RATIO_APP_DEFAULT && mUserAspectRatio != USER_MIN_ASPECT_RATIO_FULLSCREEN; } |