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

Commit 85a70efe authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "Dump InputMethodManager#{mServedView, mNextServedView} for ime tracing"

parents 12fe6a49 bb42ab03

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

+4 −0
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodCl 
import static android.view.inputmethod.InputMethodManagerProto.ACTIVE;

import static android.view.inputmethod.InputMethodManagerProto.CUR_ID;

import static android.view.inputmethod.InputMethodManagerProto.FULLSCREEN_MODE;

import static android.view.inputmethod.InputMethodManagerProto.NEXT_SERVED_VIEW;

import static android.view.inputmethod.InputMethodManagerProto.SERVED_CONNECTING;

import static android.view.inputmethod.InputMethodManagerProto.SERVED_VIEW;



import static com.android.internal.inputmethod.StartInputReason.BOUND_TO_IMMS;
@@ -3990,6 +3992,8 @@ public final class InputMethodManager { 
            proto.write(FULLSCREEN_MODE, mFullscreenMode);

            proto.write(ACTIVE, mActive);

            proto.write(SERVED_CONNECTING, mServedConnecting);

            proto.write(SERVED_VIEW, Objects.toString(mServedView));

            proto.write(NEXT_SERVED_VIEW, Objects.toString(mNextServedView));

            proto.end(token);

            if (mCurRootView != null) {

                mCurRootView.dumpDebug(proto, VIEW_ROOT_IMPL);

core/proto/android/view/imefocuscontroller.proto

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ option java_multiple_files = true; 
 */

message ImeFocusControllerProto {

    optional bool has_ime_focus = 1;

    optional string served_view = 2;

    optional string next_served_view = 3;

    optional string served_view = 2 [deprecated = true];

    optional string next_served_view = 3 [deprecated = true];

}
 
 No newline at end of file

core/proto/android/view/inputmethod/inputmethodmanager.proto

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ message InputMethodManagerProto { 
    optional int32 display_id = 3;

    optional bool active = 4;

    optional bool served_connecting = 5;

    optional string served_view = 6;

    optional string next_served_view = 7;

}
 
 No newline at end of file