Merge "Allow hover tooltips for disabled views." (247791f9) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26890,7 +26890,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (mAttachInfo == null \|\| mTooltipInfo == null) {
		return false;
		}
		if ((mViewFlags & ENABLED_MASK) != ENABLED) {
		if (fromLongClick && (mViewFlags & ENABLED_MASK) != ENABLED) {
		return false;
		}
		if (TextUtils.isEmpty(mTooltipInfo.mTooltipText)) {
		@@ -26938,7 +26938,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		switch(event.getAction()) {
		case MotionEvent.ACTION_HOVER_MOVE:
		if ((mViewFlags & TOOLTIP) != TOOLTIP \|\| (mViewFlags & ENABLED_MASK) != ENABLED) {
		if ((mViewFlags & TOOLTIP) != TOOLTIP) {
		break;
		}
		if (!mTooltipInfo.mTooltipFromLongClick && mTooltipInfo.updateAnchorPos(event)) {