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

@@ -1,18 +1,10 @@
package com.android.wm.shell;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
/** @hide */
public final class FeatureFlagsImpl implements FeatureFlags {
@Override
public boolean bubbleViewInfoExecutors() {
return true;
}
@Override
public boolean enableAutoTaskStackController() {
return false;
}
@@ -27,6 +19,13 @@ public final class FeatureFlagsImpl implements FeatureFlags {
@Override
public boolean enableBubbleAppCompatFixes() {
return true;
}
@Override
public boolean enableBubbleBar() {
return false;
}
@@ -48,6 +47,13 @@ public final class FeatureFlagsImpl implements FeatureFlags {
@Override
public boolean enableBubbleSwipeUpCleanup() {
return true;
}
@Override
public boolean enableBubbleTaskViewListener() {
return false;
}
@@ -77,6 +83,13 @@ public final class FeatureFlagsImpl implements FeatureFlags {
public boolean enableDynamicInsetsForAppLaunch() {
return true;
}
@Override
public boolean enableEnterSplitRemoveBubble() {
return false;
}
@@ -132,6 +145,13 @@ public final class FeatureFlagsImpl implements FeatureFlags {
@Override
public boolean enablePipBoxShadows() {
return false;
}
@Override
public boolean enablePipUmoExperience() {
return false;
}
@@ -140,7 +160,7 @@ public final class FeatureFlagsImpl implements FeatureFlags {
public boolean enableRecentsBookendTransition() {
return false;
return true;
}
@Override
@@ -160,13 +180,6 @@ public final class FeatureFlagsImpl implements FeatureFlags {
@Override
public boolean enableTaskViewControllerCleanup() {
return true;
}
@Override
public boolean enableTaskbarNavbarUnification() {
return true;
}
@@ -189,7 +202,7 @@ public final class FeatureFlagsImpl implements FeatureFlags {
public boolean fixMissingUserChangeCallbacks() {
return false;
return true;
}
@Override
@@ -203,6 +216,13 @@ public final class FeatureFlagsImpl implements FeatureFlags {
public boolean taskViewRepository() {
return true;
}
@Override
public boolean taskViewTransitionsRefactor() {
return false;
}