fix: Conflict incoming changes from 15-dev

This commit is contained in:
Pun Butrach
2026-01-10 20:49:12 +07:00
parent 14e352c827
commit 2e76c99dad
1726 changed files with 146971 additions and 95028 deletions
@@ -62,6 +62,12 @@ public class StateManagerProtoLogProxy {
ProtoLog.d(LAUNCHER_STATE_MANAGER, "StateManager.onStateTransitionEnd: state: %s", state);
}
public static void logOnRepeatStateSetAborted(@NonNull Object state) {
if (!ENABLE_STATE_MANAGER_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return;
ProtoLog.d(LAUNCHER_STATE_MANAGER,
"StateManager.onRepeatStateSetAborted: state: %s", state);
}
public static void logCancelAnimation(boolean animationOngoing, @NonNull String trace) {
if (!ENABLE_STATE_MANAGER_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return;
ProtoLog.d(LAUNCHER_STATE_MANAGER,