Revert "WIP2" (#54286)

flutter · Apr 10, 2020 · 6c04830 · 6c04830
1 parent ce92333
commit 6c04830
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 34 deletions.
diff --git a/packages/flutter/lib/src/foundation/binding.dart b/packages/flutter/lib/src/foundation/binding.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:convert' show json;
 import 'dart:developer' as developer;
 import 'dart:io' show exit;
-import 'dart:ui' as ui show AppLifecycleState, saveCompilationTrace, Window, window;
+import 'dart:ui' as ui show saveCompilationTrace, Window, window;
 // Before adding any more dart:ui imports, please read the README.
 
 import 'package:meta/meta.dart';
@@ -552,29 +552,6 @@ abstract class BindingBase {
     });
   }
 
-  // TODO(goderbauer): Remove the next two members after the service/scheduler dependencies
-  //  have been turned around.
-
-  /// Whether the application is visible, and if so, whether it is currently
-  /// interactive.
-  ///
-  /// This is set by [handleAppLifecycleStateChanged] when the
-  /// [SystemChannels.lifecycle] notification is dispatched.
-  ///
-  /// The preferred way to watch for changes to this value is using
-  /// [WidgetsBindingObserver.didChangeAppLifecycleState].
-  ui.AppLifecycleState get lifecycleState => null;
-
-  /// Called when the application lifecycle state changes.
-  ///
-  /// Notifies all the observers using
-  /// [WidgetsBindingObserver.didChangeAppLifecycleState].
-  ///
-  /// This method exposes notifications from [SystemChannels.lifecycle].
-  @protected
-  @mustCallSuper
-  void handleAppLifecycleStateChanged(ui.AppLifecycleState state) { }
-
   @override
   String toString() => '<${objectRuntimeType(this, 'BindingBase')}>';
 }

diff --git a/packages/flutter/lib/src/scheduler/binding.dart b/packages/flutter/lib/src/scheduler/binding.dart
@@ -299,7 +299,6 @@ mixin SchedulerBinding on BindingBase {
   ///
   /// The preferred way to watch for changes to this value is using
   /// [WidgetsBindingObserver.didChangeAppLifecycleState].
-  @override
   AppLifecycleState get lifecycleState => _lifecycleState;
   AppLifecycleState _lifecycleState;
 
@@ -309,9 +308,9 @@ mixin SchedulerBinding on BindingBase {
   /// [WidgetsBindingObserver.didChangeAppLifecycleState].
   ///
   /// This method exposes notifications from [SystemChannels.lifecycle].
-  @override
+  @protected
+  @mustCallSuper
   void handleAppLifecycleStateChanged(AppLifecycleState state) {
-    super.handleAppLifecycleStateChanged(state);
     assert(state != null);
     _lifecycleState = state;
     switch (state) {

diff --git a/packages/flutter/lib/src/services/binding.dart b/packages/flutter/lib/src/services/binding.dart
@@ -19,7 +19,7 @@ import 'system_channels.dart';
 /// the licenses found in the `LICENSE` file stored at the root of the asset
 /// bundle, and implements the `ext.flutter.evict` service extension (see
 /// [evict]).
-mixin ServicesBinding on BindingBase {
+mixin ServicesBinding on BindingBase, SchedulerBinding {
   @override
   void initInstances() {
     super.initInstances();

diff --git a/packages/flutter/test/painting/binding_test.dart b/packages/flutter/test/painting/binding_test.dart
@@ -86,12 +86,6 @@ class TestBindingBase implements BindingBase {
 
   @override
   ui.Window get window => throw UnimplementedError();
-
-  @override
-  ui.AppLifecycleState get lifecycleState => null;
-
-  @override
-  void handleAppLifecycleStateChanged(ui.AppLifecycleState state) { }
 }
 
 class TestPaintingBinding extends TestBindingBase with SchedulerBinding, ServicesBinding, PaintingBinding {