Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am: 2c8178db3a am: a9d2aa8dfa

am: 77ba0620ea

Change-Id: I7a557b4ce9923b7d9b3bd2add8c02fdbadfe589d

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

@@ -185,6 +185,12 @@ public final class GesturePreference extends SwitchPreference implements
         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

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