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

Commit 39bb698c authored by John Reck's avatar John Reck
Browse files

Partial rollback of I9ebc92dc 

 Bug: 5239166
 Turns out nativeRecordButtons is necessary even if we are not
 using the native selection rings.

Change-Id: I8e7713928b77c0098640b51ce8e8815dad0c9545
parent 6c859576

core/java/android/webkit/WebView.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -4007,12 +4007,9 @@ public class WebView extends AbsoluteLayout 
        // state.

        // state.

        // If mNativeClass is 0, we should not reach here, so we do not

        // If mNativeClass is 0, we should not reach here, so we do not

        // need to check it again.

        // need to check it again.

        if (mDrawCursorRing && drawRings) {

            // Only update if we are actually going to use the result

        nativeRecordButtons(hasFocus() && hasWindowFocus(),

        nativeRecordButtons(hasFocus() && hasWindowFocus(),

                    mTouchMode == TOUCH_SHORTPRESS_START_MODE

                (mTouchMode == TOUCH_SHORTPRESS_START_MODE && !USE_WEBKIT_RINGS)

                || mTrackballDown || mGotCenterDown, false);

                || mTrackballDown || mGotCenterDown, false);

        }

        drawCoreAndCursorRing(canvas, mBackgroundColor,

        drawCoreAndCursorRing(canvas, mBackgroundColor,

                mDrawCursorRing && drawRings);

                mDrawCursorRing && drawRings);

    }

    }