diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 7 | ||||
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 537f615f1f36..92f0ef61f4f8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -53959,6 +53959,7 @@ package android.view { field public static final String PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE"; field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES = "android.window.PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES"; field public static final String PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS = "android.window.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS"; + field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE"; field public static final String PROPERTY_COMPAT_ENABLE_FAKE_FOCUS = "android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS"; field public static final String PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION = "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION"; } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 61cf1266177a..aec418f6e20a 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1331,9 +1331,7 @@ public interface WindowManager extends ViewManager { * <p>When users apply the aspect ratio override, the minimum aspect ratio * specified in the app manifest is overridden. If users choose a * full-screen aspect ratio, the orientation of the activity is forced to - * {@link android.content.pm.ActivityInfo#SCREEN_ORIENTATION_USER}; - * see {@link #PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_FULLSCREEN_OVERRIDE} to - * disable the full-screen option only. + * {@link android.content.pm.ActivityInfo#SCREEN_ORIENTATION_USER}. * * <p>The user override is intended to improve the app experience on devices * that have the ignore orientation request display setting enabled by OEMs @@ -1358,9 +1356,8 @@ public interface WindowManager extends ViewManager { * android:value="false"/> * </application> * </pre> - * @hide */ - // TODO(b/294227289): Make this public API + @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API) String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE"; diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index e5b85517e904..c82cf00e053f 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -397,6 +397,7 @@ message ActivityRecordProto { optional bool should_override_min_aspect_ratio = 42; optional bool should_ignore_orientation_request_loop = 43; optional bool should_override_force_resize_app = 44; + optional bool should_enable_user_aspect_ratio_settings = 45; } /* represents WindowToken */ diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index b1ae0a23d7c9..2d26cf707b72 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -182,6 +182,7 @@ import static com.android.server.wm.ActivityRecordProto.PROC_ID; import static com.android.server.wm.ActivityRecordProto.PROVIDES_MAX_BOUNDS; import static com.android.server.wm.ActivityRecordProto.REPORTED_DRAWN; import static com.android.server.wm.ActivityRecordProto.REPORTED_VISIBLE; +import static com.android.server.wm.ActivityRecordProto.SHOULD_ENABLE_USER_ASPECT_RATIO_SETTINGS; import static com.android.server.wm.ActivityRecordProto.SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT; import static com.android.server.wm.ActivityRecordProto.SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP; import static com.android.server.wm.ActivityRecordProto.SHOULD_OVERRIDE_FORCE_RESIZE_APP; @@ -10363,6 +10364,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mLetterboxUiController.shouldIgnoreOrientationRequestLoop()); proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP, mLetterboxUiController.shouldOverrideForceResizeApp()); + proto.write(SHOULD_ENABLE_USER_ASPECT_RATIO_SETTINGS, + mLetterboxUiController.shouldEnableUserAspectRatioSettings()); } @Override |