Make FLAG_FULLSCREEN not go into lights out mode anymore. (644f9c3a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ interface IStatusBarService
		void setIcon(String slot, String iconPackage, int iconId, int iconLevel);
		void setIconVisibility(String slot, boolean visible);
		void removeIcon(String slot);
		void setActiveWindowIsFullscreen(boolean fullscreen);
		void setMenuKeyVisible(boolean visible);
		void setIMEButtonVisible(in IBinder token, boolean visible);

+2 −7

Original line number	Diff line number	Diff line
		@@ -1892,14 +1892,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		+ (topNeedsMenu ? "needs" : "does not need")
		+ " the MENU key");

		final boolean changedFullscreen = (mTopIsFullscreen != topIsFullscreen);
		mTopIsFullscreen = topIsFullscreen;
		final boolean changedMenu = (topNeedsMenu != mShowMenuKey);

		if (changedFullscreen \|\| changedMenu) {
		final boolean topIsFullscreenF = topIsFullscreen;
		if (changedMenu) {
		final boolean topNeedsMenuF = topNeedsMenu;

		mTopIsFullscreen = topIsFullscreen;
		mShowMenuKey = topNeedsMenu;

		mHandler.post(new Runnable() {
		@@ -1918,9 +1916,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (changedMenu) {
		sbs.setMenuKeyVisible(topNeedsMenuF);
		}
		if (changedFullscreen) {
		sbs.setActiveWindowIsFullscreen(topIsFullscreenF);
		}
		} catch (RemoteException e) {
		// This should be impossible because we're in the same process.
		mStatusBarService = null;

+0 −17

Original line number	Diff line number	Diff line
		@@ -283,23 +283,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub
		}
		}

		/**
		* This is used for the automatic version of lights-out mode. Only call this from
		* the window manager.
		*
		* @see setLightsOn(boolean)
		*/
		public void setActiveWindowIsFullscreen(boolean fullscreen) {
		// We could get away with a separate permission here, but STATUS_BAR is
		// signatureOrSystem which is probably good enough. There is no public API
		// for this, so the question is a security issue, not an API compatibility issue.
		enforceStatusBar();

		synchronized (mLock) {
		updateLightsOnLocked(!fullscreen);
		}
		}

		/**
		* This is used for the user-controlled version of lights-out mode. Only call this from
		* the status bar itself.