Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba7094cb authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

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

am: 139dbe5c

Change-Id: Idd4860d446987634a3ccf21989f032b72cd0aaef
parents d1ef2a76 139dbe5c

core/java/android/view/View.java

+0 −3
Original line number Diff line number Diff line
@@ -26312,9 +26312,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);

            }

        }

    }

























core/java/com/android/internal/view/TooltipPopup.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -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();