Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate SoftInputWindowProto.{name,window_type,gravity,takes_focus}

Browse Source 
This is a follow up CL to my previous CL [1], which made it clear that
the following 4 tracing fields in SoftInputWindowProto had always been
logged with the same values.

  - name:         "InputMethod"
  - window_type:  WindowManager.LayoutParams.TYPE_INPUT_METHOD
  - gravity:      Gravity.BOTTOM
  - takes_focus:  false

This CL simply deprecates those fields in favor of simplicity and
smaller code size.

There should be no behavior change unless IME tracing is enabled.

 [1]: I619ae6011f5e66dba126931719569a97513eaa7e
      ea7801bd26

Bug: 192412909
Test: IME tracing still works
Change-Id: I04b59307ecf2c692282c7882ac839f77c94b938f
This commit is contained in:
Yohei Yukawa
2022-01-03 16:49:24 -08:00
parent c2dc611aca
commit ef936ff07d
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/inputmethodservice/SoftInputWindow.java
View File

@@ -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);

8
core/proto/android/inputmethodservice/softinputwindow.proto
View File

@@ -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;
}