Merge "Remove swipe to exit persistent Vr mode behavior" into oc-dev (bd3d0dea) · Commits · e / os / android_frameworks_base

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

+0 −33

Original line number	Original line	Diff line number	Diff line
	@@ -184,7 +184,6 @@ import android.provider.Settings;
	import android.service.dreams.DreamManagerInternal;		import android.service.dreams.DreamManagerInternal;
	import android.service.dreams.DreamService;		import android.service.dreams.DreamService;
	import android.service.dreams.IDreamManager;		import android.service.dreams.IDreamManager;
	import android.service.vr.IPersistentVrStateCallbacks;
	import android.speech.RecognizerIntent;		import android.speech.RecognizerIntent;
	import android.telecom.TelecomManager;		import android.telecom.TelecomManager;
	import android.util.DisplayMetrics;		import android.util.DisplayMetrics;
	@@ -513,8 +512,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	volatile boolean mGoingToSleep;		volatile boolean mGoingToSleep;
	volatile boolean mRecentsVisible;		volatile boolean mRecentsVisible;
	volatile boolean mPictureInPictureVisible;		volatile boolean mPictureInPictureVisible;
	// Written by vr manager thread, only read in this class
	volatile boolean mPersistentVrModeEnabled;
	volatile private boolean mDismissImeOnBackKeyPressed;		volatile private boolean mDismissImeOnBackKeyPressed;

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

	final IPersistentVrStateCallbacks mPersistentVrModeListener =
	new IPersistentVrStateCallbacks.Stub() {
	@Override
	public void onPersistentVrStateChanged(boolean enabled) {
	mPersistentVrModeEnabled = enabled;
	}
	};

	private final StatusBarController mStatusBarController = new StatusBarController();		private final StatusBarController mStatusBarController = new StatusBarController();

	private final BarController mNavigationBarController = new BarController("NavigationBar",		private final BarController mNavigationBarController = new BarController("NavigationBar",
	@@ -1965,36 +1954,24 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	if (mStatusBar != null) {		if (mStatusBar != null) {
	requestTransientBars(mStatusBar);		requestTransientBars(mStatusBar);
	}		}
	if (mPersistentVrModeEnabled) {
	exitPersistentVrMode();
	}
	}		}
	@Override		@Override
	public void onSwipeFromBottom() {		public void onSwipeFromBottom() {
	if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_BOTTOM) {		if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_BOTTOM) {
	requestTransientBars(mNavigationBar);		requestTransientBars(mNavigationBar);
	}		}
	if (mPersistentVrModeEnabled) {
	exitPersistentVrMode();
	}
	}		}
	@Override		@Override
	public void onSwipeFromRight() {		public void onSwipeFromRight() {
	if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_RIGHT) {		if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_RIGHT) {
	requestTransientBars(mNavigationBar);		requestTransientBars(mNavigationBar);
	}		}
	if (mPersistentVrModeEnabled) {
	exitPersistentVrMode();
	}
	}		}
	@Override		@Override
	public void onSwipeFromLeft() {		public void onSwipeFromLeft() {
	if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_LEFT) {		if (mNavigationBar != null && mNavigationBarPosition == NAV_BAR_LEFT) {
	requestTransientBars(mNavigationBar);		requestTransientBars(mNavigationBar);
	}		}
	if (mPersistentVrModeEnabled) {
	exitPersistentVrMode();
	}
	}		}
	@Override		@Override
	public void onFling(int duration) {		public void onFling(int duration) {
	@@ -6618,13 +6595,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	mVrManagerInternal.onScreenStateChanged(isScreenOn);		mVrManagerInternal.onScreenStateChanged(isScreenOn);
	}		}

	private void exitPersistentVrMode() {
	if (mVrManagerInternal == null) {
	return;
	}
	mVrManagerInternal.setPersistentVrModeEnabled(false);
	}

	private void finishWindowsDrawn() {		private void finishWindowsDrawn() {
	synchronized (mLock) {		synchronized (mLock) {
	if (!mScreenOnEarly \|\| mWindowManagerDrawComplete) {		if (!mScreenOnEarly \|\| mWindowManagerDrawComplete) {
	@@ -7112,9 +7082,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	mKeyguardDelegate.onSystemReady();		mKeyguardDelegate.onSystemReady();

	mVrManagerInternal = LocalServices.getService(VrManagerInternal.class);		mVrManagerInternal = LocalServices.getService(VrManagerInternal.class);
	if (mVrManagerInternal != null) {
	mVrManagerInternal.addPersistentVrModeStateListener(mPersistentVrModeListener);
	}

	readCameraLensCoverState();		readCameraLensCoverState();
	updateUiMode();		updateUiMode();