commit 247791f9ceaed13e639587aa4d046078252e2c7a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 20 23:15:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 20 23:15:51 2017 +0000
tree a88087b5e7f14b6c448721d10081dc547b40996e
parent f3630cbe8ab567772e7722d7e8172a9da679dbf5
parent e530c108ef4ca49081d8433bda28a3ec71965844

Merge "Allow hover tooltips for disabled views."

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 02beee0..cc63a62 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -26890,7 +26890,7 @@
         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 @@
         }
         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)) {