Merge "Allow voice interaction window to control system bars" into nyc-mr1-dev (9f64b020) · Commits · e / os / android_frameworks_base

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -5062,8 +5062,25 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		// Keep track of the window if it's dimming but not necessarily fullscreen.
		final boolean reallyVisible = win.isVisibleOrBehindKeyguardLw() && !win.isGoneForLayoutLw();

		// Voice interaction overrides both top fullscreen and top docked.
		if (reallyVisible && win.getAttrs().type == TYPE_VOICE_INTERACTION) {
		if (mTopFullscreenOpaqueWindowState == null) {
		mTopFullscreenOpaqueWindowState = win;
		if (mTopFullscreenOpaqueOrDimmingWindowState == null) {
		mTopFullscreenOpaqueOrDimmingWindowState = win;
		}
		}
		if (mTopDockedOpaqueWindowState == null) {
		mTopDockedOpaqueWindowState = win;
		if (mTopDockedOpaqueOrDimmingWindowState == null) {
		mTopDockedOpaqueOrDimmingWindowState = win;
		}
		}
		}

		// Keep track of the window if it's dimming but not necessarily fullscreen.
		if (mTopFullscreenOpaqueOrDimmingWindowState == null && reallyVisible
		&& win.isDimming() && StackId.normallyFullscreenWindows(stackId)) {
		mTopFullscreenOpaqueOrDimmingWindowState = win;

+3 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,9 @@ public class AssistInteractionSession extends VoiceInteractionSession {
		} catch (InterruptedException e) {
		e.printStackTrace();
		}

		getWindow().getWindow().getDecorView().setSystemUiVisibility(
		View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
		}

		@Override