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

Commit 2fef6def authored by Taran Singh's avatar Taran Singh Committed by Android (Google) Code Review
Browse files

Merge "Add log for showSoftInput called from Insets API" into sc-dev

parents 9a9fa815 11472f70

core/java/android/view/inputmethod/InputMethodManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,8 @@ public final class InputMethodManager { 
            if (servedView == null || servedView.getWindowToken() != windowToken) {

                return false;

            }

            showSoftInput(servedView, 0 /* flags */, null /* resultReceiver */);

            showSoftInput(servedView, 0 /* flags */, null /* resultReceiver */,

                    SoftInputShowHideReason.SHOW_SOFT_INPUT_BY_INSETS_API);

            return true;

        }

    }

core/java/com/android/internal/inputmethod/InputMethodDebug.java

+2 −0
Original line number Diff line number Diff line
@@ -234,6 +234,8 @@ public final class InputMethodDebug { 
                return "SHOW_TOGGLE_SOFT_INPUT";

            case SoftInputShowHideReason.HIDE_TOGGLE_SOFT_INPUT:

                return "HIDE_TOGGLE_SOFT_INPUT";

            case SoftInputShowHideReason.SHOW_SOFT_INPUT_BY_INSETS_API:

                return "SHOW_SOFT_INPUT_BY_INSETS_API";

            default:

                return "Unknown=" + reason;

        }

core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java

+8 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ import java.lang.annotation.Retention; 
        SoftInputShowHideReason.HIDE_REMOVE_CLIENT,

        SoftInputShowHideReason.SHOW_RESTORE_IME_VISIBILITY,

        SoftInputShowHideReason.SHOW_TOGGLE_SOFT_INPUT,

        SoftInputShowHideReason.HIDE_TOGGLE_SOFT_INPUT})

        SoftInputShowHideReason.HIDE_TOGGLE_SOFT_INPUT,

        SoftInputShowHideReason.SHOW_SOFT_INPUT_BY_INSETS_API})

public @interface SoftInputShowHideReason {

    /** Show soft input by {@link android.view.inputmethod.InputMethodManager#showSoftInput}. */

    int SHOW_SOFT_INPUT = 0;
@@ -188,4 +189,10 @@ public @interface SoftInputShowHideReason { 
     * {@link android.view.inputmethod.InputMethodManager#toggleSoftInput(int, int)};

     */

    int HIDE_TOGGLE_SOFT_INPUT = 24;



    /**

     * Show soft input by

     * {@link android.view.InsetsController#show(int)};

     */

    int SHOW_SOFT_INPUT_BY_INSETS_API = 25;

}