Merge "StatusBar: Clean up buzzBeepBlinked and friends" (cd1d343f) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -53,9 +53,6 @@ oneway interface IStatusBar
		void setImeWindowStatus(in IBinder token, int vis, int backDisposition,
		boolean showImeSwitcher);
		void setWindowState(int window, int state);
		void buzzBeepBlinked();
		void notificationLightOff();
		void notificationLightPulse(int argb, int millisOn, int millisOff);

		void showRecentApps(boolean triggeredFromAltTab, boolean fromHome);
		void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

packages/SystemUI/src/com/android/systemui/doze/DozeHost.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -30,15 +30,12 @@ public interface DozeHost {
		void stopDozing();
		void dozeTimeTick();
		boolean isPowerSaveActive();
		boolean isNotificationLightOn();
		boolean isPulsingBlocked();

		void startPendingIntentDismissingKeyguard(PendingIntent intent);

		interface Callback {
		default void onNewNotifications() {}
		default void onNotificationHeadsUp() {}
		default void onNotificationLight(boolean on) {}
		default void onPowerSaveChanged(boolean active) {}
		}

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+0 −41

Original line number	Diff line number	Diff line
		@@ -63,9 +63,6 @@ public class CommandQueue extends IStatusBar.Stub {
		private static final int MSG_SET_WINDOW_STATE = 12 << MSG_SHIFT;
		private static final int MSG_SHOW_RECENT_APPS = 13 << MSG_SHIFT;
		private static final int MSG_HIDE_RECENT_APPS = 14 << MSG_SHIFT;
		private static final int MSG_BUZZ_BEEP_BLINKED = 15 << MSG_SHIFT;
		private static final int MSG_NOTIFICATION_LIGHT_OFF = 16 << MSG_SHIFT;
		private static final int MSG_NOTIFICATION_LIGHT_PULSE = 17 << MSG_SHIFT;
		private static final int MSG_SHOW_SCREEN_PIN_REQUEST = 18 << MSG_SHIFT;
		private static final int MSG_APP_TRANSITION_PENDING = 19 << MSG_SHIFT;
		private static final int MSG_APP_TRANSITION_CANCELLED = 20 << MSG_SHIFT;
		@@ -121,9 +118,6 @@ public class CommandQueue extends IStatusBar.Stub {
		default void toggleKeyboardShortcutsMenu(int deviceId) { }
		default void cancelPreloadRecentApps() { }
		default void setWindowState(int window, int state) { }
		default void buzzBeepBlinked() { }
		default void notificationLightOff() { }
		default void notificationLightPulse(int argb, int onMillis, int offMillis) { }
		default void showScreenPinningRequest(int taskId) { }
		default void appTransitionPending() { }
		default void appTransitionCancelled() { }
		@@ -313,26 +307,6 @@ public class CommandQueue extends IStatusBar.Stub {
		}
		}

		public void buzzBeepBlinked() {
		synchronized (mLock) {
		mHandler.removeMessages(MSG_BUZZ_BEEP_BLINKED);
		mHandler.sendEmptyMessage(MSG_BUZZ_BEEP_BLINKED);
		}
		}

		public void notificationLightOff() {
		synchronized (mLock) {
		mHandler.sendEmptyMessage(MSG_NOTIFICATION_LIGHT_OFF);
		}
		}

		public void notificationLightPulse(int argb, int onMillis, int offMillis) {
		synchronized (mLock) {
		mHandler.obtainMessage(MSG_NOTIFICATION_LIGHT_PULSE, onMillis, offMillis, argb)
		.sendToTarget();
		}
		}

		public void showScreenPinningRequest(int taskId) {
		synchronized (mLock) {
		mHandler.obtainMessage(MSG_SHOW_SCREEN_PIN_REQUEST, taskId, 0, null)
		@@ -524,21 +498,6 @@ public class CommandQueue extends IStatusBar.Stub {
		mCallbacks.get(i).setWindowState(msg.arg1, msg.arg2);
		}
		break;
		case MSG_BUZZ_BEEP_BLINKED:
		for (int i = 0; i < mCallbacks.size(); i++) {
		mCallbacks.get(i).buzzBeepBlinked();
		}
		break;
		case MSG_NOTIFICATION_LIGHT_OFF:
		for (int i = 0; i < mCallbacks.size(); i++) {
		mCallbacks.get(i).notificationLightOff();
		}
		break;
		case MSG_NOTIFICATION_LIGHT_PULSE:
		for (int i = 0; i < mCallbacks.size(); i++) {
		mCallbacks.get(i).notificationLightPulse((Integer) msg.obj, msg.arg1, msg.arg2);
		}
		break;
		case MSG_SHOW_SCREEN_PIN_REQUEST:
		for (int i = 0; i < mCallbacks.size(); i++) {
		mCallbacks.get(i).showScreenPinningRequest(msg.arg1);

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

+0 −74

Original line number	Diff line number	Diff line
		@@ -603,8 +603,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		new ArraySet<>();
		private long mLastVisibilityReportUptimeMs;

		private final ShadeUpdates mShadeUpdates = new ShadeUpdates();

		private Runnable mLaunchTransitionEndRunnable;
		protected boolean mLaunchTransitionFadingAway;
		private ExpandableNotificationRow mDraggedDownRow;
		@@ -1894,7 +1892,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		updateEmptyShadeView();

		updateQsExpansionEnabled();
		mShadeUpdates.check();

		// Let's also update the icons
		mIconController.updateNotificationIcons(mNotificationData);
		@@ -3070,24 +3067,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}

		@Override // CommandQueue
		public void buzzBeepBlinked() {
		}

		@Override
		public void notificationLightOff() {
		if (mDozeServiceHost != null) {
		mDozeServiceHost.fireNotificationLight(false);
		}
		}

		@Override
		public void notificationLightPulse(int argb, int onMillis, int offMillis) {
		if (mDozeServiceHost != null) {
		mDozeServiceHost.fireNotificationLight(true);
		}
		}

		@Override // CommandQueue
		public void setSystemUiVisibility(int vis, int fullscreenStackVis, int dockedStackVis,
		int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) {
		@@ -5059,44 +5038,9 @@ public class StatusBar extends SystemUI implements DemoMode,
		return mStatusBarKeyguardViewManager.isShowing();
		}

		private final class ShadeUpdates {
		private final ArraySet<String> mVisibleNotifications = new ArraySet<String>();
		private final ArraySet<String> mNewVisibleNotifications = new ArraySet<String>();

		public void check() {
		mNewVisibleNotifications.clear();
		ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
		for (int i = 0; i < activeNotifications.size(); i++) {
		final Entry entry = activeNotifications.get(i);
		final boolean visible = entry.row != null
		&& entry.row.getVisibility() == View.VISIBLE;
		if (visible) {
		mNewVisibleNotifications.add(entry.key + entry.notification.getPostTime());
		}
		}
		final boolean updates = !mVisibleNotifications.containsAll(mNewVisibleNotifications);
		mVisibleNotifications.clear();
		mVisibleNotifications.addAll(mNewVisibleNotifications);

		// We have new notifications
		if (updates && mDozeServiceHost != null) {
		mDozeServiceHost.fireNewNotifications();
		}
		}
		}

		private final class DozeServiceHost implements DozeHost {
		// Amount of time to allow to update the time shown on the screen before releasing
		// the wakelock. This timeout is design to compensate for the fact that we don't
		// currently have a way to know when time display contents have actually been
		// refreshed once we've finished rendering a new frame.
		private static final long PROCESSING_TIME = 500;

		private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();

		// Keeps the last reported state by fireNotificationLight.
		private boolean mNotificationLightOn;

		@Override
		public String toString() {
		return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]";
		@@ -5114,19 +5058,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}

		public void fireNotificationLight(boolean on) {
		mNotificationLightOn = on;
		for (Callback callback : mCallbacks) {
		callback.onNotificationLight(on);
		}
		}

		public void fireNewNotifications() {
		for (Callback callback : mCallbacks) {
		callback.onNewNotifications();
		}
		}

		@Override
		public void addCallback(@NonNull Callback callback) {
		mCallbacks.add(callback);
		@@ -5191,11 +5122,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		== FingerprintUnlockController.MODE_WAKE_AND_UNLOCK;
		}

		@Override
		public boolean isNotificationLightOn() {
		return mNotificationLightOn;
		}

		@Override
		public void startPendingIntentDismissingKeyguard(PendingIntent intent) {
		StatusBar.this.startPendingIntentDismissingKeyguard(intent);

packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java

+0 −97

Original line number	Diff line number	Diff line
		@@ -41,104 +41,11 @@ public class TvStatusBar extends SystemUI implements Callbacks {

		private IStatusBarService mBarService;

		@Override
		public void setIcon(String slot, StatusBarIcon icon) {
		}

		@Override
		public void removeIcon(String slot) {
		}

		public void removeNotification(String key, RankingMap ranking) {
		}

		@Override
		public void disable(int state1, int state2, boolean animate) {
		}

		@Override
		public void animateExpandNotificationsPanel() {
		}

		@Override
		public void animateCollapsePanels(int flags) {
		}

		@Override
		public void setSystemUiVisibility(int vis, int fullscreenStackVis, int dockedStackVis,
		int mask, Rect fullscreenStackBounds, Rect dockedStackBounds) {
		}

		@Override
		public void topAppWindowChanged(boolean visible) {
		}

		@Override
		public void setImeWindowStatus(IBinder token, int vis, int backDisposition,
		boolean showImeSwitcher) {
		}

		@Override // CommandQueue
		public void setWindowState(int window, int state) {
		}

		@Override // CommandQueue
		public void buzzBeepBlinked() {
		}

		@Override // CommandQueue
		public void notificationLightOff() {
		}

		@Override // CommandQueue
		public void notificationLightPulse(int argb, int onMillis, int offMillis) {
		}

		@Override
		public void animateExpandSettingsPanel(String subPanel) {
		}

		@Override
		public void showScreenPinningRequest(int taskId) {
		}

		@Override
		public void appTransitionPending() {
		}

		@Override
		public void appTransitionCancelled() {
		}

		@Override
		public void appTransitionStarting(long startTime, long duration) {
		}

		@Override
		public void appTransitionFinished() {
		}

		@Override
		public void onCameraLaunchGestureDetected(int source) {
		}

		@Override
		public void showTvPictureInPictureMenu() {
		PipManager.getInstance().showTvPictureInPictureMenu();
		}

		@Override
		public void addQsTile(ComponentName tile) {
		}

		@Override
		public void remQsTile(ComponentName tile) {
		}

		@Override
		public void clickTile(ComponentName tile) {
		}

		@Override
		public void start() {
		putComponent(TvStatusBar.class, this);
		@@ -160,8 +67,4 @@ public class TvStatusBar extends SystemUI implements Callbacks {
		}
		}

		@Override
		public void handleSystemNavigationKey(int arg1) {
		// Not implemented
		}
		}