Merge "Tap highlight fix + small perf increase"

        // state.

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

        // need to check it again.

        if (mDrawCursorRing && drawRings) {

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

            nativeRecordButtons(hasFocus() && hasWindowFocus(),

                    mTouchMode == TOUCH_SHORTPRESS_START_MODE

                    || mTrackballDown || mGotCenterDown, false);

        }

        drawCoreAndCursorRing(canvas, mBackgroundColor,

                mDrawCursorRing && drawRings);

    }

        boolean drawJavaRings = !mTouchHighlightRegion.isEmpty()

                && (mTouchMode == TOUCH_INIT_MODE

                || mTouchMode == TOUCH_SHORTPRESS_START_MODE

                || mTouchMode == TOUCH_SHORTPRESS_MODE);

                || mTouchMode == TOUCH_SHORTPRESS_MODE

                || mTouchMode == TOUCH_DONE_MODE);

        boolean drawNativeRings = !drawJavaRings;

        if (USE_WEBKIT_RINGS) {

            drawNativeRings = !drawJavaRings && !isInTouchMode();