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

Commit 81c2dfe9 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK 

We can now start relying on L APIs even in unbundled release.

This means ENABLE_CURSOR_ANCHOR_INFO_CALLBACK can be always true.
Hence we simply remove it.

Change-Id: I0353e992e97e252059f83accea100504594bf171
parent 8b24e7ab

java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java

+0 −8
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ public final class ProductionFlags { 


    public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = false;



    /**

     * When true, enable {@link InputMethodService#onUpdateCursorAnchorInfo} callback via

     * {@link InputConnection#requestUpdateCursorAnchorInfo}. This flag has no effect in API

     * Level 20 and prior. In general, this callback provides detailed positional information,

     * even though an explicit support is required by the editor.

     */

    public static final boolean ENABLE_CURSOR_ANCHOR_INFO_CALLBACK = true;



    /**

     * Include all suggestions from all dictionaries in {@link SuggestedWords#mRawSuggestions}.

     */

java/src/com/android/inputmethod/latin/LatinIME.java

+4 −5
Original line number Diff line number Diff line
@@ -755,12 +755,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        if (prevExtractEditText == nextExtractEditText) {

            return;

        }

        if (ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK && prevExtractEditText != null) {

        if (prevExtractEditText != null) {

            prevExtractEditText.getViewTreeObserver().removeOnPreDrawListener(

                    mExtractTextViewPreDrawListener);

        }

        mExtractEditText = nextExtractEditText;

        if (ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK && mExtractEditText != null) {

        if (mExtractEditText != null) {

            mExtractEditText.getViewTreeObserver().addOnPreDrawListener(

                    mExtractTextViewPreDrawListener);

        }
@@ -776,8 +776,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            };



    private void onExtractTextViewPreDraw() {

        if (!ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK || !isFullscreenMode()

                || mExtractEditText == null) {

        if (!isFullscreenMode() || mExtractEditText == null) {

            return;

        }

        final CursorAnchorInfo info = CursorAnchorInfoUtils.getCursorAnchorInfo(mExtractEditText);
@@ -1060,7 +1059,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    // We cannot mark this method as @Override until new SDK becomes publicly available.

    // @Override

    public void onUpdateCursorAnchorInfo(final CursorAnchorInfo info) {

        if (!ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK || isFullscreenMode()) {

        if (isFullscreenMode()) {

            return;

        }

        mInputLogic.onUpdateCursorAnchorInfo(CursorAnchorInfoCompatWrapper.fromObject(info));

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

+4 −7
Original line number Diff line number Diff line
@@ -169,15 +169,12 @@ public final class InputLogic { 
            mInputLogicHandler.reset();

        }



        if (ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK) {

            // AcceptTypedWord feature relies on CursorAnchorInfo.

        if (settingsValues.mShouldShowUiToAcceptTypedWord) {

            mConnection.requestCursorUpdates(true /* enableMonitor */,

                    true /* requestImmediateCallback */);

        }

        mTextDecorator.reset();

    }

    }



    /**

     * Call this when the subtype changes.