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

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

Merge "Make ignore orientation request loop override public and introduce proto for CTS" into main

parents 13627b32 18309cf4

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -53958,6 +53958,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_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 public static final String PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS = "android.window.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS";

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,7 @@ package android.content.pm { 
    field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH = 264304459L; // 0xfc0f74bL

    field public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = 264301586L; // 0xfc0ec12L

    field public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L; // 0xfb1048bL

    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = 273509367L; // 0x104d6bf7L

    field public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION = 254631730L; // 0xf2d5f32L

    field public static final long OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE = 266124927L; // 0xfdcbe7fL

    field public static final long OVERRIDE_MIN_ASPECT_RATIO = 174042980L; // 0xa5faf64L

core/java/android/content/pm/ActivityInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.content.pm;



import android.annotation.FlaggedApi;

import android.annotation.FloatRange;

import android.annotation.IntDef;

import android.annotation.NonNull;
@@ -42,6 +43,7 @@ import android.util.Printer; 
import android.window.OnBackInvokedCallback;



import com.android.internal.util.Parcelling;

import com.android.window.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -1099,6 +1101,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    @ChangeId

    @Overridable

    @Disabled

    @TestApi

    @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API)

    public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED =

            273509367L; // buganizer id

core/java/android/view/WindowManager.java

+1 −3
Original line number Diff line number Diff line
@@ -972,10 +972,8 @@ public interface WindowManager extends ViewManager { 
     *     android:value="false"/>

     * </application>

     * </pre>

     *

     * @hide

     */

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

    @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API)

    String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED =

            "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ message ActivityRecordProto { 
    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;

    optional bool should_ignore_orientation_request_loop = 43;

}



/* represents WindowToken */