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

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

Merge "Make min aspect ratio override public and introduce proto for CTS" into main

parents c51d567f 0618a427

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -53897,6 +53897,7 @@ package android.view { 
    field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH";

    field public static final String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE";

    field public static final String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE";

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

core/java/android/view/WindowManager.java

+1 −3
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ import android.view.WindowInsets.Side.InsetsSide; 
import android.view.WindowInsets.Type;

import android.view.WindowInsets.Type.InsetsType;

import android.view.accessibility.AccessibilityNodeInfo;

import android.window.ITrustedPresentationListener;

import android.window.TaskFpsCallback;

import android.window.TrustedPresentationThresholds;
@@ -1280,9 +1279,8 @@ public interface WindowManager extends ViewManager { 
     *     android:value="true|false"/>

     * </application>

     * </pre>

     * @hide

     */

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

    @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API)

    String PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE =

            "android.window.PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE";

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ message ActivityRecordProto { 
    optional bool should_force_rotate_for_camera_compat = 39;

    optional bool should_refresh_activity_for_camera_compat = 40;

    optional bool should_refresh_activity_via_pause_for_camera_compat = 41;

    optional bool should_override_min_aspect_ratio = 42;

}



/* represents WindowToken */

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

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

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;

import static com.android.server.wm.ActivityRecordProto.SHOULD_SEND_COMPAT_FAKE_FOCUS;
@@ -10357,6 +10358,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                mLetterboxUiController.shouldRefreshActivityForCameraCompat());

        proto.write(SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT,

                mLetterboxUiController.shouldRefreshActivityViaPauseForCameraCompat());

        proto.write(SHOULD_OVERRIDE_MIN_ASPECT_RATIO,

                mLetterboxUiController.shouldOverrideMinAspectRatio());

    }



    @Override