Add static preview images to gesture settings. am: 12e4bebabf

am: df7b815980

Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696

res/layout/gesture_preference.xml

@@ -74,6 +74,7 @@
                 android:id="@+id/gesture_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:scaleType="fitXY"
                 android:background="@color/gestures_setting_background_color"/>
 
             <ImageView

res/values/attrs.xml

@@ -139,6 +139,7 @@
     <!-- For GesturePreference -->
     <declare-styleable name="GesturePreference">
         <attr name="animation" format="reference" />
+        <attr name="preview" format="reference" />
     </declare-styleable>
 
     <!-- For AspectRatioFrameLayout -->

res/xml/gesture_settings.xml

@@ -23,30 +23,35 @@
         android:key="gesture_swipe_down_fingerprint"
         android:title="@string/fingerprint_swipe_for_notifications_title"
         android:summary="@string/fingerprint_swipe_for_notifications_summary"
-        settings:animation="@raw/gesture_fingerprint_swipe"/>
+        settings:animation="@raw/gesture_fingerprint_swipe"
+        settings:preview="@drawable/gesture_fingerprint_swipe"/>
 
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_double_tap_power"
         android:title="@string/double_tap_power_for_camera_title"
         android:summary="@string/double_tap_power_for_camera_summary"
-        settings:animation="@raw/gesture_double_tap"/>
+        settings:animation="@raw/gesture_double_tap"
+        settings:preview="@drawable/gesture_double_tap"/>
 
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_double_twist"
         android:title="@string/double_twist_for_camera_mode_title"
         android:summary="@string/double_twist_for_camera_mode_summary"
-        settings:animation="@raw/gesture_twist"/>
+        settings:animation="@raw/gesture_twist"
+        settings:preview="@drawable/gesture_twist"/>
 
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_double_tap_screen"
         android:title="@string/ambient_display_title"
         android:summary="@string/ambient_display_summary"
-        settings:animation="@raw/gesture_ambient_tap"/>
+        settings:animation="@raw/gesture_ambient_tap"
+        settings:preview="@drawable/gesture_ambient_tap"/>
 
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_pick_up"
         android:title="@string/ambient_display_pickup_title"
         android:summary="@string/ambient_display_pickup_summary"
-        settings:animation="@raw/gesture_ambient_lift"/>
+        settings:animation="@raw/gesture_ambient_lift"
+        settings:preview="@drawable/gesture_ambient_lift"/>
 
 </PreferenceScreen>

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

@@ -14,18 +14,12 @@
 
 package com.android.settings.gestures;
 
-import android.app.LoaderManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Loader;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.SurfaceTexture;
-import android.media.MediaMetadataRetriever;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.os.Bundle;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.View;
@@ -36,15 +30,13 @@ import android.util.AttributeSet;
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.utils.AsyncLoader;
 
 /**
  * Preference item for a gesture with a switch to signify if it should be enabled.
  * This shows the title and description of the gesture along with an animation showing how to do
  * the gesture
  */
-public final class GesturePreference extends SwitchPreference implements
+public final class GesturePreference extends SwitchPreference {
-        LoaderManager.LoaderCallbacks<Bitmap> {
     private static final String TAG = "GesturePreference";
     private final Context mContext;
 
@@ -53,7 +45,7 @@ public final class GesturePreference extends SwitchPreference implements
     private boolean mAnimationAvailable;
     private boolean mVideoReady;
     private boolean mScrolling;
-    private BitmapDrawable mPreviewImage;
+    private int mPreviewResource;
 
     public GesturePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -71,6 +63,10 @@ public final class GesturePreference extends SwitchPreference implements
             mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
             if (mMediaPlayer != null && mMediaPlayer.getDuration() > 0) {
                 setLayoutResource(R.layout.gesture_preference);
+
+                mPreviewResource = attributes.getResourceId(
+                        R.styleable.GesturePreference_preview, 0);
+
                 mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
                     @Override
                     public void onSeekComplete(MediaPlayer mp) {
@@ -103,6 +99,7 @@ public final class GesturePreference extends SwitchPreference implements
 
         final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
         final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
+        imageView.setImageResource(mPreviewResource);
         final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);
 
         video.setOnClickListener(new View.OnClickListener() {
@@ -138,9 +135,6 @@ public final class GesturePreference extends SwitchPreference implements
 
             @Override
             public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
-                if (mPreviewImage != null && imageView.getDrawable() == null) {
-                    imageView.setImageDrawable(mPreviewImage);
-                }
                 imageView.setVisibility(View.VISIBLE);
                 return false;
             }
@@ -159,10 +153,6 @@ public final class GesturePreference extends SwitchPreference implements
             }
         });
 
-        if (mPreviewImage != null) {
-            imageView.setImageDrawable(mPreviewImage);
-        }
-
     }
 
     @Override
@@ -179,63 +169,10 @@ public final class GesturePreference extends SwitchPreference implements
         mScrolling = scrolling;
     }
 
-    void loadPreview(LoaderManager manager, int id) {
-        if (mAnimationAvailable) {
-            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;
-
-        public PreviewRetriever(Context context, Uri videoPath) {
-            super(context);
-            mVideoPath = videoPath;
-        }
-
-        @Override
-        public Bitmap loadInBackground() {
-            MediaMetadataRetriever mediaMetadata = new MediaMetadataRetriever();
-            try {
-                mediaMetadata.setDataSource(getContext(), mVideoPath);
-                return mediaMetadata.getFrameAtTime(0);
-            } catch (Exception e) {
-                Log.w(TAG, "Unable to get animation preview.");
-            } finally {
-                mediaMetadata.release();
-            }
-            return null;
-        }
-
-        @Override
-        public void onDiscardResult(final Bitmap result) {
-            if (result != null && !result.isRecycled()) {
-                result.recycle();
-            }
-        }
-
-    }
-
-    @Override
-    public Loader<Bitmap> onCreateLoader(int id, Bundle args) {
-        return new PreviewRetriever(mContext, mVideoPath);
-    }
-
-    @Override
-    public void onLoadFinished(final Loader<Bitmap> loader, final Bitmap bitmap) {
-        if (bitmap != null) {
-            mPreviewImage = new BitmapDrawable(mContext.getResources(), bitmap);
-        }
-    }
-
-    @Override
-    public void onLoaderReset(Loader<Bitmap> loader) {
-    }
-
 }

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

@@ -56,11 +56,6 @@ public class GestureSettings extends SettingsPreferenceFragment implements
     private static final String PREF_KEY_SWIPE_DOWN_FINGERPRINT = "gesture_swipe_down_fingerprint";
     private static final String PREF_KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen";
     private static final String DEBUG_DOZE_COMPONENT = "debug.doze.component";
-    private static final int PREF_ID_DOUBLE_TAP_POWER = 0;
-    private static final int PREF_ID_DOUBLE_TWIST = 1;
-    private static final int PREF_ID_PICK_UP = 2;
-    private static final int PREF_ID_SWIPE_DOWN_FINGERPRINT = 3;
-    private static final int PREF_ID_DOUBLE_TAP_SCREEN = 4;
 
     private List<GesturePreference> mPreferences;
 
@@ -75,7 +70,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements
         if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
             int cameraDisabled = Secure.getInt(
                     getContentResolver(), Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
-            addPreference(PREF_KEY_DOUBLE_TAP_POWER, cameraDisabled == 0, PREF_ID_DOUBLE_TAP_POWER);
+            addPreference(PREF_KEY_DOUBLE_TAP_POWER, cameraDisabled == 0);
         } else {
             removePreference(PREF_KEY_DOUBLE_TAP_POWER);
         }
@@ -84,21 +79,20 @@ public class GestureSettings extends SettingsPreferenceFragment implements
         boolean dozeEnabled = isDozeAvailable(context);
         if (dozeEnabled && isPickupAvailable(context)) {
             int pickup = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_PICK_UP, 1);
-            addPreference(PREF_KEY_PICK_UP, pickup != 0, PREF_ID_PICK_UP);
+            addPreference(PREF_KEY_PICK_UP, pickup != 0);
         } else {
             removePreference(PREF_KEY_PICK_UP);
         }
         if (dozeEnabled && isDoubleTapAvailable(context)) {
             int doubleTap = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1);
-            addPreference(PREF_KEY_DOUBLE_TAP_SCREEN, doubleTap != 0, PREF_ID_DOUBLE_TAP_SCREEN);
+            addPreference(PREF_KEY_DOUBLE_TAP_SCREEN, doubleTap != 0);
         } else {
             removePreference(PREF_KEY_DOUBLE_TAP_SCREEN);
         }
 
         // Fingerprint slide for notifications
         if (isSystemUINavigationAvailable(context)) {
-            addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context),
+            addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context));
-                    PREF_ID_SWIPE_DOWN_FINGERPRINT);
         } else {
             removePreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
         }
@@ -107,7 +101,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements
         if (isDoubleTwistAvailable(context)) {
             int doubleTwistEnabled = Secure.getInt(
                     getContentResolver(), Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
-            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0, PREF_ID_DOUBLE_TWIST);
+            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0);
         } else {
             removePreference(PREF_KEY_DOUBLE_TWIST);
         }
@@ -234,11 +228,10 @@ public class GestureSettings extends SettingsPreferenceFragment implements
                 R.bool.config_gesture_double_tap_settings_enabled);
     }
 
-    private void addPreference(String key, boolean enabled, int id) {
+    private void addPreference(String key, boolean enabled) {
         GesturePreference preference = (GesturePreference) findPreference(key);
         preference.setChecked(enabled);
         preference.setOnPreferenceChangeListener(this);
-        preference.loadPreview(getLoaderManager(), id);
         mPreferences.add(preference);
     }