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

Commit 90e798ee authored by Haoyu Zhang's avatar Haoyu Zhang Committed by Automerger Merge Worker
Browse files

Merge "Do not update PointerIcon when stylus is not hovering" into udc-dev am: ce3bd36b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22342592



Change-Id: Ief50e32c3d0752bb5e498f059ea80e2eda7c2910
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e59693cf ce3bd36b

core/java/android/view/ViewRootImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -6946,6 +6946,7 @@ public final class ViewRootImpl implements ViewParent, 
                return;

            }

            final boolean needsStylusPointerIcon = event.isStylusPointer()

                    && event.isHoverEvent()

                    && mInputManager.isStylusPointerIconEnabled();

            if (needsStylusPointerIcon || event.isFromSource(InputDevice.SOURCE_MOUSE)) {

                if (event.getActionMasked() == MotionEvent.ACTION_HOVER_ENTER