commit 22b9e6dcdf2431b8136fd850ba1a70089aae8634
author Udam Saini <udam@google.com> Tue Jan 12 23:19:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 12 23:19:54 2016 +0000
tree 3ffe8c17d1341b92b6280689b73d77d256d3030d
parent acb25a1d9a8eb20efff33e39254214d7798ab9c8
parent 8298b47f0081294cb646852573bf50273440f98c

Merge "Fixes animation video from not playing after onStop"

src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index b246bdf..a5af5cc 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -59,6 +59,12 @@
     @Override
     protected void onStop() {
         super.onStop();
+        mAnimation.pauseAnimation();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
         mAnimation.stopAnimation();
     }
 

src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java

diff --git a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java b/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
index cb254ba..07ab99d 100644
--- a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
+++ b/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
@@ -32,4 +32,9 @@
      */
     void stopAnimation();
 
+    /**
+     * Pause the animation
+     */
+    void pauseAnimation();
+
 }

src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java

diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
index c1fd2c2..5236272 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -117,11 +117,18 @@
 
     @Override
     public void stopAnimation() {
-        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+        if (mMediaPlayer != null) {
             mMediaPlayer.stop();
             mMediaPlayer.release();
             mMediaPlayer = null;
         }
     }
 
+    @Override
+    public void pauseAnimation() {
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.pause();
+        }
+    }
+
 }

src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java

diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
index c17069f..cc1d4fd 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
@@ -112,6 +112,11 @@
         }
     }
 
+    @Override
+    public void pauseAnimation() {
+        stopAnimation();
+    }
+
     private void startPhase() {
         startRadiusAnimation();
         startAlphaAnimation();