diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index f65e932e1b5..3f69a0adff4 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -22,48 +22,50 @@
     android:layout_height="match_parent"
     style="?attr/fingerprint_layout_theme">
 
-    <LinearLayout
-        style="@style/SuwContentFrame"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <TextView
-            style="@style/TextAppearance.FingerprintMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_margin_top"
-            android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-        <View
-            android:layout_height="0dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
-
         <include
             layout="@layout/fingerprint_enroll_find_sensor_graphic"
-            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-            android:layout_gravity="center_horizontal"/>
-
-        <View
-            android:layout_height="0dp"
             android:layout_width="match_parent"
-            android:layout_weight="1"/>
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal|bottom"/>
 
-        <Button
-            style="@style/Button.FingerprintButton"
-            android:id="@+id/next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginEnd="-12dp"
-            android:layout_gravity="end"
-            android:gravity="end|center_vertical"
-            android:text="@string/fingerprint_enroll_button_next" />
+        <LinearLayout
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:clipToPadding="false"
+            android:clipChildren="false">
 
-    </LinearLayout>
+            <TextView
+                style="@style/TextAppearance.FingerprintMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/suw_description_margin_top"
+                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
+            <View
+                android:layout_height="0dp"
+                android:layout_width="match_parent"
+                android:layout_weight="1"/>
+
+            <Button
+                style="@style/Button.FingerprintButton"
+                android:id="@+id/next_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="-12dp"
+                android:layout_gravity="end"
+                android:gravity="end|center_vertical"
+                android:text="@string/fingerprint_enroll_button_next" />
+
+        </LinearLayout>
+    </FrameLayout>
 </com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/raw/fingerprint_location_animation.mp4 b/res/raw/fingerprint_location_animation.mp4
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 63d93354ee8..b246bdf34d6 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -33,7 +33,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     private static final int ENROLLING = 2;
     public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
 
-    private FingerprintLocationAnimationView mAnimation;
+    private FingerprintFindSensorAnimation mAnimation;
     private boolean mLaunchedConfirmLock;
 
     @Override
@@ -46,7 +46,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
         if (mToken == null && !mLaunchedConfirmLock) {
             launchConfirmLock();
         }
-        mAnimation = (FingerprintLocationAnimationView) findViewById(
+        mAnimation = (FingerprintFindSensorAnimation) findViewById(
                 R.id.fingerprint_sensor_location_animation);
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java b/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
new file mode 100644
index 00000000000..cb254baa4b1
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+/**
+ * An abstraction for a view that contains an animation that shows the user
+ * where the fingerprint sensor is on the device.
+ */
+public interface FingerprintFindSensorAnimation {
+
+    /**
+     * Start the animation
+     */
+    void startAnimation();
+
+    /**
+     * Stop the animation
+     */
+    void stopAnimation();
+
+}
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
new file mode 100644
index 00000000000..fb4469ca134
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.SurfaceTexture;
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.OnInfoListener;
+import android.media.MediaPlayer.OnPreparedListener;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.View;
+
+import com.android.settings.R;
+
+/**
+ * A view containing a VideoView for showing the user how to enroll a fingerprint
+ */
+public class FingerprintLocationAnimationVideoView extends TextureView
+        implements FingerprintFindSensorAnimation {
+    protected float mAspect = 1.0f; // initial guess until we know
+    protected MediaPlayer mMediaPlayer;
+
+    public FingerprintLocationAnimationVideoView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // Width is driven by measurespec, height is derrived from aspect ratio
+        int originalWidth = MeasureSpec.getSize(widthMeasureSpec);
+        int height = Math.round(mAspect * originalWidth);
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setSurfaceTextureListener(new SurfaceTextureListener() {
+            @Override
+            public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
+                    int height) {
+                setVisibility(View.INVISIBLE);
+                Uri videoUri = resourceEntryToUri(mContext, R.raw.fingerprint_location_animation);
+                mMediaPlayer = MediaPlayer.create(mContext, videoUri);
+                mMediaPlayer.setSurface(new Surface(surfaceTexture));
+                mMediaPlayer.setOnPreparedListener(new OnPreparedListener() {
+                    @Override
+                    public void onPrepared(MediaPlayer mediaPlayer) {
+                        mediaPlayer.setLooping(true);
+                    }
+                });
+                mMediaPlayer.setOnInfoListener(new OnInfoListener() {
+                    @Override
+                    public boolean onInfo(MediaPlayer mediaPlayer, int what, int extra) {
+                        if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) {
+                            // Keep the view hidden until video starts
+                            setVisibility(View.VISIBLE);
+                        }
+                        return false;
+                    }
+                });
+                mAspect = (float) mMediaPlayer.getVideoHeight() / mMediaPlayer.getVideoWidth();
+                requestLayout();
+                startAnimation();
+            }
+
+            @Override
+            public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture,
+                    int width, int height) {
+            }
+
+            @Override
+            public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+                return false;
+            }
+
+            @Override
+            public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+            }
+        });
+    }
+
+    private static Uri resourceEntryToUri (Context context, int id) {
+        Resources res = context.getResources();
+        return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
+                res.getResourcePackageName(id) + '/' +
+                res.getResourceTypeName(id) + '/' +
+                res.getResourceEntryName(id));
+    }
+
+    @Override
+    public void startAnimation() {
+        if (mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
+            mMediaPlayer.start();
+        }
+    }
+
+    @Override
+    public void stopAnimation() {
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.stop();
+        }
+    }
+
+}
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
index 65f38bd7ac3..c17069f4fea 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
@@ -34,7 +34,8 @@ import com.android.settings.R;
 /**
  * View which plays an animation to indicate where the sensor is on the device.
  */
-public class FingerprintLocationAnimationView extends View {
+public class FingerprintLocationAnimationView extends View implements
+        FingerprintFindSensorAnimation {
 
     private static final float MAX_PULSE_ALPHA = 0.15f;
     private static final long DELAY_BETWEEN_PHASE = 1000;
@@ -95,10 +96,12 @@ public class FingerprintLocationAnimationView extends View {
         return getHeight() * mFractionCenterY;
     }
 
+    @Override
     public void startAnimation() {
         startPhase();
     }
 
+    @Override
     public void stopAnimation() {
         removeCallbacks(mStartPhaseRunnable);
         if (mRadiusAnimator != null) {