Rename: Drop 'Container' from BubbleExpandedViewContainer
Test: atest BubbleControllerTest / it compiles
Bug: 123543995
Change-Id: I4ff194966edffd7d314bd9aade1ebb2bb6d2f7d2
diff --git a/packages/SystemUI/res/layout/bubble_expanded_view.xml b/packages/SystemUI/res/layout/bubble_expanded_view.xml
index 403d928..f664c05 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
-->
-<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>
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index f36dca7..bd8012c 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 @@
* 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 f08ba19..bf9d7ba 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 @@
/**
* 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 @@
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 afa9f02..305f866 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 @@
private StackAnimationController mStackAnimationController;
private ExpandedAnimationController mExpandedAnimationController;
- private BubbleExpandedViewContainer mExpandedViewContainer;
+ private BubbleExpandedView mExpandedViewContainer;
private int mBubbleSize;
private int mBubblePadding;
@@ -173,7 +173,7 @@
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 @@
/**
* 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);
}