Revert "reland add new enum change (#44281) (#44487)" (#44947)

This reverts commit f0794917.

dev/bots/test.dart

@@ -106,7 +106,6 @@ Future<void> main(List<String> args) async {
   print('═' * 80);
   await selectShard(const <String, ShardRunner>{
     'add_to_app_tests': _runAddToAppTests,
-    'add_to_app_life_cycle_tests': _runAddToAppLifeCycleTests,
     'build_tests': _runBuildTests,
     'framework_coverage': _runFrameworkCoverage,
     'framework_tests': _runFrameworkTests,
@@ -359,17 +358,6 @@ Future<void> _runAddToAppTests() async {
   }
 }
 
-Future<void> _runAddToAppLifeCycleTests() async {
-  if (Platform.isMacOS) {
-    print('${green}Running add-to-app life cycle iOS integration tests$reset...');
-    final String addToAppDir = path.join(flutterRoot, 'dev', 'integration_tests', 'ios_add2app_life_cycle');
-    await runCommand('./build_and_test.sh',
-      <String>[],
-      workingDirectory: addToAppDir,
-    );
-  }
-}
-
 Future<void> _runFrameworkTests() async {
   final bq.BigqueryApi bigqueryApi = await _getBigqueryApi();
 

dev/integration_tests/ios_add2app_life_cycle/.gitignore

-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-.DS_Store
-
-## Build generated
-build/
-DerivedData/
-Pods/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
\ No newline at end of file

dev/integration_tests/ios_add2app_life_cycle/LICENSE

-Copyright 2014 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

dev/integration_tests/ios_add2app_life_cycle/Podfile

-platform :ios, '12.0'
-
-flutter_application_path = 'flutterapp/'
-
-load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
-
-target 'ios_add2app' do
-  install_all_flutter_pods(flutter_application_path)
-end
-
-target 'ios_add2appTests' do
-  inherit! :search_paths
-  install_flutter_engine_pod
-  pod 'EarlGrey'
-end

dev/integration_tests/ios_add2app_life_cycle/README.md

-# iOS Add2App Life Cycle Test
-
-This application demonstrates some basic functionality for Add2App,
-along with a native iOS ViewController as a baseline and to demonstrate
-interaction.
-
-The following functionality is currently implemented:
-
-1. A regular iOS view controller (UIViewController), similar to the default
-   `flutter create` template (NativeViewController.m).
-1. A FlutterViewController subclass that takes over full screen. Demos showing
-   this both from a cold/fresh engine state and a warm engine state
-   (FullScreenViewController.m).
-1. A demo of pushing a FlutterViewController on as a child view.
-1. A demo of showing both the native and the Flutter views using a platform
-   channel to to interact with each other (HybridViewController.m).
-1. A demo of showing two FlutterViewControllers simultaneously
-   (DualViewController.m).
-
-A few key things are tested here (IntegrationTests.m):
-
-1. The ability to pre-warm the engine and attach/detatch a ViewController from
-   it.
-1. The ability to use platform channels to communicate between views.
-1. The ability to simultaneously run two instances of the engine.
-1. That a FlutterViewController can be freed when no longer in use (also tested
-   from FlutterViewControllerTests.m).
-1. That a FlutterEngine can be freed when no longer in use.
\ No newline at end of file

dev/integration_tests/ios_add2app_life_cycle/build_and_test.sh

-#!/bin/bash
-
-set -e
-
-cd "$(dirname "$0")"
-
-pushd flutterapp
-../../../../bin/flutter build ios --debug --simulator --no-codesign
-popd
-
-pod install
-os_version=$(xcrun --show-sdk-version --sdk iphonesimulator)
-
-PRETTY="cat"
-if which xcpretty; then
-  PRETTY="xcpretty"
-fi
-
-set -o pipefail && xcodebuild \
-  -workspace ios_add2app.xcworkspace \
-  -scheme ios_add2app \
-  -sdk "iphonesimulator$os_version" \
-  -destination "OS=$os_version,name=iPhone X" test | $PRETTY
-

dev/integration_tests/ios_add2app_life_cycle/flutterapp/.gitignore

-.DS_Store
-.dart_tool/
-
-.packages
-.pub/
-
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-*.swp
-profile
-
-DerivedData/
-
-.generated/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
-
-*.pyc
-*sync/
-Icon?
-.tags*
-
-build/
-.android/
-.ios/
-.flutter-plugins

dev/integration_tests/ios_add2app_life_cycle/flutterapp/.metadata

-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: 06179457d553b96b4d7421a08ac90535ca2c9632
-  channel: unknown
-
-project_type: module

dev/integration_tests/ios_add2app_life_cycle/flutterapp/README.md

-# ios_add2app_life_cycle_flutter
-
-A new flutter module project.
-
-## Getting Started
-
-For help getting started with Flutter, view our online
-[documentation](https://flutter.dev/).

dev/integration_tests/ios_add2app_life_cycle/flutterapp/lib/main.dart

-import 'dart:ui' as ui;
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter/scheduler.dart';
-import 'package:flutter/foundation.dart';
-import 'package:collection/collection.dart';
-
-VoidCallback originalSemanticsListener;
-
-void main() {
-  WidgetsFlutterBinding.ensureInitialized();
-  // Disconnects semantics listener for testing purposes.
-  originalSemanticsListener = ui.window.onSemanticsEnabledChanged;
-  ui.window.onSemanticsEnabledChanged = null;
-  RendererBinding.instance.setSemanticsEnabled(false);
-  // If the test passes, LifeCycleSpy will rewire the semantics listener back.
-  runApp(const LifeCycleSpy());
-}
-
-/// A Test widget that spies on app life cycle changes.
-///
-/// It will collect the AppLifecycleState sequence during its lifetime, and it
-/// will rewire semantics harness if the sequence it receives matches the
-/// expected list.
-///
-/// Rewiring semantics is a signal to native IOS test that the test has passed.
-class LifeCycleSpy extends StatefulWidget {
-  const LifeCycleSpy();
-
-  @override
-  _LifeCycleSpyState createState() => _LifeCycleSpyState();
-}
-
-class _LifeCycleSpyState extends State<LifeCycleSpy> with WidgetsBindingObserver {
-  final List<AppLifecycleState> _expectedLifeCycleSequence = <AppLifecycleState>[
-    AppLifecycleState.detached,
-    AppLifecycleState.inactive,
-    AppLifecycleState.resumed,
-  ];
-  List<AppLifecycleState> _actualLifeCycleSequence;
-
-  @override
-  void initState(){
-    super.initState();
-    WidgetsBinding.instance.addObserver(this);
-    _actualLifeCycleSequence =  <AppLifecycleState>[
-      SchedulerBinding.instance.lifecycleState
-    ];
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    setState(() {
-      _actualLifeCycleSequence = List<AppLifecycleState>.from(_actualLifeCycleSequence);
-      _actualLifeCycleSequence.add(state);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (const ListEquality<AppLifecycleState>().equals(_actualLifeCycleSequence, _expectedLifeCycleSequence)) {
-      // Rewires the semantics harness if test passes.
-      RendererBinding.instance.setSemanticsEnabled(true);
-      ui.window.onSemanticsEnabledChanged = originalSemanticsListener;
-    }
-    return const MaterialApp(
-      title: 'Flutter View',
-      home: Text('test'),
-    );
-  }
-}

dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml

-name: ios_add2app_life_cycle_flutter
-description: A new flutter module project.
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# Read more about versioning at semver.org.
-#
-# This version is used _only_ for the Runner app, which is used if you just do
-# a `flutter run` or a `flutter make-host-app-editable`. It has no impact
-# on any other native host app that you embed your Flutter project into.
-version: 1.0.0+1
-
-environment:
-  sdk: ">=2.0.0-dev.68.0 <3.0.0"
-
-dependencies:
-  flutter:
-    sdk: flutter
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: 0.1.2
-
-  collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-  # For information on the generic Dart part of this file, see the
-  # following page: https://dart.dev/tools/pub/pubspec
-
-  archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  petitparser: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  quiver: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  test_api: 0.2.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  xml: 3.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-
-flutter:
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add Flutter specific assets to your application, add an assets section,
-  # like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add Flutter specific custom fonts to your application, add a fonts
-  # section here, in this "flutter" section. Each entry in this list should
-  # have a "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
-
-  # This section identifies your Flutter project as a module meant for
-  # embedding in a native host app.  These identifiers should _not_ ordinarily
-  # be changed after generation - they are used to ensure that the tooling can
-  # maintain consistency when adding or modifying assets and plugins.
-  # They also do not have any bearing on your native host application's
-  # identifiers, which may be completely independent or the same as these.
-  module:
-    androidPackage: com.example.iosadd2appflutter
-    iosBundleIdentifier: com.example.iosAdd2appFlutter
-
-# PUBSPEC CHECKSUM: 712e

dev/integration_tests/ios_add2app_life_cycle/flutterapp/test/widget_test.dart

-void main() {
-
-}

dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/project.xcworkspace/contents.xcworkspacedata

-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1100"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-               BuildableName = "ios_add2app.app"
-               BlueprintName = "ios_add2app"
-               ReferencedContainer = "container:ios_add2app.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "24D2933421A29627008787A5"
-               BuildableName = "ios_add2appTests.xctest"
-               BlueprintName = "ios_add2appTests"
-               ReferencedContainer = "container:ios_add2app.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-            BuildableName = "ios_add2app.app"
-            BlueprintName = "ios_add2app"
-            ReferencedContainer = "container:ios_add2app.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-            BuildableName = "ios_add2app.app"
-            BlueprintName = "ios_add2app"
-            ReferencedContainer = "container:ios_add2app.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "24E221B421A28A0B008ADF09"
-            BuildableName = "ios_add2app.app"
-            BlueprintName = "ios_add2app"
-            ReferencedContainer = "container:ios_add2app.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcworkspace/contents.xcworkspacedata

-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:ios_add2app.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/AppDelegate.h

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-#import <Flutter/Flutter.h>
-
-@interface AppDelegate : FlutterAppDelegate
-
-@property(nonatomic, strong, readonly) FlutterEngine* engine;
-
-@end

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/AppDelegate.m

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "AppDelegate.h"
-#import "MainViewController.h"
-
-@interface AppDelegate ()
-
-@property(nonatomic, strong, readwrite) FlutterEngine* engine;
-
-@end
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-
-  MainViewController *mainViewController = [[MainViewController alloc] init];
-  UINavigationController *navigationController = [[UINavigationController alloc]
-      initWithRootViewController:mainViewController];
-
-  navigationController.navigationBar.translucent = NO;
-
-  self.engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
-  [self.engine runWithEntrypoint:nil];
-
-  self.window.rootViewController = navigationController;
-  [self.window makeKeyAndVisible];
-
-  return YES;
-}
-
-@end

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json

-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/Assets.xcassets/Contents.json

-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/FullScreenViewController.h

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Flutter/Flutter.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FullScreenViewController : FlutterViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/FullScreenViewController.m

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "FullScreenViewController.h"
-
-@interface FullScreenViewController ()
-
-@end
-
-@implementation FullScreenViewController
-
--(void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-  self.title = @"Full Screen Flutter";
-  self.navigationController.navigationBarHidden = YES;
-  self.navigationController.hidesBarsOnSwipe = YES;
-}
-
--(void)viewWillDisappear:(BOOL)animated {
-  [super viewWillDisappear:animated];
-  self.navigationController.navigationBarHidden = NO;
-  self.navigationController.hidesBarsOnSwipe = NO;
-  if (self.isMovingFromParentViewController) {
-    // Note that if we were doing things that might cause the VC
-    // to disappear (like using the image_picker plugin)
-    // we shouldn't do this.  But in this case we know we're
-    // just going back to the navigation controller.
-    // If we needed Flutter to tell us when we could actually go away,
-    // we'd need to communicate over a method channel with it.
-    [self.engine setViewController:nil];
-  }
-}
-
--(BOOL)prefersStatusBarHidden {
-  return true;
-}
-
-@end

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/Info.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/Launch Screen.storyboard

-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2018 The Flutter Authors. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
-                                <rect key="frame" x="0.0" y="626" width="375" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ios_add2app" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
-                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
-                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/MainViewController.h

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-#import <Flutter/Flutter.h>
-
-@interface MainViewController : UIViewController
-
-@end

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/MainViewController.m

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "MainViewController.h"
-
-#import "AppDelegate.h"
-#import "FullScreenViewController.h"
-
-@interface MainViewController ()
-
-@property(nonatomic, strong) UIStackView* stackView;
-
-@end
-
-
-@implementation MainViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-
-  [self.view setFrame:self.view.window.bounds];
-  self.title = @"Flutter iOS Demos";
-  self.view.backgroundColor = UIColor.whiteColor;
-
-  self.stackView = [[UIStackView alloc] initWithFrame:self.view.frame];
-  self.stackView.axis = UILayoutConstraintAxisVertical;
-  self.stackView.distribution = UIStackViewDistributionEqualSpacing;
-  self.stackView.alignment = UIStackViewAlignmentCenter;
-  self.stackView.autoresizingMask =
-      UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-  self.stackView.layoutMargins = UIEdgeInsetsMake(0, 0, 50, 0);
-  self.stackView.layoutMarginsRelativeArrangement = YES;
-  [self.view addSubview:_stackView];
-
-  [self addButton:@"Full Screen (Cold)" action:@selector(showFullScreenCold)];
-}
-
-- (void)showFullScreenCold {
-  FlutterEngine *engine =
-      [(AppDelegate *)[[UIApplication sharedApplication] delegate] engine];
-
-  FullScreenViewController *flutterViewController =
-      [[FullScreenViewController alloc] initWithEngine:engine
-                                               nibName:nil
-                                                bundle:nil];
-  [self.navigationController
-      pushViewController:flutterViewController
-                animated:NO]; // Animating this is janky because of
-                              // transitions with header on the native side.
-                              // It's especially bad with a cold engine.
-}
-
-- (void)addButton:(NSString *)title action:(SEL)action {
-  UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
-  [button setTitle:title forState:UIControlStateNormal];
-  [button addTarget:self
-                action:action
-      forControlEvents:UIControlEventTouchUpInside];
-  [self.stackView addArrangedSubview:button];
-}
-
-@end

dev/integration_tests/ios_add2app_life_cycle/ios_add2app/main.m

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}

dev/integration_tests/ios_add2app_life_cycle/ios_add2appTests/Info.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>

dev/integration_tests/ios_add2app_life_cycle/ios_add2appTests/IntegrationTests.m

-// Copyright 2018 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <EarlGrey/EarlGrey.h>
-#import <XCTest/XCTest.h>
-
-#import "AppDelegate.h"
-#import "FullScreenViewController.h"
-
-@interface FlutterTests : XCTestCase
-@end
-
-@implementation FlutterTests
-
-- (void)expectSemanticsNotification:(UIViewController*)viewController
-                             engine:(FlutterEngine*)engine {
-   // Flutter app will only send semantics update if test passes in main.dart.
-  [self expectationForNotification:FlutterSemanticsUpdateNotification object:viewController handler:nil];
-  [self waitForExpectationsWithTimeout:30.0 handler:nil];
-}
-
-- (void)checkAppConnection {
-  FlutterEngine *engine = [((AppDelegate *)[[UIApplication sharedApplication] delegate]) engine];
-  UINavigationController *navController =
-       (UINavigationController *)((AppDelegate *)
-            [[UIApplication sharedApplication]
-                 delegate])
-       .window.rootViewController;
-  __weak UIViewController *weakViewController = navController.visibleViewController;
-  [self expectSemanticsNotification:weakViewController
-                             engine:engine];
-  GREYAssertNotNil(weakViewController,
-                   @"Expected non-nil FullScreenViewController.");
-}
-
-- (void)testFullScreenCanPop {
-  [[EarlGrey selectElementWithMatcher:grey_keyWindow()]
-      assertWithMatcher:grey_sufficientlyVisible()];
-  [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Full Screen (Cold)")]
-      performAction:grey_tap()];
-  [self checkAppConnection];
-}
-
-@end

packages/flutter/lib/src/scheduler/binding.dart

@@ -330,9 +330,10 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
         _setFramesEnabledState(true);
         break;
       case AppLifecycleState.paused:
-      case AppLifecycleState.detached:
         _setFramesEnabledState(false);
         break;
+      default:
+        break;
     }
   }
 
@@ -349,8 +350,6 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
         return AppLifecycleState.resumed;
       case 'AppLifecycleState.inactive':
         return AppLifecycleState.inactive;
-      case 'AppLifecycleState.detached':
-        return AppLifecycleState.detached;
     }
     return null;
   }

packages/flutter/test/widgets/binding_test.dart

@@ -67,10 +67,6 @@ void main() {
     message = const StringCodec().encodeMessage('AppLifecycleState.inactive');
     await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
     expect(observer.lifecycleState, AppLifecycleState.inactive);
-
-    message = const StringCodec().encodeMessage('AppLifecycleState.detached');
-    await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
-    expect(observer.lifecycleState, AppLifecycleState.detached);
   });
 
   testWidgets('didPushRoute callback', (WidgetTester tester) async {
@@ -105,16 +101,6 @@ void main() {
     await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
     expect(tester.binding.hasScheduledFrame, isFalse);
 
-    message = const StringCodec().encodeMessage('AppLifecycleState.detached');
-    await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
-    expect(tester.binding.hasScheduledFrame, isFalse);
-
-    message = const StringCodec().encodeMessage('AppLifecycleState.inactive');
-    await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
-    expect(tester.binding.hasScheduledFrame, isTrue);
-    await tester.pump();
-    expect(tester.binding.hasScheduledFrame, isFalse);
-
     message = const StringCodec().encodeMessage('AppLifecycleState.paused');
     await defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
     expect(tester.binding.hasScheduledFrame, isFalse);