diff --git a/examples/flutter_gallery/lib/demo/animation/home.dart b/examples/flutter_gallery/lib/demo/animation/home.dart
index 0b1d1a2..901e4be 100644
--- a/examples/flutter_gallery/lib/demo/animation/home.dart
+++ b/examples/flutter_gallery/lib/demo/animation/home.dart
@@ -169,7 +169,7 @@
     this.selectedIndex,
   });
 
-  final FractionalOffset translation;
+  final Alignment translation;
   final double tColumnToRow;
   final double tCollapsed;
   final int cardCount;
@@ -349,7 +349,7 @@
 
     return new CustomMultiChildLayout(
       delegate: new _AllSectionsLayout(
-        translation: new FractionalOffset(selectedIndex.value - sectionIndex, 0.0),
+        translation: new Alignment((selectedIndex.value - sectionIndex) * 2.0 - 1.0, -1.0),
         tColumnToRow: tColumnToRow,
         tCollapsed: tCollapsed,
         cardCount: sections.length,
diff --git a/examples/flutter_gallery/lib/demo/animation/widgets.dart b/examples/flutter_gallery/lib/demo/animation/widgets.dart
index 63cf835..5470efe 100644
--- a/examples/flutter_gallery/lib/demo/animation/widgets.dart
+++ b/examples/flutter_gallery/lib/demo/animation/widgets.dart
@@ -25,8 +25,8 @@
         decoration: new BoxDecoration(
           borderRadius: new BorderRadius.circular(4.0),
           gradient: new LinearGradient(
-            begin: FractionalOffset.topLeft,
-            end: FractionalOffset.topRight,
+            begin: Alignment.centerLeft,
+            end: Alignment.centerRight,
             colors: <Color>[
               section.leftColor,
               section.rightColor,
@@ -82,7 +82,7 @@
         opacity: opacity,
         child: new Transform(
           transform: new Matrix4.identity()..scale(scale),
-          alignment: FractionalOffset.center,
+          alignment: Alignment.center,
           child: new Stack(
             children: <Widget>[
               new Positioned(
@@ -136,7 +136,7 @@
             package: detail.imageAssetPackage,
           ),
           fit: BoxFit.cover,
-          alignment: FractionalOffset.center,
+          alignment: Alignment.center,
         ),
       ),
     );
diff --git a/examples/flutter_gallery/lib/demo/contacts_demo.dart b/examples/flutter_gallery/lib/demo/contacts_demo.dart
index b1e2c65..4f96879 100644
--- a/examples/flutter_gallery/lib/demo/contacts_demo.dart
+++ b/examples/flutter_gallery/lib/demo/contacts_demo.dart
@@ -166,8 +166,8 @@
                     const DecoratedBox(
                       decoration: const BoxDecoration(
                         gradient: const LinearGradient(
-                          begin: const FractionalOffset(0.5, 0.0),
-                          end: const FractionalOffset(0.5, 0.30),
+                          begin: const Alignment(0.0, -1.0),
+                          end: const Alignment(0.0, -0.4),
                           colors: const <Color>[const Color(0x60000000), const Color(0x00000000)],
                         ),
                       ),
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
index d916590..15d314d 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
@@ -39,7 +39,7 @@
                     : ' '),
                 const Padding(padding: const EdgeInsets.all(12.0)),
                 new Align(
-                  alignment: const FractionalOffset(0.5, 0.4),
+                  alignment: const Alignment(0.0, -0.2),
                   child: new Row(
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[
diff --git a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
index fc6cfe6..63b5791 100644
--- a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
@@ -47,9 +47,9 @@
     return new FadeTransition(
       opacity: _animation,
       child: new SlideTransition(
-        position: new FractionalOffsetTween(
-          begin: const FractionalOffset(0.0, 0.02), // Small offset from the top.
-          end: FractionalOffset.topLeft,
+        position: new AlignmentTween(
+          begin: const Alignment(0.0, 0.4), // Slightly down.
+          end: Alignment.center,
         ).animate(_animation),
         child: new IconTheme(
           data: new IconThemeData(
diff --git a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
index 249b245..ebf98ff 100644
--- a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
@@ -90,7 +90,7 @@
 
   Widget buildRaisedButton() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new ButtonBar(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -111,7 +111,7 @@
 
   Widget buildFlatButton() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new ButtonBar(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -213,7 +213,7 @@
 
   Widget buildIconButton() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new Row(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -237,7 +237,7 @@
 
   Widget buildActionButton() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new FloatingActionButton(
         child: const Icon(Icons.add),
         onPressed: () {
diff --git a/examples/flutter_gallery/lib/demo/material/cards_demo.dart b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
index 876ee60..466dbfe 100644
--- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
@@ -85,7 +85,7 @@
                     right: 16.0,
                     child: new FittedBox(
                       fit: BoxFit.scaleDown,
-                      alignment: FractionalOffset.centerLeft,
+                      alignment: Alignment.centerLeft,
                       child: new Text(destination.title,
                         style: titleStyle,
                       ),
diff --git a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
index b382394..85c1e32 100644
--- a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
@@ -25,7 +25,7 @@
 
   AnimationController _controller;
   Animation<double> _drawerContentsOpacity;
-  Animation<FractionalOffset> _drawerDetailsPosition;
+  Animation<Alignment> _drawerDetailsPosition;
   bool _showDrawerContents = true;
 
   @override
@@ -39,9 +39,9 @@
       parent: new ReverseAnimation(_controller),
       curve: Curves.fastOutSlowIn,
     );
-    _drawerDetailsPosition = new FractionalOffsetTween(
-      begin: const FractionalOffset(0.0, -1.0),
-      end: const FractionalOffset(0.0, 0.0),
+    _drawerDetailsPosition = new AlignmentTween(
+      begin: const Alignment(0.0, -2.0),
+      end: Alignment.center,
     ).animate(new CurvedAnimation(
       parent: _controller,
       curve: Curves.fastOutSlowIn,
@@ -80,7 +80,7 @@
       appBar: new AppBar(
         leading: new IconButton(
           icon: new Icon(_backIcon()),
-          alignment: FractionalOffset.centerLeft,
+          alignment: Alignment.centerLeft,
           tooltip: 'Back',
           onPressed: () {
             Navigator.pop(context);
diff --git a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
index 2a0e339..175a134 100644
--- a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
@@ -51,7 +51,7 @@
             margin: const EdgeInsets.only(left: 24.0),
             child: new FittedBox(
               fit: BoxFit.scaleDown,
-              alignment: FractionalOffset.centerLeft,
+              alignment: Alignment.centerLeft,
               child: new Text(
                 name,
                 style: textTheme.body1.copyWith(fontSize: 15.0),
diff --git a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
index 94c9d09..ac76200 100644
--- a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
@@ -165,7 +165,7 @@
               decoration: new BoxDecoration(
                 border: new Border(bottom: new BorderSide(color: theme.dividerColor))
               ),
-              alignment: FractionalOffset.bottomLeft,
+              alignment: Alignment.bottomLeft,
               child: new Text('Event name', style: theme.textTheme.display2)
             ),
             new Container(
@@ -173,7 +173,7 @@
               decoration: new BoxDecoration(
                 border: new Border(bottom: new BorderSide(color: theme.dividerColor))
               ),
-              alignment: FractionalOffset.bottomLeft,
+              alignment: Alignment.bottomLeft,
               child: new Text('Location', style: theme.textTheme.title.copyWith(color: Colors.black54))
             ),
             new Column(
diff --git a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
index 10b6f84..a4e28f7 100644
--- a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
@@ -54,7 +54,7 @@
   Widget build(BuildContext context) {
     return new FittedBox(
       fit: BoxFit.scaleDown,
-      alignment: FractionalOffset.centerLeft,
+      alignment: Alignment.centerLeft,
       child: new Text(text),
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart b/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
index c4a806b..1e31cb0 100644
--- a/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
@@ -75,7 +75,7 @@
 
   Widget buildCheckbox() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -109,7 +109,7 @@
 
   Widget buildRadio() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -161,7 +161,7 @@
 
   Widget buildSwitch() {
     return new Align(
-      alignment: const FractionalOffset(0.5, 0.4),
+      alignment: const Alignment(0.0, -0.2),
       child: new Row(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
diff --git a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
index 43798e3..bd6b6a4 100644
--- a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
@@ -107,8 +107,8 @@
           children: <Widget>[
             new Align(
               alignment: page.id == 'L'
-                ? FractionalOffset.centerLeft
-                : FractionalOffset.centerRight,
+                ? Alignment.centerLeft
+                : Alignment.centerRight,
               child: new CircleAvatar(child: new Text('${page.id}')),
             ),
             new SizedBox(
diff --git a/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart b/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
index 2c8cdc3..3ac0dfa 100644
--- a/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
@@ -188,7 +188,7 @@
             ),
             new Container(
               padding: const EdgeInsets.all(20.0),
-              alignment: const FractionalOffset(0.5, 0.5),
+              alignment: Alignment.center,
               child: new RaisedButton(
                 child: const Text('SUBMIT'),
                 onPressed: _handleSubmitted,
diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart
index 02acf5f..ed59672 100644
--- a/examples/flutter_gallery/lib/demo/pesto_demo.dart
+++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart
@@ -211,7 +211,7 @@
   Widget build(BuildContext context) {
     return new Transform(
       transform: new Matrix4.identity()..scale(widget.height / kLogoHeight),
-      alignment: FractionalOffset.topCenter,
+      alignment: Alignment.topCenter,
       child: new SizedBox(
         width: kLogoWidth,
         child: new Stack(
@@ -362,8 +362,8 @@
                   background: new DecoratedBox(
                     decoration: new BoxDecoration(
                       gradient: new LinearGradient(
-                        begin: const FractionalOffset(0.5, 0.0),
-                        end: const FractionalOffset(0.5, 0.40),
+                        begin: const Alignment(0.0, -1.0),
+                        end: const Alignment(0.0, -0.2),
                         colors: <Color>[const Color(0x60000000), const Color(0x00000000)],
                       ),
                     ),
@@ -450,7 +450,7 @@
                     package: recipe.ingredientsImagePackage,
                     width: 32.0,
                     height: 32.0,
-                    alignment: FractionalOffset.centerLeft,
+                    alignment: Alignment.centerLeft,
                     fit: BoxFit.scaleDown
                   )
                 ),
diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart
index cc3a517..484ce48 100644
--- a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart
@@ -320,7 +320,7 @@
             new Column(
               children: <Widget>[
                 new Align(
-                  alignment: FractionalOffset.centerRight,
+                  alignment: Alignment.centerRight,
                   child: new _ProductPriceItem(product: product),
                 ),
                 new Container(
diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart
index 8d0c25c..aede511 100644
--- a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart
@@ -85,7 +85,7 @@
         new SizedBox(
           height: 24.0,
           child: new Align(
-            alignment: FractionalOffset.bottomLeft,
+            alignment: Alignment.bottomLeft,
             child: new Text(vendor.name, style: theme.vendorTitleStyle),
           ),
         ),
@@ -174,7 +174,7 @@
                     product.imageAsset,
                     package: product.imageAssetPackage,
                     fit: BoxFit.contain,
-                    alignment: FractionalOffset.center,
+                    alignment: Alignment.center,
                   ),
                 ),
               ),
diff --git a/examples/flutter_gallery/lib/gallery/home.dart b/examples/flutter_gallery/lib/gallery/home.dart
index c650f80..2356cd3 100644
--- a/examples/flutter_gallery/lib/gallery/home.dart
+++ b/examples/flutter_gallery/lib/gallery/home.dart
@@ -138,7 +138,7 @@
             child: new Container(
               height: 48.0,
               padding: const EdgeInsets.only(left: 16.0),
-              alignment: FractionalOffset.centerLeft,
+              alignment: Alignment.centerLeft,
               child: new Text(galleryItem.category, style: headerStyle)
             ),
           )
