Remove fix_partial_image_edit_transition

Launched.

Bug: 339583191
Test: presubmits
Flag: EXEMPT removing com.android.intentresolver.fix_partial_image_edit_transition
Change-Id: I8e826f05690dcfdf4bed1cfcdf036218fe3b708e

4 files changed, 5 insertions, 26 deletions

diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig
index a95a9ea8..87ae2f1d 100644
--- a/aconfig/FeatureFlags.aconfig
+++ b/aconfig/FeatureFlags.aconfig
@@ -64,16 +64,6 @@ flag {
 }
 
 flag {
-  name: "fix_partial_image_edit_transition"
-  namespace: "intentresolver"
-  description: "Do not run the shared element transition animation for a partially visible image"
-  bug: "339583191"
-  metadata {
-    purpose: PURPOSE_BUGFIX
-  }
-}
-
-flag {
   name: "fix_private_space_locked_on_restart"
   namespace: "intentresolver"
   description: "Dismiss Share sheet on restart if private space became locked while stopped"
diff --git a/java/src/com/android/intentresolver/ChooserActionFactory.java b/java/src/com/android/intentresolver/ChooserActionFactory.java
index cc7091e4..21ca3b73 100644
--- a/java/src/com/android/intentresolver/ChooserActionFactory.java
+++ b/java/src/com/android/intentresolver/ChooserActionFactory.java
@@ -133,8 +133,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             ActionActivityStarter activityStarter,
             @Nullable ShareResultSender shareResultSender,
             Consumer</* @Nullable */ Integer> finishCallback,
-            ClipboardManager clipboardManager,
-            FeatureFlags featureFlags) {
+            ClipboardManager clipboardManager) {
         this(
                 context,
                 makeCopyButtonRunnable(
@@ -150,8 +149,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
                                 imageEditor),
                         firstVisibleImageQuery,
                         activityStarter,
-                        log,
-                        featureFlags.fixPartialImageEditTransition()),
+                        log),
                 chooserActions,
                 onUpdateSharedTextIsExcluded,
                 log,
@@ -340,8 +338,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             @Nullable TargetInfo editSharingTarget,
             Callable</* @Nullable */ View> firstVisibleImageQuery,
             ActionActivityStarter activityStarter,
-            EventLog log,
-            boolean requireFullVisibility) {
+            EventLog log) {
         if (editSharingTarget == null) return null;
         return () -> {
             // Log share completion via edit.
@@ -352,8 +349,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
                 firstImageView = firstVisibleImageQuery.call();
             } catch (Exception e) { /* ignore */ }
             // Action bar is user-independent; always start as primary.
-            if (firstImageView == null
-                    || (requireFullVisibility && !isFullyVisible(firstImageView))) {
+            if (firstImageView == null || !isFullyVisible(firstImageView)) {
                 activityStarter.safelyStartActivityAsPersonalProfileUser(editSharingTarget);
             } else {
                 activityStarter.safelyStartActivityAsPersonalProfileUserWithSharedElementTransition(
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index cdf1a8ad..7e0f148d 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -2193,8 +2193,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
                 },
                 mShareResultSender,
                 this::finishWithStatus,
-                mClipboardManager,
-                mFeatureFlags);
+                mClipboardManager);
     }
 
     private Supplier<ActionRow.Action> createModifyShareActionFactory() {
diff --git a/tests/unit/src/com/android/intentresolver/ChooserActionFactoryTest.kt b/tests/unit/src/com/android/intentresolver/ChooserActionFactoryTest.kt
index c8e17de4..8dfbdbdd 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserActionFactoryTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserActionFactoryTest.kt
@@ -69,8 +69,6 @@ class ChooserActionFactoryTest {
                 latestReturn = resultCode
             }
         }
-    private val featureFlags =
-        FakeFeatureFlagsImpl().apply { setFlag(Flags.FLAG_FIX_PARTIAL_IMAGE_EDIT_TRANSITION, true) }
 
     @Before
     fun setup() {
@@ -121,7 +119,6 @@ class ChooserActionFactoryTest {
                 /* shareResultSender = */ null,
                 /* finishCallback = */ {},
                 /* clipboardManager = */ mock(),
-                /* featureFlags = */ featureFlags,
             )
         assertThat(testSubject.copyButtonRunnable).isNull()
     }
@@ -143,7 +140,6 @@ class ChooserActionFactoryTest {
                 /* shareResultSender = */ null,
                 /* finishCallback = */ {},
                 /* clipboardManager = */ mock(),
-                /* featureFlags = */ featureFlags,
             )
         assertThat(testSubject.copyButtonRunnable).isNull()
     }
@@ -166,7 +162,6 @@ class ChooserActionFactoryTest {
                 /* shareResultSender = */ resultSender,
                 /* finishCallback = */ {},
                 /* clipboardManager = */ mock(),
-                /* featureFlags = */ featureFlags,
             )
         assertThat(testSubject.copyButtonRunnable).isNotNull()
 
@@ -199,7 +194,6 @@ class ChooserActionFactoryTest {
             /* shareResultSender = */ null,
             /* finishCallback = */ resultConsumer,
             /* clipboardManager = */ mock(),
-            /* featureFlags = */ featureFlags,
         )
     }
 }