fix: Conflict incoming changes from 15-dev

This commit is contained in:
Pun Butrach committed 2026-01-10 20:49:12 +07:00
1 parent 14e352c827
commit 2e76c99dad
1726 files changed
+146970 -95027

No files matched your search

@@ -19,7 +19,7 @@ package com.android.quickstep.util;
import static com.android.quickstep.util.QuickstepProtoLogGroup.RECENTS_WINDOW;
import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized;
import android.window.DesktopModeFlags;
import android.window.DesktopExperienceFlags;
import androidx.annotation.NonNull;
@@ -37,8 +37,13 @@ import com.android.launcher3.Flags;
* method. Or, if an existing entry needs to be modified, simply update it here.
*/
public class RecentsWindowProtoLogProxy {
private static final DesktopModeFlags.DesktopModeFlag ENABLE_RECENTS_WINDOW_PROTO_LOG =
new DesktopModeFlags.DesktopModeFlag(Flags::enableRecentsWindowProtoLog, true);
private static final DesktopExperienceFlags.DesktopExperienceFlag
ENABLE_RECENTS_WINDOW_PROTO_LOG =
new DesktopExperienceFlags.DesktopExperienceFlag(
Flags::enableRecentsWindowProtoLog,
false,
Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG);
public static void logOnStateSetStart(@NonNull String stateName) {
if (!ENABLE_RECENTS_WINDOW_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return;
ProtoLog.d(RECENTS_WINDOW, "onStateSetStart: %s", stateName);
@@ -49,6 +54,11 @@ public class RecentsWindowProtoLogProxy {
ProtoLog.d(RECENTS_WINDOW, "onStateSetEnd: %s", stateName);
}
public static void logOnRepeatStateSetAborted(@NonNull String stateName) {
if (!ENABLE_RECENTS_WINDOW_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return;
ProtoLog.d(RECENTS_WINDOW, "onRepeatStateSetAborted: %s", stateName);
}
public static void logStartRecentsWindow(boolean isShown, boolean windowViewIsNull) {
if (!ENABLE_RECENTS_WINDOW_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return;
ProtoLog.d(RECENTS_WINDOW,