Integrate InsetsSourceProviderProto into ImeInsetsSourceProviderProto

Integrate the proto of the parent class InsetsSourceProvider into
the proto of the client class ImeInsetsSourceProvider.

Bug: 154348613
Test: make and flash to see compiled classes
Change-Id: Icc779bad7c41e890e179a1e32138b8638d02bcdc
This commit is contained in:
Ioana Stefan
2020-10-01 15:14:15 +02:00
parent 92e0fc776b
commit d1f1fc21af

View File

@@ -205,9 +205,8 @@ message DisplayContentProto {
optional WindowStateProto input_method_input_target = 28;
optional WindowStateProto input_method_control_target = 29;
optional WindowStateProto current_focus = 30;
optional InsetsSourceProviderProto insets_source_provider = 31;
optional ImeInsetsSourceProviderProto ime_insets_source_provider = 32;
optional bool can_show_ime = 33;
optional ImeInsetsSourceProviderProto ime_insets_source_provider = 31;
optional bool can_show_ime = 32;
}
/* represents DisplayArea object */
@@ -527,6 +526,7 @@ message InsetsSourceProviderProto {
message ImeInsetsSourceProviderProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC;
optional WindowStateProto ime_target_from_ime = 1;
optional bool is_ime_layout_drawn = 2;
optional InsetsSourceProviderProto insets_source_provider = 1;
optional WindowStateProto ime_target_from_ime = 2;
optional bool is_ime_layout_drawn = 3;
}