fix: Conflict incoming changes from 15-dev

flags/src/com/android/wm/shell/FeatureFlags.java

@@ -1,5 +1,4 @@
 package com.android.wm.shell;
-// TODO(b/303773055): Remove the annotation after access issue is resolved.
 
 /** @hide */
 public interface FeatureFlags {
@@ -7,10 +6,6 @@ public interface FeatureFlags {
 
 
 
-    boolean bubbleViewInfoExecutors();
-
-
-
     boolean enableAutoTaskStackController();
 
 
@@ -19,6 +14,10 @@ public interface FeatureFlags {
 
 
 
+    boolean enableBubbleAppCompatFixes();
+
+
+
     boolean enableBubbleBar();
 
 
@@ -31,6 +30,10 @@ public interface FeatureFlags {
 
 
 
+    boolean enableBubbleSwipeUpCleanup();
+
+
+
     boolean enableBubbleTaskViewListener();
 
 
@@ -51,6 +54,10 @@ public interface FeatureFlags {
 
 
 
+    boolean enableEnterSplitRemoveBubble();
+
+
+
     boolean enableFlexibleSplit();
 
 
@@ -79,6 +86,10 @@ public interface FeatureFlags {
 
 
 
+    boolean enablePipBoxShadows();
+
+
+
     boolean enablePipUmoExperience();
 
 
@@ -95,10 +106,6 @@ public interface FeatureFlags {
 
 
 
-    boolean enableTaskViewControllerCleanup();
-
-
-
     boolean enableTaskbarNavbarUnification();
 
 
@@ -120,4 +127,8 @@ public interface FeatureFlags {
 
 
     boolean taskViewRepository();
+
+
+
+    boolean taskViewTransitionsRefactor();
 }