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

Commit 8ec7a0e2 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Make WindowManager compat properties public." into udc-dev am: 1be7278e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21519185



Change-Id: I26f01f45ee408cd7a569ce6b0183d7243c99ccc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7a9e274 1be7278e

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -53907,6 +53907,14 @@ package android.view { 
    method public void removeViewImmediate(android.view.View);

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

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

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

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

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

  }















  public static class WindowManager.BadTokenException extends java.lang.RuntimeException {

























core/java/android/view/WindowManager.java



+21
−24




























Original line number
Diff line number
Diff line








@@ -863,10 +863,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION =















            "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION";


























@@ -899,8 +897,6 @@ public interface WindowManager extends ViewManager {













     *     android:value="false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */















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















    String PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS =










@@ -937,10 +933,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_COMPAT_ENABLE_FAKE_FOCUS = "android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS";































    /**










@@ -976,10 +970,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION =















            "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION";


























@@ -1023,10 +1015,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH =















            "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH";


























@@ -1073,17 +1063,28 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE =















            "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE";































    /**















     * Application level {@link android.content.pm.PackageManager.Property PackageManager















     * .Property} for an app to inform the system that the app should be excluded from the













     * compatibility override for orientation set by the device manufacturer.













     * compatibility override for orientation set by the device manufacturer. When the orientation













     * override is applied it can:













     * <ul>













     *   <li>Replace the specific orientation requested by the app with another selected by the













             device manufacturer, e.g. replace undefined requested by the app with portrait.













     *   <li>Always use an orientation selected by the device manufacturer.













     *   <li>Do one of the above but only when camera connection is open.













     * </ul>













     *













     * <p>This property is different from {@link PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION}













     * (which is used to avoid orientation loops caused by the incorrect use of {@link













     * android.app.Activity#setRequestedOrientation}) because this property overrides the app to an













     * orientation selected by the device manufacturer rather than ignoring one of orientation













     * requests coming from the app while respecting the previous one.















     *















     * <p>With this property set to {@code true} or unset, device manufacturers can override















     * orientation for the app using their discretion to improve display compatibility.









@@ -1099,10 +1100,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE =















            "android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE";


























@@ -1144,10 +1143,8 @@ public interface WindowManager extends ViewManager {













     *     android:value="true|false"/&gt;















     * &lt;/application&gt;















     * </pre>













     *













     * @hide















     */













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













    // TODO(b/263984287): Add CTS tests.















    String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE =















            "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE";