[many] More v1 embedding deletion that was missed in https://github.com/flutter/packages/pull/6494

packages/espresso/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0+10
+
+* Removes additional references to v1 Android embedding.
+
 ## 0.3.0+9
 
 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/action/FlutterViewAction.java

@@ -38,6 +38,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import javax.annotation.Nonnull;
 import okhttp3.OkHttpClient;
 import org.hamcrest.Matcher;
 
@@ -97,14 +98,19 @@ public String getDescription() {
 
   @ExperimentalTestApi
   @Override
-  public void perform(UiController uiController, View flutterView) {
+  public void perform(UiController uiController, View view) {
+    checkNotNull(view, "The Flutter View instance cannot be null.");
+    if (!(view instanceof FlutterView)) {
+      throw new FlutterProtocolException(
+          String.format("This is not a Flutter View instance [id: %d].", view.getId()));
+    }
+    FlutterView flutterView = (FlutterView) view;
     // There could be a gap between when the Flutter view is available in the view hierarchy and the
     // engine & Dart isolates are actually up and running. Check whether the first frame has been
     // rendered before proceeding in an unblocking way.
     loopUntilFlutterViewRendered(flutterView, uiController);
     // The url {@code FlutterNativeView} returns is the http url that the Dart VM Observatory http
     // server serves at. Need to convert to the one that the WebSocket uses.
-
     URI dartVmServiceProtocolUrl =
         DartVmServiceUtil.getServiceProtocolUri(FlutterJNI.getVMServiceUri());
     String isolateId = DartVmServiceUtil.getDartIsolateId(flutterView);
@@ -171,7 +177,8 @@ public T waitUntilCompleted(long timeout, TimeUnit unit)
     return resultFuture.get(timeout, unit);
   }
 
-  private static void loopUntilFlutterViewRendered(View flutterView, UiController uiController) {
+  private static void loopUntilFlutterViewRendered(
+      @Nonnull FlutterView flutterView, UiController uiController) {
     FlutterViewRenderedIdlingResource idlingResource =
         new FlutterViewRenderedIdlingResource(flutterView);
     try {
@@ -188,31 +195,22 @@ private static void loopUntilFlutterViewRendered(View flutterView, UiController
    */
   static final class FlutterViewRenderedIdlingResource implements IdlingResource {
 
-    private final View flutterView;
+    private final FlutterView flutterView;
     // Written from main thread, read from any thread.
     private volatile ResourceCallback resourceCallback;
 
-    FlutterViewRenderedIdlingResource(View flutterView) {
-      this.flutterView = checkNotNull(flutterView);
+    FlutterViewRenderedIdlingResource(@Nonnull FlutterView flutterView) {
+      this.flutterView = flutterView;
     }
 
     @Override
     public String getName() {
       return FlutterViewRenderedIdlingResource.class.getSimpleName();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public boolean isIdleNow() {
-      boolean isIdle = false;
-      if (flutterView instanceof FlutterView) {
-        isIdle = ((FlutterView) flutterView).hasRenderedFirstFrame();
-      } else if (flutterView instanceof io.flutter.view.FlutterView) {
-        isIdle = ((io.flutter.view.FlutterView) flutterView).hasRenderedFirstFrame();
-      } else {
-        throw new FlutterProtocolException(
-            String.format("This is not a Flutter View instance [id: %d].", flutterView.getId()));
-      }
+      boolean isIdle = flutterView.hasRenderedFirstFrame();
       if (isIdle) {
         resourceCallback.onTransitionToIdle();
       }

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/api/SyntheticAction.java

@@ -20,7 +20,7 @@
  * action that's performed via Flutter engine. It's supposed to be used for complex interactions or
  * those that are brittle if performed through Android system. Most of the actions should be
  * associated with a {@link WidgetMatcher}, but some may not, e.g. an action that checks the
- * rendering status of the entire {@link io.flutter.view.FlutterView}.
+ * rendering status of the entire {@link io.flutter.embedding.android.FlutterView}.
  */
 @Beta
 public abstract class SyntheticAction {

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/internal/protocol/impl/DartVmServiceUtil.java

@@ -4,17 +4,17 @@
 
 package androidx.test.espresso.flutter.internal.protocol.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
 
 import android.util.Log;
-import android.view.View;
+import io.flutter.embedding.android.FlutterView;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import javax.annotation.Nonnull;
 
 /** Util class for dealing with Dart VM service protocols. */
 public final class DartVmServiceUtil {
@@ -59,8 +59,7 @@ public static URI getServiceProtocolUri(String observatoryUrl) {
   }
 
   /** Gets the Dart isolate ID for the given {@code flutterView}. */
-  public static String getDartIsolateId(View flutterView) {
-    checkNotNull(flutterView, "The Flutter View instance cannot be null.");
+  public static String getDartIsolateId(FlutterView flutterView) {
     String uiIsolateId = getDartExecutor(flutterView).getIsolateServiceId();
     Log.d(
         TAG,
@@ -71,25 +70,15 @@ public static String getDartIsolateId(View flutterView) {
   }
 
   /** Gets the Dart executor for the given {@code flutterView}. */
-  @SuppressWarnings("deprecation")
-  public static DartExecutor getDartExecutor(View flutterView) {
-    checkNotNull(flutterView, "The Flutter View instance cannot be null.");
-    // Flutter's embedding is in the phase of rewriting/refactoring. Let's be compatible with both
-    // the old and the new FlutterView classes.
-    if (flutterView instanceof io.flutter.view.FlutterView) {
-      return ((io.flutter.view.FlutterView) flutterView).getDartExecutor();
-    } else if (flutterView instanceof io.flutter.embedding.android.FlutterView) {
-      FlutterEngine flutterEngine =
-          ((io.flutter.embedding.android.FlutterView) flutterView).getAttachedFlutterEngine();
-      if (flutterEngine == null) {
-        throw new FlutterProtocolException(
-            String.format(
-                "No Flutter engine attached to the Flutter view [id: %d].", flutterView.getId()));
-      }
-      return flutterEngine.getDartExecutor();
-    } else {
+  public static DartExecutor getDartExecutor(@Nonnull FlutterView flutterView) {
+    // TODO(gmackall): getAttachedFlutterEngine() is marked as @visibleForTesting - determine if
+    // this method should change its behavior, or if that annotation should be removed.
+    FlutterEngine flutterEngine = flutterView.getAttachedFlutterEngine();
+    if (flutterEngine == null) {
       throw new FlutterProtocolException(
-          String.format("This is not a Flutter View instance [id: %d].", flutterView.getId()));
+          String.format(
+              "No Flutter engine attached to the Flutter view [id: %d].", flutterView.getId()));
     }
+    return flutterEngine.getDartExecutor();
   }
 }

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/matcher/FlutterMatchers.java

@@ -99,8 +99,7 @@ public void describeTo(Description description) {
     @SuppressWarnings("deprecation")
     @Override
     public boolean matchesSafely(View flutterView) {
-      return flutterView instanceof FlutterView
-          || (flutterView instanceof io.flutter.view.FlutterView);
+      return flutterView instanceof FlutterView;
     }
   }
 }

packages/espresso/pubspec.yaml

@@ -3,7 +3,7 @@ description: Java classes for testing Flutter apps using Espresso.
   Allows driving Flutter widgets from a native Espresso test.
 repository: https://github.com/flutter/packages/tree/main/packages/espresso
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
-version: 0.3.0+9
+version: 0.3.0+10
 
 environment:
   sdk: ^3.4.0

packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml

@@ -16,9 +16,6 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

packages/google_maps_flutter/google_maps_flutter_android/example/android/app/src/main/AndroidManifest.xml

@@ -17,9 +17,6 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

packages/google_sign_in/google_sign_in_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.1.26
+
+* Removes additional references to the v1 Android embedding.
+
 ## 6.1.25
 
 * Updates Guava to version 33.2.1.

packages/google_sign_in/google_sign_in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java

@@ -59,12 +59,6 @@ public void initInstance(
     GoogleSignInApi.setup(messenger, delegate);
   }
 
-  @VisibleForTesting
-  @SuppressWarnings("deprecation")
-  public void setUpRegistrar(@NonNull PluginRegistry.Registrar registrar) {
-    delegate.setUpRegistrar(registrar);
-  }
-
   private void dispose() {
     delegate = null;
     if (messenger != null) {
@@ -346,9 +340,6 @@ public static class Delegate
     private static final String DEFAULT_GAMES_SIGN_IN = "SignInOption.games";
 
     private final @NonNull Context context;
-    // Only set registrar for v1 embedder.
-    @SuppressWarnings("deprecation")
-    private PluginRegistry.Registrar registrar;
     // Only set activity for v2 embedder. Always access activity from getActivity() method.
     private @Nullable Activity activity;
     // TODO(stuartmorgan): See whether this can be replaced with background channels.
@@ -364,19 +355,13 @@ public Delegate(@NonNull Context context, @NonNull GoogleSignInWrapper googleSig
       this.googleSignInWrapper = googleSignInWrapper;
     }
 
-    @SuppressWarnings("deprecation")
-    public void setUpRegistrar(@NonNull PluginRegistry.Registrar registrar) {
-      this.registrar = registrar;
-      registrar.addActivityResultListener(this);
-    }
-
     public void setActivity(@Nullable Activity activity) {
       this.activity = activity;
     }
 
     // Only access activity with this method.
     public @Nullable Activity getActivity() {
-      return registrar != null ? registrar.activity() : activity;
+      return activity;
     }
 
     private void checkAndSetPendingOperation(

packages/google_sign_in/google_sign_in_android/android/src/test/java/io/flutter/plugins/googlesignin/GoogleSignInLegacyMethodChannelTest.java

@@ -22,6 +22,7 @@
 import com.google.android.gms.common.api.Scope;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.tasks.Task;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -48,24 +49,19 @@ public class GoogleSignInLegacyMethodChannelTest {
   @Mock GoogleSignInAccount account;
   @Mock GoogleSignInClient mockClient;
   @Mock Task<GoogleSignInAccount> mockSignInTask;
-
-  @SuppressWarnings("deprecation")
-  @Mock
-  PluginRegistry.Registrar mockRegistrar;
+  @Mock ActivityPluginBinding mockActivityPluginBinding;
 
   private GoogleSignInPlugin plugin;
   private AutoCloseable mockCloseable;
 
   @Before
   public void setUp() {
     mockCloseable = MockitoAnnotations.openMocks(this);
-    when(mockRegistrar.messenger()).thenReturn(mockMessenger);
-    when(mockRegistrar.context()).thenReturn(mockContext);
-    when(mockRegistrar.activity()).thenReturn(mockActivity);
     when(mockContext.getResources()).thenReturn(mockResources);
+    when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
     plugin = new GoogleSignInPlugin();
-    plugin.initInstance(mockRegistrar.messenger(), mockRegistrar.context(), mockGoogleSignIn);
-    plugin.setUpRegistrar(mockRegistrar);
+    plugin.initInstance(mockMessenger, mockContext, mockGoogleSignIn);
+    plugin.onAttachedToActivity(mockActivityPluginBinding);
   }
 
   @After
@@ -124,7 +120,7 @@ public void requestScopes_ReturnsFalseIfPermissionDenied() {
 
     ArgumentCaptor<PluginRegistry.ActivityResultListener> captor =
         ArgumentCaptor.forClass(PluginRegistry.ActivityResultListener.class);
-    verify(mockRegistrar).addActivityResultListener(captor.capture());
+    verify(mockActivityPluginBinding).addActivityResultListener(captor.capture());
     PluginRegistry.ActivityResultListener listener = captor.getValue();
 
     when(mockGoogleSignIn.getLastSignedInAccount(mockContext)).thenReturn(account);
@@ -149,7 +145,7 @@ public void requestScopes_ReturnsTrueIfPermissionGranted() {
 
     ArgumentCaptor<PluginRegistry.ActivityResultListener> captor =
         ArgumentCaptor.forClass(PluginRegistry.ActivityResultListener.class);
-    verify(mockRegistrar).addActivityResultListener(captor.capture());
+    verify(mockActivityPluginBinding).addActivityResultListener(captor.capture());
     PluginRegistry.ActivityResultListener listener = captor.getValue();
 
     when(mockGoogleSignIn.getLastSignedInAccount(mockContext)).thenReturn(account);
@@ -172,7 +168,7 @@ public void requestScopes_mayBeCalledRepeatedly_ifAlreadyGranted() {
 
     ArgumentCaptor<PluginRegistry.ActivityResultListener> captor =
         ArgumentCaptor.forClass(PluginRegistry.ActivityResultListener.class);
-    verify(mockRegistrar).addActivityResultListener(captor.capture());
+    verify(mockActivityPluginBinding).addActivityResultListener(captor.capture());
     PluginRegistry.ActivityResultListener listener = captor.getValue();
 
     when(mockGoogleSignIn.getLastSignedInAccount(mockContext)).thenReturn(account);
@@ -198,7 +194,7 @@ public void requestScopes_mayBeCalledRepeatedly_ifNotSignedIn() {
 
     ArgumentCaptor<PluginRegistry.ActivityResultListener> captor =
         ArgumentCaptor.forClass(PluginRegistry.ActivityResultListener.class);
-    verify(mockRegistrar).addActivityResultListener(captor.capture());
+    verify(mockActivityPluginBinding).addActivityResultListener(captor.capture());
     PluginRegistry.ActivityResultListener listener = captor.getValue();
 
     when(mockGoogleSignIn.getLastSignedInAccount(mockContext)).thenReturn(null);