Merge "Remove deprecated code from stack & expanded view" (fc411479) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -458,15 +458,6 @@ public class BubbleExpandedView extends LinearLayout {
		mPointerView.setBackground(mPointerDrawable);
		}

		/**
		* Hides the IME if it's showing. This is currently done by dispatching a back press to the AV.
		*/
		void hideImeIfVisible() {
		if (mKeyboardVisible) {
		performBackPressIfNeeded();
		}
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();

+4 −35

Original line number	Diff line number	Diff line
		@@ -1081,11 +1081,10 @@ public class BubbleStackView extends FrameLayout
		final Bubble bubble = mBubbleData.getSelectedBubble();
		if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) {
		final Intent intent = bubble.getSettingsIntent(mContext);
		collapseStack(() -> {
		mBubbleData.setExpanded(false);
		mContext.startActivityAsUser(intent, bubble.getUser());
		logBubbleEvent(bubble,
		SysUiStatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS);
		});
		}
		});

		@@ -1769,36 +1768,6 @@ public class BubbleStackView extends FrameLayout
		}
		}

		/**
		* Dismiss the stack of bubbles.
		*
		* @deprecated
		*/
		@Deprecated
		void stackDismissed(int reason) {
		if (DEBUG_BUBBLE_STACK_VIEW) {
		Log.d(TAG, "stackDismissed: reason=" + reason);
		}
		mBubbleData.dismissAll(reason);
		logBubbleEvent(null /* no bubble associated with bubble stack dismiss */,
		SysUiStatsLog.BUBBLE_UICHANGED__ACTION__STACK_DISMISSED);
		}

		/**
		* @deprecated use {@link #setExpanded(boolean)} and
		* {@link BubbleData#setSelectedBubble(Bubble)}
		*/
		@Deprecated
		@MainThread
		void collapseStack(Runnable endRunnable) {
		if (DEBUG_BUBBLE_STACK_VIEW) {
		Log.d(TAG, "collapseStack(endRunnable)");
		}
		mBubbleData.setExpanded(false);
		// TODO - use the runnable at end of animation
		endRunnable.run();
		}

		void showExpandedViewContents(int displayId) {
		if (mExpandedBubble != null
		&& mExpandedBubble.getExpandedView() != null