Merge "Rename: Drop 'Container' from BubbleExpandedViewContainer" (79282ebc) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/bubble_expanded_view.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<com.android.systemui.bubbles.BubbleExpandedViewContainer
		<com.android.systemui.bubbles.BubbleExpandedView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		@@ -93,4 +93,4 @@

		</FrameLayout>

		</com.android.systemui.bubbles.BubbleExpandedViewContainer>
		</com.android.systemui.bubbles.BubbleExpandedView>

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ import javax.inject.Singleton;
		* The controller manages addition, removal, and visible state of bubbles on screen.
		*/
		@Singleton
		public class BubbleController implements BubbleExpandedViewContainer.OnBubbleBlockedListener {
		public class BubbleController implements BubbleExpandedView.OnBubbleBlockedListener {
		private static final int MAX_BUBBLES = 5; // TODO: actually enforce this

		private static final String TAG = "BubbleController";

+5 −5

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		/**
		* Container for the expanded bubble view, handles rendering the caret and header of the view.
		*/
		public class BubbleExpandedViewContainer extends LinearLayout implements View.OnClickListener {
		public class BubbleExpandedView extends LinearLayout implements View.OnClickListener {
		private static final String TAG = "BubbleExpandedView";

		// The triangle pointing to the expanded view
		@@ -81,19 +81,19 @@ public class BubbleExpandedViewContainer extends LinearLayout implements View.On

		private OnBubbleBlockedListener mOnBubbleBlockedListener;

		public BubbleExpandedViewContainer(Context context) {
		public BubbleExpandedView(Context context) {
		this(context, null);
		}

		public BubbleExpandedViewContainer(Context context, AttributeSet attrs) {
		public BubbleExpandedView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		}

		public BubbleExpandedViewContainer(Context context, AttributeSet attrs, int defStyleAttr) {
		public BubbleExpandedView(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		}

		public BubbleExpandedViewContainer(Context context, AttributeSet attrs, int defStyleAttr,
		public BubbleExpandedView(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		mPm = context.getPackageManager();

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
		private StackAnimationController mStackAnimationController;
		private ExpandedAnimationController mExpandedAnimationController;

		private BubbleExpandedViewContainer mExpandedViewContainer;
		private BubbleExpandedView mExpandedViewContainer;

		private int mBubbleSize;
		private int mBubblePadding;
		@@ -173,7 +173,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
		mBubbleContainer.setClipChildren(false);
		addView(mBubbleContainer, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));

		mExpandedViewContainer = (BubbleExpandedViewContainer)
		mExpandedViewContainer = (BubbleExpandedView)
		LayoutInflater.from(context).inflate(R.layout.bubble_expanded_view,
		this /* parent /, false / attachToRoot */);
		mExpandedViewContainer.setElevation(elevation);
		@@ -226,7 +226,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
		/**
		* Sets the listener to notify when a bubble is blocked.
		*/
		public void setOnBlockedListener(BubbleExpandedViewContainer.OnBubbleBlockedListener listener) {
		public void setOnBlockedListener(BubbleExpandedView.OnBubbleBlockedListener listener) {
		mExpandedViewContainer.setOnBlockedListener(listener);
		}