Merge "Remove overflow experiment flags" into rvc-dev (c25e26ae) · Commits · e / os / android_frameworks_base

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -70,9 +70,6 @@ public class BubbleExperimentConfig {

		private static final String WHITELISTED_AUTO_BUBBLE_APPS = "whitelisted_auto_bubble_apps";

		private static final String ALLOW_BUBBLE_OVERFLOW = "allow_bubble_overflow";
		private static final boolean ALLOW_BUBBLE_OVERFLOW_DEFAULT = true;

		/**
		* When true, if a notification has the information necessary to bubble (i.e. valid
		* contentIntent and an icon or image), then a {@link android.app.Notification.BubbleMetadata}
		@@ -86,15 +83,6 @@ public class BubbleExperimentConfig {
		ALLOW_ANY_NOTIF_TO_BUBBLE_DEFAULT ? 1 : 0) != 0;
		}

		/**
		* When true, show a menu with dismissed and aged-out bubbles.
		*/
		static boolean allowBubbleOverflow(Context context) {
		return Settings.Secure.getInt(context.getContentResolver(),
		ALLOW_BUBBLE_OVERFLOW,
		ALLOW_BUBBLE_OVERFLOW_DEFAULT ? 1 : 0) != 0;
		}

		/**
		* Same as {@link #allowAnyNotifToBubble(Context)} except it filters for notifications that
		* are using {@link Notification.MessagingStyle} and have remote input.

+3 −10

Original line number	Diff line number	Diff line
		@@ -1152,9 +1152,6 @@ public class BubbleStackView extends FrameLayout
		}

		private void setUpOverflow() {
		if (!BubbleExperimentConfig.allowBubbleOverflow(mContext)) {
		return;
		}
		int overflowBtnIndex = 0;
		if (mBubbleOverflow == null) {
		mBubbleOverflow = new BubbleOverflow(getContext());
		@@ -1520,8 +1517,7 @@ public class BubbleStackView extends FrameLayout
		}

		private void updateOverflowVisibility() {
		if (!BubbleExperimentConfig.allowBubbleOverflow(mContext)
		\|\| mBubbleOverflow == null) {
		if (mBubbleOverflow == null) {
		return;
		}
		mBubbleOverflow.setVisible(mIsExpanded ? VISIBLE : GONE);
		@@ -2778,12 +2774,9 @@ public class BubbleStackView extends FrameLayout
		* @return the number of bubbles in the stack view.
		*/
		public int getBubbleCount() {
		if (BubbleExperimentConfig.allowBubbleOverflow(mContext)) {
		// Subtract 1 for the overflow button that is always in the bubble container.
		return mBubbleContainer.getChildCount() - 1;
		}
		return mBubbleContainer.getChildCount();
		}

		/**
		* Finds the bubble index within the stack.