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

Commit 70deb628 authored by Santos Cordon's avatar Santos Cordon Committed by android-build-merger
Browse files

Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev 

am: e4e953ae

Change-Id: Ifbfc389a5c72493a06de9fa33828ff50ff0d46a5
parents 0bd001e9 e4e953ae

services/core/java/com/android/server/policy/PhoneWindowManager.java

+21 −1
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ import android.provider.Settings; 
import android.service.dreams.DreamManagerInternal;

import android.service.dreams.DreamService;

import android.service.dreams.IDreamManager;

import android.service.vr.IPersistentVrStateCallbacks;

import android.speech.RecognizerIntent;

import android.telecom.TelecomManager;

import android.util.DisplayMetrics;
@@ -512,6 +513,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    volatile boolean mGoingToSleep;

    volatile boolean mRecentsVisible;

    volatile boolean mPictureInPictureVisible;

    // Written by vr manager thread, only read in this class.

    volatile private boolean mPersistentVrModeEnabled;

    volatile private boolean mDismissImeOnBackKeyPressed;



    // Used to hold the last user key used to wake the device.  This helps us prevent up events
@@ -1002,6 +1005,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }

    MyOrientationListener mOrientationListener;



    final IPersistentVrStateCallbacks mPersistentVrModeListener =

            new IPersistentVrStateCallbacks.Stub() {

        @Override

        public void onPersistentVrStateChanged(boolean enabled) {

            mPersistentVrModeEnabled = enabled;

        }

    };



    private final StatusBarController mStatusBarController = new StatusBarController();



    private final BarController mNavigationBarController = new BarController("NavigationBar",
@@ -6909,7 +6920,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        || mAllowAllRotations == 1

                        || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR

                        || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER) {

                    preferredRotation = sensorRotation;

                    // In VrMode, we report the sensor as always being in default orientation so:

                    // 1) The orientation doesn't change as the user moves their head.

                    // 2) 2D apps within VR show in the device's default orientation.

                    // This only overwrites the sensor-provided orientation and does not affect any

                    // explicit orientation preferences specified by any activities.

                    preferredRotation =

                            mPersistentVrModeEnabled ? Surface.ROTATION_0 : sensorRotation;

                } else {

                    preferredRotation = lastRotation;

                }
@@ -7083,6 +7100,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mKeyguardDelegate.onSystemReady();



        mVrManagerInternal = LocalServices.getService(VrManagerInternal.class);

        if (mVrManagerInternal != null) {

            mVrManagerInternal.addPersistentVrModeStateListener(mPersistentVrModeListener);

        }



        readCameraLensCoverState();

        updateUiMode();