From dd469d171d7503da3b8602c3ff0317b81792f2c0 Mon Sep 17 00:00:00 2001 From: Vladislav Kaznacheev Date: Fri, 16 Jun 2017 11:31:23 -0700 Subject: [PATCH] Do not update currently open tooltip. Currently if View.setTooltipText is called while the tooltip is being shown for that view, it will update the displayed text. The tooltip then will resize to wrap around the new text, but not change its position. This looks confusing if the new text is significantly shorter or longer. Removing this functionality until proper re-positioning is implemented. Bug: 38491655 Test: android.view.cts.TooltipTest passes Change-Id: I79689288185888854b992b89e19fe381d3ac50e4 --- core/java/android/view/View.java | 3 --- core/java/com/android/internal/view/TooltipPopup.java | 4 ---- 2 files changed, 7 deletions(-) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b093284ae9fff..6ebb355008282 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -26273,9 +26273,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mTooltipInfo.mHideTooltipRunnable = this::hideTooltip; } mTooltipInfo.mTooltipText = tooltipText; - if (mTooltipInfo.mTooltipPopup != null && mTooltipInfo.mTooltipPopup.isShowing()) { - mTooltipInfo.mTooltipPopup.updateContent(mTooltipInfo.mTooltipText); - } } } diff --git a/core/java/com/android/internal/view/TooltipPopup.java b/core/java/com/android/internal/view/TooltipPopup.java index 52357ac486c2e..3930214ea286c 100644 --- a/core/java/com/android/internal/view/TooltipPopup.java +++ b/core/java/com/android/internal/view/TooltipPopup.java @@ -91,10 +91,6 @@ public class TooltipPopup { return mContentView.getParent() != null; } - public void updateContent(CharSequence tooltipText) { - mMessageView.setText(tooltipText); - } - private void computePosition(View anchorView, int anchorX, int anchorY, boolean fromTouch, WindowManager.LayoutParams outParams) { outParams.token = anchorView.getWindowToken();