Merge "Only populate activity view when we're showing it" (c1923b1b) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -107,9 +107,11 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		private ActivityView.StateCallback mStateCallback = new ActivityView.StateCallback() {
		@Override
		public void onActivityViewReady(ActivityView view) {
		if (!mActivityViewReady) {
		mActivityViewReady = true;
		mActivityView.startActivity(mBubbleIntent);
		}
		}

		@Override
		public void onActivityViewDestroyed(ActivityView view) {
		@@ -262,6 +264,12 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		updateHeaderView();
		updatePermissionView();
		updateExpandedView();
		}

		/**
		* Lets activity view know it should be shown / populated.
		*/
		public void populateActivityView() {
		mActivityView.setCallback(mStateCallback);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -707,6 +707,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
		mExpandedViewContainer.removeAllViews();
		if (mExpandedBubble != null && mIsExpanded) {
		mExpandedViewContainer.addView(mExpandedBubble.expandedView);
		mExpandedBubble.expandedView.populateActivityView();
		mExpandedViewContainer.setVisibility(mIsExpanded ? VISIBLE : GONE);
		}
		}