Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1c4a05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "IME tracing: use perfetto protos" into main

parents de44a0a2 bd634760
Loading
Loading
Loading
Loading
+31 −31
Original line number Diff line number Diff line
@@ -16,36 +16,36 @@

package android.inputmethodservice;

import static android.inputmethodservice.InputMethodServiceProto.CANDIDATES_VIEW_STARTED;
import static android.inputmethodservice.InputMethodServiceProto.CANDIDATES_VISIBILITY;
import static android.inputmethodservice.InputMethodServiceProto.CONFIGURATION;
import static android.inputmethodservice.InputMethodServiceProto.DECOR_VIEW_VISIBLE;
import static android.inputmethodservice.InputMethodServiceProto.DECOR_VIEW_WAS_VISIBLE;
import static android.inputmethodservice.InputMethodServiceProto.EXTRACTED_TOKEN;
import static android.inputmethodservice.InputMethodServiceProto.EXTRACT_VIEW_HIDDEN;
import static android.inputmethodservice.InputMethodServiceProto.FULLSCREEN_APPLIED;
import static android.inputmethodservice.InputMethodServiceProto.INPUT_BINDING;
import static android.inputmethodservice.InputMethodServiceProto.INPUT_CONNECTION_CALL;
import static android.inputmethodservice.InputMethodServiceProto.INPUT_EDITOR_INFO;
import static android.inputmethodservice.InputMethodServiceProto.INPUT_STARTED;
import static android.inputmethodservice.InputMethodServiceProto.INPUT_VIEW_STARTED;
import static android.inputmethodservice.InputMethodServiceProto.IN_SHOW_WINDOW;
import static android.inputmethodservice.InputMethodServiceProto.IS_FULLSCREEN;
import static android.inputmethodservice.InputMethodServiceProto.IS_INPUT_VIEW_SHOWN;
import static android.inputmethodservice.InputMethodServiceProto.InsetsProto.CONTENT_TOP_INSETS;
import static android.inputmethodservice.InputMethodServiceProto.InsetsProto.TOUCHABLE_INSETS;
import static android.inputmethodservice.InputMethodServiceProto.InsetsProto.TOUCHABLE_REGION;
import static android.inputmethodservice.InputMethodServiceProto.InsetsProto.VISIBLE_TOP_INSETS;
import static android.inputmethodservice.InputMethodServiceProto.LAST_COMPUTED_INSETS;
import static android.inputmethodservice.InputMethodServiceProto.LAST_SHOW_INPUT_REQUESTED;
import static android.inputmethodservice.InputMethodServiceProto.SETTINGS_OBSERVER;
import static android.inputmethodservice.InputMethodServiceProto.SHOW_INPUT_FLAGS;
import static android.inputmethodservice.InputMethodServiceProto.SHOW_INPUT_REQUESTED;
import static android.inputmethodservice.InputMethodServiceProto.SOFT_INPUT_WINDOW;
import static android.inputmethodservice.InputMethodServiceProto.STATUS_ICON;
import static android.inputmethodservice.InputMethodServiceProto.TOKEN;
import static android.inputmethodservice.InputMethodServiceProto.VIEWS_CREATED;
import static android.inputmethodservice.InputMethodServiceProto.WINDOW_VISIBLE;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.CANDIDATES_VIEW_STARTED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.CANDIDATES_VISIBILITY;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.CONFIGURATION;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.DECOR_VIEW_VISIBLE;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.DECOR_VIEW_WAS_VISIBLE;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.EXTRACTED_TOKEN;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.EXTRACT_VIEW_HIDDEN;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.FULLSCREEN_APPLIED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.INPUT_BINDING;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.INPUT_CONNECTION_CALL;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.INPUT_EDITOR_INFO;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.INPUT_STARTED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.INPUT_VIEW_STARTED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.IN_SHOW_WINDOW;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.IS_FULLSCREEN;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.IS_INPUT_VIEW_SHOWN;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.InsetsProto.CONTENT_TOP_INSETS;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.InsetsProto.TOUCHABLE_INSETS;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.InsetsProto.TOUCHABLE_REGION;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.InsetsProto.VISIBLE_TOP_INSETS;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.LAST_COMPUTED_INSETS;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.LAST_SHOW_INPUT_REQUESTED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.SETTINGS_OBSERVER;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.SHOW_INPUT_FLAGS;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.SHOW_INPUT_REQUESTED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.SOFT_INPUT_WINDOW;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.STATUS_ICON;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.TOKEN;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.VIEWS_CREATED;
import static android.internal.perfetto.protos.Inputmethodservice.InputMethodServiceProto.WINDOW_VISIBLE;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -86,6 +86,7 @@ import android.content.res.XmlResourceParser;
import android.database.ContentObserver;
import android.graphics.Rect;
import android.graphics.Region;
import android.internal.perfetto.protos.Inputmethodeditor.InputMethodServiceTraceProto;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -141,7 +142,6 @@ import android.view.inputmethod.InputBinding;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputContentInfo;
import android.view.inputmethod.InputMethod;
import android.view.inputmethod.InputMethodEditorTraceProto.InputMethodServiceTraceProto;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package android.inputmethodservice;

import static android.inputmethodservice.SoftInputWindowProto.WINDOW_STATE;
import static android.internal.perfetto.protos.Softinputwindow.SoftInputWindowProto.WINDOW_STATE;

import static java.lang.annotation.RetentionPolicy.SOURCE;

@@ -27,7 +27,6 @@ import android.os.IBinder;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;

+7 −7
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ package android.view;
import static android.content.res.Resources.ID_NULL;
import static android.util.DisplayMetrics.DENSITY_DEFAULT;
import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
import static android.view.DisplayCutoutProto.BOUND_BOTTOM;
import static android.view.DisplayCutoutProto.BOUND_LEFT;
import static android.view.DisplayCutoutProto.BOUND_RIGHT;
import static android.view.DisplayCutoutProto.BOUND_TOP;
import static android.view.DisplayCutoutProto.INSETS;
import static android.view.DisplayCutoutProto.SIDE_OVERRIDES;
import static android.view.DisplayCutoutProto.WATERFALL_INSETS;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_BOTTOM;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_LEFT;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_RIGHT;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_TOP;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.INSETS;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.SIDE_OVERRIDES;
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.WATERFALL_INSETS;
import static android.view.Surface.ROTATION_0;
import static android.view.Surface.ROTATION_270;

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package android.view;

import static android.view.ImeFocusControllerProto.HAS_IME_FOCUS;
import static android.internal.perfetto.protos.Imefocuscontroller.ImeFocusControllerProto.HAS_IME_FOCUS;

import android.annotation.AnyThread;
import android.annotation.NonNull;
+8 −8
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.view.EventLogTags.IMF_IME_ANIM_CANCEL;
import static android.view.EventLogTags.IMF_IME_ANIM_FINISH;
import static android.view.EventLogTags.IMF_IME_ANIM_START;
import static android.view.InsetsAnimationControlImplProto.CURRENT_ALPHA;
import static android.view.InsetsAnimationControlImplProto.IS_CANCELLED;
import static android.view.InsetsAnimationControlImplProto.IS_FINISHED;
import static android.view.InsetsAnimationControlImplProto.PENDING_ALPHA;
import static android.view.InsetsAnimationControlImplProto.PENDING_FRACTION;
import static android.view.InsetsAnimationControlImplProto.PENDING_INSETS;
import static android.view.InsetsAnimationControlImplProto.SHOWN_ON_FINISH;
import static android.view.InsetsAnimationControlImplProto.TMP_MATRIX;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.CURRENT_ALPHA;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.IS_CANCELLED;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.IS_FINISHED;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.PENDING_ALPHA;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.PENDING_FRACTION;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.PENDING_INSETS;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.SHOWN_ON_FINISH;
import static android.internal.perfetto.protos.Insetsanimationcontrolimpl.InsetsAnimationControlImplProto.TMP_MATRIX;
import static android.view.InsetsController.ANIMATION_TYPE_SHOW;
import static android.view.InsetsController.AnimationType;
import static android.view.InsetsController.DEBUG;
Loading