From d1f1fc21af95b94815e81914f5124ad3d70fb4f1 Mon Sep 17 00:00:00 2001 From: Ioana Stefan Date: Thu, 1 Oct 2020 15:14:15 +0200 Subject: [PATCH] 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 --- core/proto/android/server/windowmanagerservice.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index d4d8772f3f811..d315ff27ef9a1 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -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; } \ No newline at end of file