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

Commit 54a74552 authored by Graciela Putri's avatar Graciela Putri Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L59300000959974918:N81500001358561309"... 

Merge changes from topic "cherrypicker-L59300000959974918:N81500001358561309" into tm-qpr-dev-plus-aosp am: 5135bdaf

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



Change-Id: I2bb76572d2dde0303998897e1e5f6837f1205113
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60981c1d 5135bdaf

core/java/android/view/WindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ public interface WindowManager extends ViewManager { 
     * &lt;application&gt;

     *   &lt;property

     *     android:name=

     *       "android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"

     *       "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"

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

     * &lt;/application&gt;

     * </pre>
@@ -901,8 +901,8 @@ public interface WindowManager extends ViewManager { 
     * @hide

     */

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

    String PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED =

            "android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

    String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED =

            "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";



    /**

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

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

+5 −5
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTA 
import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH;

import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE;

import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS;

import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;

import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION;



import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__BOTTOM;
@@ -236,7 +236,7 @@ final class LetterboxUiController { 
    private final Boolean mBooleanPropertyIgnoreRequestedOrientation;



    @Nullable

    private final Boolean mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected;

    private final Boolean mBooleanPropertyAllowIgnoringOrientationRequestWhenLoopDetected;



    @Nullable

    private final Boolean mBooleanPropertyFakeFocus;
@@ -259,10 +259,10 @@ final class LetterboxUiController { 
                readComponentProperty(packageManager, mActivityRecord.packageName,

                        mLetterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled,

                        PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION);

        mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected =

        mBooleanPropertyAllowIgnoringOrientationRequestWhenLoopDetected =

                readComponentProperty(packageManager, mActivityRecord.packageName,

                        mLetterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled,

                        PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED);

                        PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED);

        mBooleanPropertyFakeFocus =

                readComponentProperty(packageManager, mActivityRecord.packageName,

                        mLetterboxConfiguration::isCompatFakeFocusEnabled,
@@ -445,7 +445,7 @@ final class LetterboxUiController { 
                /* gatingCondition */ mLetterboxConfiguration

                    ::isPolicyForIgnoringRequestedOrientationEnabled,

                mIsOverrideEnableCompatIgnoreOrientationRequestWhenLoopDetectedEnabled,

                mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected)) {

                mBooleanPropertyAllowIgnoringOrientationRequestWhenLoopDetected)) {

            return false;

        }

services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTA 
import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH;

import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;

import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE;

import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS;

import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;

import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
@@ -207,7 +207,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { 
            throws Exception {

        doReturn(true).when(mLetterboxConfiguration)

                .isPolicyForIgnoringRequestedOrientationEnabled();

        mockThatProperty(PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED,

        mockThatProperty(PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED,

                /* value */ false);

        doReturn(false).when(mActivity).isLetterboxedForFixedOrientationAndAspectRatio();