commit b88068a8760cff507a7d0e4c7039cfa72b039453
author Doris Ling <dling@google.com> Wed Aug 24 04:05:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 24 04:05:39 2016 +0000
tree ca05ecb44da6657fd9c14be8c36d1524dfdcbc45
parent 2c8178db3acc4939563a35d61349ee4d889b40f8
parent 008ba4ec402c6b223ff4126d9a180b3931a049ef

Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev

src/com/android/settings/gestures/GesturePreference.java

diff --git a/src/com/android/settings/gestures/GesturePreference.java b/src/com/android/settings/gestures/GesturePreference.java
index eae7316..2d921bf 100644
--- a/src/com/android/settings/gestures/GesturePreference.java
+++ b/src/com/android/settings/gestures/GesturePreference.java
@@ -185,6 +185,12 @@
         Loader<Bitmap> loader = manager.initLoader(id, Bundle.EMPTY, this);
     }
 
+    void onViewVisible() {
+        if (mVideoReady && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
+            mMediaPlayer.seekTo(0);
+        }
+    }
+
     private static final class PreviewRetriever extends AsyncLoader<Bitmap> {
         private Uri mVideoPath;
 

src/com/android/settings/gestures/GestureSettings.java

diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 8f028b6..9932bd6 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -119,6 +119,14 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        for (GesturePreference preference : mPreferences) {
+            preference.onViewVisible();
+        }
+    }
+
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean enabled = (boolean) newValue;
         String key = preference.getKey();