Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not update currently open tooltip." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-19 21:01:42 +00:00
committed by Android (Google) Code Review
parent 5e3fb57af8 dd469d171d
commit 139dbe5c1c
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/View.java
View File

@@ -26312,9 +26312,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mTooltipInfo.mHideTooltipRunnable = this::hideTooltip; mTooltipInfo.mHideTooltipRunnable = this::hideTooltip;
} }
mTooltipInfo.mTooltipText = tooltipText; mTooltipInfo.mTooltipText = tooltipText;
if (mTooltipInfo.mTooltipPopup != null && mTooltipInfo.mTooltipPopup.isShowing()) {
mTooltipInfo.mTooltipPopup.updateContent(mTooltipInfo.mTooltipText);
}
} }
} }

4
core/java/com/android/internal/view/TooltipPopup.java
View File

@@ -91,10 +91,6 @@ public class TooltipPopup {
return mContentView.getParent() != null; return mContentView.getParent() != null;
} }
public void updateContent(CharSequence tooltipText) {
mMessageView.setText(tooltipText);
}
private void computePosition(View anchorView, int anchorX, int anchorY, boolean fromTouch, private void computePosition(View anchorView, int anchorX, int anchorY, boolean fromTouch,
WindowManager.LayoutParams outParams) { WindowManager.LayoutParams outParams) {
outParams.token = anchorView.getWindowToken(); outParams.token = anchorView.getWindowToken();