Merge "Remove unused code" (99e73765) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Settings;
		import android.service.notification.NotificationListenerService.RankingMap;
		import android.service.notification.ZenModeConfig;
		import android.util.ArraySet;
		@@ -129,9 +128,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi

		public static final int MAX_BUBBLES = 5; // TODO: actually enforce this

		/** Flag to enable or disable the entire feature */
		private static final String ENABLE_BUBBLES = "experiment_enable_bubbles";

		private final Context mContext;
		private final NotificationEntryManager mNotificationEntryManager;
		private final BubbleTaskStackListener mTaskStackListener;
		@@ -636,9 +632,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		private final NotificationEntryListener mEntryListener = new NotificationEntryListener() {
		@Override
		public void onPendingEntryAdded(NotificationEntry entry) {
		if (!areBubblesEnabled(mContext)) {
		return;
		}
		if (mNotificationInterruptionStateProvider.shouldBubbleUp(entry)
		&& canLaunchInActivityView(mContext, entry)) {
		updateBubble(entry);
		@@ -647,9 +640,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi

		@Override
		public void onPreEntryUpdated(NotificationEntry entry) {
		if (!areBubblesEnabled(mContext)) {
		return;
		}
		boolean shouldBubble = mNotificationInterruptionStateProvider.shouldBubbleUp(entry)
		&& canLaunchInActivityView(mContext, entry);
		if (!shouldBubble && mBubbleData.hasBubbleWithKey(entry.key)) {
		@@ -945,11 +935,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		}
		}

		private static boolean areBubblesEnabled(Context context) {
		return Settings.Secure.getInt(context.getContentResolver(),
		ENABLE_BUBBLES, 1) != 0;
		}

		/**
		* Whether an intent is properly configured to display in an {@link android.app.ActivityView}.
		*