From bdc6f10293918c54c139425339401327670a830d Mon Sep 17 00:00:00 2001 From: asiva Date: Wed, 7 Feb 2018 17:46:16 -0800 Subject: [PATCH] Fix issues. --- packages/flutter/lib/src/widgets/automatic_keep_alive.dart | 2 +- packages/flutter/lib/src/widgets/ticker_provider.dart | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/flutter/lib/src/widgets/automatic_keep_alive.dart b/packages/flutter/lib/src/widgets/automatic_keep_alive.dart index fd1a20648a..54abb44bc8 100644 --- a/packages/flutter/lib/src/widgets/automatic_keep_alive.dart +++ b/packages/flutter/lib/src/widgets/automatic_keep_alive.dart @@ -299,7 +299,7 @@ class KeepAliveHandle extends ChangeNotifier { /// /// * [AutomaticKeepAlive], which listens to messages from this mixin. /// * [KeepAliveNotification], the notifications sent by this mixin. -abstract class AutomaticKeepAliveClientMixin extends State { +abstract class AutomaticKeepAliveClientMixin extends State { // This class is intended to be used as a mixin, and should not be // extended directly. factory AutomaticKeepAliveClientMixin._() => null; diff --git a/packages/flutter/lib/src/widgets/ticker_provider.dart b/packages/flutter/lib/src/widgets/ticker_provider.dart index ab77057ce3..8c9c0bbde8 100644 --- a/packages/flutter/lib/src/widgets/ticker_provider.dart +++ b/packages/flutter/lib/src/widgets/ticker_provider.dart @@ -155,12 +155,7 @@ abstract class SingleTickerProviderStateMixin extends State implements Ticker /// If you only have a single [Ticker] (for example only a single /// [AnimationController]) for the lifetime of your [State], then using a /// [SingleTickerProviderStateMixin] is more efficient. This is the common case. -<<<<<<< HEAD -@optionalTypeArgs -abstract class TickerProviderStateMixin extends State implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232 -======= abstract class TickerProviderStateMixin extends State implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232 ->>>>>>> parent of 1c236d524... Fixes in flutter framework code to address the mixin issue raised // This class is intended to be used as a mixin, and should not be // extended directly. factory TickerProviderStateMixin._() => null;