Merge "Adds an overflow bubble to the bubble bar." into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
936722a71f
@@ -101,7 +101,7 @@ public class BubbleBarViewController {
|
||||
}
|
||||
|
||||
private void onBubbleClicked(View v) {
|
||||
BubbleBarBubble bubble = ((BubbleView) v).getBubble();
|
||||
BubbleBarItem bubble = ((BubbleView) v).getBubble();
|
||||
if (bubble == null) {
|
||||
Log.e(TAG, "bubble click listener, bubble was null");
|
||||
}
|
||||
@@ -236,7 +236,7 @@ public class BubbleBarViewController {
|
||||
/**
|
||||
* Removes the provided bubble from the bubble bar.
|
||||
*/
|
||||
public void removeBubble(BubbleBarBubble b) {
|
||||
public void removeBubble(BubbleBarItem b) {
|
||||
if (b != null) {
|
||||
mBarView.removeView(b.getView());
|
||||
} else {
|
||||
@@ -247,7 +247,7 @@ public class BubbleBarViewController {
|
||||
/**
|
||||
* Adds the provided bubble to the bubble bar.
|
||||
*/
|
||||
public void addBubble(BubbleBarBubble b) {
|
||||
public void addBubble(BubbleBarItem b) {
|
||||
if (b != null) {
|
||||
mBarView.addView(b.getView(), 0, new FrameLayout.LayoutParams(mIconSize, mIconSize));
|
||||
b.getView().setOnClickListener(mBubbleClickListener);
|
||||
@@ -268,7 +268,7 @@ public class BubbleBarViewController {
|
||||
/**
|
||||
* Updates the selected bubble.
|
||||
*/
|
||||
public void updateSelectedBubble(BubbleBarBubble newlySelected) {
|
||||
public void updateSelectedBubble(BubbleBarItem newlySelected) {
|
||||
mBarView.setSelectedBubble(newlySelected.getView());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user