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

Commit 029f67f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add TODO about IMM#getInputMethodWindowVisibleHeight()"

parents 2a81fdb4 b985e6e2

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -2333,7 +2333,13 @@ public final class InputMethodManager { 
    }

    }





    /**

    /**

     * @return The current height of the input method window.

     * This is kept due to {@link android.annotation.UnsupportedAppUsage}.

     *

     * <p>TODO(Bug 113914148): Check if we can remove this.  We have accidentally exposed

     * WindowManagerInternal#getInputMethodWindowVisibleHeight to app developers and some of them

     * started relying on it.</p>

     *

     * @return Something that is not well-defined.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

core/java/com/android/internal/view/IInputMethodManager.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,8 @@ interface IInputMethodManager { 
    boolean switchToNextInputMethod(in IBinder token, boolean onlyCurrentIme);

    boolean switchToNextInputMethod(in IBinder token, boolean onlyCurrentIme);

    boolean shouldOfferSwitchingToNextInputMethod(in IBinder token);

    boolean shouldOfferSwitchingToNextInputMethod(in IBinder token);

    void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);

    void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);

    // This is kept due to @UnsupportedAppUsage.

    // TODO(Bug 113914148): Consider removing this.

    int getInputMethodWindowVisibleHeight();

    int getInputMethodWindowVisibleHeight();

    void clearLastInputMethodWindowForTransition(in IBinder token);

    void clearLastInputMethodWindowForTransition(in IBinder token);

services/core/java/com/android/server/InputMethodManagerService.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -3145,6 +3145,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        return;

        return;

    }

    }





    /**

     * This is kept due to {@link android.annotation.UnsupportedAppUsage} in

     * {@link InputMethodManager#getInputMethodWindowVisibleHeight()} and a dependency in

     * {@link InputMethodService#onCreate()}.

     *

     * <p>TODO(Bug 113914148): Check if we can remove this.</p>

     * @return {@link WindowManagerInternal#getInputMethodWindowVisibleHeight()}

     */

    @Override

    @Override

    public int getInputMethodWindowVisibleHeight() {

    public int getInputMethodWindowVisibleHeight() {

        return mWindowManagerInternal.getInputMethodWindowVisibleHeight();

        return mWindowManagerInternal.getInputMethodWindowVisibleHeight();