From 3d82e68dfdf446a441f125ff76e21653582bb8da Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Tue, 5 Feb 2019 13:34:48 -0800 Subject: [PATCH] Rename: Drop 'Container' from BubbleExpandedViewContainer Test: atest BubbleControllerTest / it compiles Bug: 123543995 Change-Id: I4ff194966edffd7d314bd9aade1ebb2bb6d2f7d2 --- packages/SystemUI/res/layout/bubble_expanded_view.xml | 4 ++-- .../com/android/systemui/bubbles/BubbleController.java | 2 +- ...andedViewContainer.java => BubbleExpandedView.java} | 10 +++++----- .../com/android/systemui/bubbles/BubbleStackView.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename packages/SystemUI/src/com/android/systemui/bubbles/{BubbleExpandedViewContainer.java => BubbleExpandedView.java} (96%) diff --git a/packages/SystemUI/res/layout/bubble_expanded_view.xml b/packages/SystemUI/res/layout/bubble_expanded_view.xml index 403d92869fbfd..f664c0581d7e3 100644 --- a/packages/SystemUI/res/layout/bubble_expanded_view.xml +++ b/packages/SystemUI/res/layout/bubble_expanded_view.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - - + diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index f36dca7fbaded..bd8012c2f2a9b 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -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"; diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedViewContainer.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedViewContainer.java rename to packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java index f08ba1936b406..bf9d7ba611898 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedViewContainer.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java @@ -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(); diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index afa9f02c6ee22..305f86655fcd7 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -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); }