diff --git a/core/java/android/inputmethodservice/SoftInputWindow.java b/core/java/android/inputmethodservice/SoftInputWindow.java index 66288d6d3efe9..6c8eb41d8724f 100644 --- a/core/java/android/inputmethodservice/SoftInputWindow.java +++ b/core/java/android/inputmethodservice/SoftInputWindow.java @@ -17,11 +17,7 @@ package android.inputmethodservice; import static android.inputmethodservice.SoftInputWindowProto.BOUNDS; -import static android.inputmethodservice.SoftInputWindowProto.GRAVITY; -import static android.inputmethodservice.SoftInputWindowProto.NAME; -import static android.inputmethodservice.SoftInputWindowProto.TAKES_FOCUS; import static android.inputmethodservice.SoftInputWindowProto.WINDOW_STATE; -import static android.inputmethodservice.SoftInputWindowProto.WINDOW_TYPE; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -33,7 +29,6 @@ import android.os.Debug; import android.os.IBinder; import android.util.Log; import android.util.proto.ProtoOutputStream; -import android.view.Gravity; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -268,11 +263,6 @@ final class SoftInputWindow extends Dialog { void dumpDebug(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); - // TODO(b/192412909): Deprecate the following 4 entries, as they are all constant. - proto.write(NAME, "InputMethod"); - proto.write(WINDOW_TYPE, WindowManager.LayoutParams.TYPE_INPUT_METHOD); - proto.write(GRAVITY, Gravity.BOTTOM); - proto.write(TAKES_FOCUS, false); mBounds.dumpDebug(proto, BOUNDS); proto.write(WINDOW_STATE, mWindowState); proto.end(token); diff --git a/core/proto/android/inputmethodservice/softinputwindow.proto b/core/proto/android/inputmethodservice/softinputwindow.proto index 85b7d73828055..e0ba6bf33567e 100644 --- a/core/proto/android/inputmethodservice/softinputwindow.proto +++ b/core/proto/android/inputmethodservice/softinputwindow.proto @@ -23,10 +23,10 @@ package android.inputmethodservice; option java_multiple_files = true; message SoftInputWindowProto { - optional string name = 1; - optional int32 window_type = 2; - optional int32 gravity = 3; - optional bool takes_focus = 4; + reserved 1; // name + reserved 2; // window_type + reserved 3; // gravity + reserved 4; // takes_focus optional .android.graphics.RectProto bounds = 5; optional int32 window_state = 6; } \ No newline at end of file