Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move VR preference for portrait orientation." into oc-dr1-dev

Browse Source 
am: 7c4069d255

Change-Id: Ifc4138b41e801baf2acb06f83fd77115a74e71f2
This commit is contained in:
Santos Cordon
2017-08-02 23:22:17 +00:00
committed by android-build-merger
parent b1e8d97867 7c4069d255
commit ebc05a6a42
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -7049,6 +7049,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Ignore sensor when demo rotation lock is enabled. // Ignore sensor when demo rotation lock is enabled.
// Note that the dock orientation and HDMI rotation lock override this. // Note that the dock orientation and HDMI rotation lock override this.
preferredRotation = mDemoRotation; preferredRotation = mDemoRotation;
} else if (mPersistentVrModeEnabled) {
// While in VR, apps always prefer a portrait rotation. This does not change
// any apps that explicitly set landscape, but does cause sensors be ignored,
// and ignored any orientation lock that the user has set (this conditional
// should remain above the ORIENTATION_LOCKED conditional below).
preferredRotation = mPortraitRotation;
} else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) { } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) {
// Application just wants to remain locked in the last rotation. // Application just wants to remain locked in the last rotation.
preferredRotation = lastRotation; preferredRotation = lastRotation;
@@ -7079,13 +7085,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
|| mAllowAllRotations == 1 || mAllowAllRotations == 1
|| orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR
|| orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER) { || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER) {
// In VrMode, we report the sensor as always being in default orientation so: preferredRotation = sensorRotation;
// 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 { } else {
preferredRotation = lastRotation; preferredRotation = lastRotation;
} }