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

Commit d6e44afe authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22628299']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22628299'] into tm-qpr3-c-release.

Change-Id: I3087db9bd305224d2071c12ed0277a328af416f0
parents 66998199 b5c13afb

core/java/android/view/WindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ public interface WindowManager extends ViewManager { 
     * <application>

     *   <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"/>

     * </application>

     * </pre>
@@ -885,8 +885,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;
@@ -241,7 +241,7 @@ final class LetterboxUiController { 
    private final Boolean mBooleanPropertyIgnoreRequestedOrientation;



    @Nullable

    private final Boolean mBooleanPropertyIgnoreOrientationRequestWhenLoopDetected;

    private final Boolean mBooleanPropertyAllowIgnoringOrientationRequestWhenLoopDetected;



    @Nullable

    private final Boolean mBooleanPropertyFakeFocus;
@@ -264,10 +264,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,
@@ -453,7 +453,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;
@@ -206,7 +206,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();