Merge "Merge "Use pointer width from res before getWidth is ready" into qt-dev... (1d664f8c) · Commits · e / os / android_frameworks_base

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

+5 −13

Original line number	Diff line number	Diff line
		@@ -370,14 +370,6 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		return true;
		}

		/**
		* @return total height that the expanded view occupies.
		*/
		int getExpandedSize() {
		return mBubbleHeight + mPointerView.getHeight() + mPointerMargin
		+ mSettingsIconHeight;
		}

		void updateHeight() {
		if (usingActivityView()) {
		Notification.BubbleMetadata data = mEntry.getBubbleMetadata();
		@@ -399,8 +391,8 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		}
		desiredHeight = desiredPx > 0 ? desiredPx : mMinHeight;
		}
		int max = mStackView.getMaxExpandedHeight() - mSettingsIconHeight
		- mPointerView.getHeight() - mPointerMargin;
		int max = mStackView.getMaxExpandedHeight() - mSettingsIconHeight - mPointerHeight
		- mPointerMargin;
		float height = Math.min(desiredHeight, max);
		height = Math.max(height, mMinHeight);
		LayoutParams lp = (LayoutParams) mActivityView.getLayoutParams();
		@@ -465,9 +457,9 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		* Set the x position that the tip of the triangle should point to.
		*/
		public void setPointerPosition(float x) {
		// Adjust for the pointer size
		x -= (mPointerView.getWidth() / 2f);
		mPointerView.setTranslationX(x);
		float halfPointerWidth = mPointerWidth / 2f;
		float pointerLeft = x - halfPointerWidth;
		mPointerView.setTranslationX(pointerLeft);
		mPointerView.setVisibility(VISIBLE);
		}