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

Commit 3b4f5c42 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Make resizeable activity override public and introduce proto for CTS" into main

parents a2cf83f3 0bad00b4

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -53961,6 +53961,7 @@ package android.view { 
    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE";

    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 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";

core/java/android/view/WindowManager.java

+1 −2
Original line number Diff line number Diff line
@@ -1307,9 +1307,8 @@ public interface WindowManager extends ViewManager { 
     *     android:value="true|false"/>

     * </application>

     * </pre>

     * @hide

     */

    // TODO(b/280052089): Make this public API.

    @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API)

    String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES =

            "android.window.PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES";

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ message ActivityRecordProto { 
    optional bool should_refresh_activity_via_pause_for_camera_compat = 41;

    optional bool should_override_min_aspect_ratio = 42;

    optional bool should_ignore_orientation_request_loop = 43;

    optional bool should_override_force_resize_app = 44;

}



/* represents WindowToken */

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

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 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_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;

import static com.android.server.wm.ActivityRecordProto.SHOULD_OVERRIDE_MIN_ASPECT_RATIO;

import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT;

import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT;
@@ -10333,6 +10334,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                mLetterboxUiController.shouldOverrideMinAspectRatio());

        proto.write(SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP,

                mLetterboxUiController.shouldIgnoreOrientationRequestLoop());

        proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP,

                mLetterboxUiController.shouldOverrideForceResizeApp());

    }



    @Override