From 875c53f91e3bdc0814f25208b9b291809b3b6bcc Mon Sep 17 00:00:00 2001
From: Andrey Yepin <ayepin@google.com>
Date: Wed, 10 Jul 2024 15:45:16 -0700
Subject: 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
---
 .../src/com/android/intentresolver/ChooserActionFactory.java | 12 ++++--------
 java/src/com/android/intentresolver/ChooserActivity.java     |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'java')

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() {
-- 
cgit v1.2.3-59-g8ed1b