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

Merge "Integrate InsetsSourceProviderProto into ImeInsetsSourceProviderProto"

Browse Source
This commit is contained in:
Ioana Stefan
2020-10-05 11:54:33 +00:00
committed by Android (Google) Code Review
parent b596de1e99 d1f1fc21af
commit 18811b014b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/proto/android/server/windowmanagerservice.proto
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;
}