Merge "Fix the remove button icon not centered when the home screen is in... (8935b22c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/ButtonDropTarget.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -108,8 +108,8 @@ public abstract class ButtonDropTarget extends TextView
		// We do not set the drawable in the xml as that inflates two drawables corresponding to
		// drawableLeft and drawableStart.
		mDrawable = getContext().getDrawable(resId).mutate();
		mDrawable.setBounds(0, 0, mDrawableSize, mDrawableSize);
		mDrawable.setTintList(getTextColors());
		centerIcon();
		setCompoundDrawablesRelative(mDrawable, null, null, null);
		}

		@@ -289,6 +289,12 @@ public abstract class ButtonDropTarget extends TextView
		return to;
		}

		private void centerIcon() {
		int x = mTextVisible ? 0
		: (getWidth() - getPaddingLeft() - getPaddingRight()) / 2 - mDrawableSize / 2;
		mDrawable.setBounds(x, 0, x + mDrawableSize, mDrawableSize);
		}

		@Override
		public void onClick(View v) {
		mLauncher.getAccessibilityDelegate().handleAccessibleDrop(this, null, null);
		@@ -299,12 +305,19 @@ public abstract class ButtonDropTarget extends TextView
		if (mTextVisible != isVisible \|\| !TextUtils.equals(newText, getText())) {
		mTextVisible = isVisible;
		setText(newText);
		centerIcon();
		setCompoundDrawablesRelative(mDrawable, null, null, null);
		int drawablePadding = mTextVisible ? mDrawablePadding : 0;
		setCompoundDrawablePadding(drawablePadding);
		}
		}

		@Override
		protected void onSizeChanged(int w, int h, int oldw, int oldh) {
		super.onSizeChanged(w, h, oldw, oldh);
		centerIcon();
		}

		public void setToolTipLocation(int location) {
		mToolTipLocation = location;
		hideTooltip();