Ensure that the gesture animation video is paused properly. am: 4245ad4771

am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12

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

@@ -150,6 +150,10 @@ public final class GesturePreference extends SwitchPreference {
                         playButton.setVisibility(View.VISIBLE);
                     }
                 }
+                if (mMediaPlayer != null && !mMediaPlayer.isPlaying() &&
+                        playButton.getVisibility() != View.VISIBLE) {
+                    playButton.setVisibility(View.VISIBLE);
+                }
             }
         });
 
@@ -175,4 +179,10 @@ public final class GesturePreference extends SwitchPreference {
         }
     }
 
+    void onViewInvisible() {
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.pause();
+        }
+    }
+
 }

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

@@ -144,6 +144,14 @@ public class GestureSettings extends SettingsPreferenceFragment implements
         }
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        for (GesturePreference preference : mPreferences) {
+            preference.onViewInvisible();
+        }
+    }
+
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean enabled = (boolean) newValue;