am 2ec72ee1: am b30d902e: Merge "Volume: Dismiss panel on nav bar interaction." into lmp-mr1-dev (8b334a71) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -2669,6 +2669,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		@Override
		public void setInteracting(int barWindow, boolean interacting) {
		final boolean changing = ((mInteractingWindows & barWindow) != 0) != interacting;
		mInteractingWindows = interacting
		? (mInteractingWindows \| barWindow)
		: (mInteractingWindows & ~barWindow);
		@@ -2677,6 +2678,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		} else {
		resumeSuspendedAutohide();
		}
		// manually dismiss the volume panel when interacting with the nav bar
		if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) {
		if (mVolumeComponent != null) {
		mVolumeComponent.dismissNow();
		}
		}
		checkBarModes();
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,4 +21,5 @@ import com.android.systemui.statusbar.policy.ZenModeController;

		public interface VolumeComponent extends DemoMode {
		ZenModeController getZenController();
		void dismissNow();
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ public class VolumeUI extends SystemUI {

		@Override
		public void dismiss() throws RemoteException {
		mPanel.postDismiss(0);
		dismissNow();
		}

		@Override
		@@ -190,6 +190,11 @@ public class VolumeUI extends SystemUI {
		public void dispatchDemoCommand(String command, Bundle args) {
		mPanel.dispatchDemoCommand(command, args);
		}

		@Override
		public void dismissNow() {
		mPanel.postDismiss(0);
		}
		}

		private final class RemoteVolumeController extends IRemoteVolumeController.Stub {