From 1dcd11c8d1b433446147c8f1bddfa277c26c918e Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Mon, 23 Feb 2015 16:21:52 -0800
Subject: Make WebP in FrameSequence optional

Pass FRAMESEQUENCE_INCLUDE_WEBP=true to enable

Change-Id: Ide605b3aca80c10a805d8983b2f06bcc983bf95a
---
 framesequence/jni/Android.mk                       |  12 +-
 .../samples/FrameSequenceSamples/Android.mk        |  40 +++++++
 .../FrameSequenceSamples/AndroidManifest.xml       |  26 +++++
 .../samples/FrameSequenceSamples/build.xml         |  99 +++++++++++++++++
 .../samples/FrameSequenceSamples/proguard.flags    |   3 +
 .../FrameSequenceSamples/project.properties        |  14 +++
 .../res/drawable-hdpi/ic_launcher.png              | Bin 0 -> 9397 bytes
 .../res/drawable-mdpi/ic_launcher.png              | Bin 0 -> 5237 bytes
 .../res/drawable-xhdpi/ic_launcher.png             | Bin 0 -> 14383 bytes
 .../res/layout/basic_test_activity.xml             |  38 +++++++
 .../FrameSequenceSamples/res/raw/animated_gif.gif  | Bin 0 -> 34978 bytes
 .../res/raw/animated_webp.webp                     | Bin 0 -> 380850 bytes
 .../FrameSequenceSamples/res/values/strings.xml    |  14 +++
 .../FrameSequenceSamples/res/values/styles.xml     |   7 ++
 .../framesequence/samples/FrameSequenceTest.java   | 123 +++++++++++++++++++++
 .../android/framesequence/samples/SamplesList.java |  68 ++++++++++++
 framesequence/samples/RastermillSamples/Android.mk |  40 -------
 .../samples/RastermillSamples/AndroidManifest.xml  |  26 -----
 framesequence/samples/RastermillSamples/build.xml  |  99 -----------------
 .../samples/RastermillSamples/proguard.flags       |   3 -
 .../samples/RastermillSamples/project.properties   |  14 ---
 .../res/drawable-hdpi/ic_launcher.png              | Bin 9397 -> 0 bytes
 .../res/drawable-mdpi/ic_launcher.png              | Bin 5237 -> 0 bytes
 .../res/drawable-xhdpi/ic_launcher.png             | Bin 14383 -> 0 bytes
 .../res/layout/basic_test_activity.xml             |  38 -------
 .../samples/RastermillSamples/res/raw/animated.gif | Bin 34978 -> 0 bytes
 .../RastermillSamples/res/values/strings.xml       |  14 ---
 .../RastermillSamples/res/values/styles.xml        |   7 --
 .../rastermill/samples/AnimatedGifTest.java        | 120 --------------------
 .../android/rastermill/samples/SamplesList.java    |  61 ----------
 .../support/rastermill/FrameSequenceDrawable.java  |   3 -
 31 files changed, 440 insertions(+), 429 deletions(-)
 create mode 100644 framesequence/samples/FrameSequenceSamples/Android.mk
 create mode 100644 framesequence/samples/FrameSequenceSamples/AndroidManifest.xml
 create mode 100644 framesequence/samples/FrameSequenceSamples/build.xml
 create mode 100644 framesequence/samples/FrameSequenceSamples/proguard.flags
 create mode 100644 framesequence/samples/FrameSequenceSamples/project.properties
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/drawable-hdpi/ic_launcher.png
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/drawable-mdpi/ic_launcher.png
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/drawable-xhdpi/ic_launcher.png
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/raw/animated_gif.gif
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/raw/animated_webp.webp
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/values/strings.xml
 create mode 100644 framesequence/samples/FrameSequenceSamples/res/values/styles.xml
 create mode 100644 framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java
 create mode 100644 framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/SamplesList.java
 delete mode 100644 framesequence/samples/RastermillSamples/Android.mk
 delete mode 100644 framesequence/samples/RastermillSamples/AndroidManifest.xml
 delete mode 100644 framesequence/samples/RastermillSamples/build.xml
 delete mode 100644 framesequence/samples/RastermillSamples/proguard.flags
 delete mode 100644 framesequence/samples/RastermillSamples/project.properties
 delete mode 100644 framesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png
 delete mode 100644 framesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png
 delete mode 100644 framesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png
 delete mode 100644 framesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
 delete mode 100644 framesequence/samples/RastermillSamples/res/raw/animated.gif
 delete mode 100644 framesequence/samples/RastermillSamples/res/values/strings.xml
 delete mode 100644 framesequence/samples/RastermillSamples/res/values/styles.xml
 delete mode 100644 framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
 delete mode 100644 framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java

diff --git a/framesequence/jni/Android.mk b/framesequence/jni/Android.mk
index e9d0ec5..7353436 100644
--- a/framesequence/jni/Android.mk
+++ b/framesequence/jni/Android.mk
@@ -19,13 +19,12 @@ include $(CLEAR_VARS)
 
 ## Main library
 
-LOCAL_STATIC_LIBRARIES += libgif libwebp-decode
+LOCAL_STATIC_LIBRARIES = libgif
 
 LOCAL_LDFLAGS := -llog -ljnigraphics
 
 LOCAL_C_INCLUDES := \
-	external/giflib \
-	external/webp/include
+	external/giflib
 
 LOCAL_MODULE    := libframesequence
 LOCAL_SRC_FILES := \
@@ -33,11 +32,16 @@ LOCAL_SRC_FILES := \
 	FrameSequence.cpp \
 	FrameSequenceJNI.cpp \
 	FrameSequence_gif.cpp \
-	FrameSequence_webp.cpp \
 	JNIHelpers.cpp \
 	Registry.cpp \
 	Stream.cpp
 
+ifeq ($(FRAMESEQUENCE_INCLUDE_WEBP),true)
+	LOCAL_C_INCLUDES += external/webp/include
+	LOCAL_SRC_FILES += FrameSequence_webp.cpp
+	LOCAL_STATIC_LIBRARIES += libwebp-decode
+endif
+
 LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wno-unused-variable -Wno-overloaded-virtual
 LOCAL_CFLAGS += -fvisibility=hidden
 
diff --git a/framesequence/samples/FrameSequenceSamples/Android.mk b/framesequence/samples/FrameSequenceSamples/Android.mk
new file mode 100644
index 0000000..fff4a15
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/Android.mk
@@ -0,0 +1,40 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := FrameSequenceSample
+
+# java dependency
+LOCAL_STATIC_JAVA_LIBRARIES += android-common-framesequence
+
+# native dependency
+ifneq (,$(TARGET_BUILD_APPS))
+  LOCAL_JNI_SHARED_LIBRARIES := libframesequence
+else
+  LOCAL_REQUIRED_MODULES := libframesequence
+endif
+
+# proguard for framesequence library code
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_SDK_VERSION := 19
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.android.framesequence.samples
+
+include $(BUILD_PACKAGE)
diff --git a/framesequence/samples/FrameSequenceSamples/AndroidManifest.xml b/framesequence/samples/FrameSequenceSamples/AndroidManifest.xml
new file mode 100644
index 0000000..d614631
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.framesequence.samples"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="15"
+        android:targetSdkVersion="18" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <activity
+            android:name=".SamplesList"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".FrameSequenceTest" />
+    </application>
+
+</manifest>
diff --git a/framesequence/samples/FrameSequenceSamples/build.xml b/framesequence/samples/FrameSequenceSamples/build.xml
new file mode 100644
index 0000000..5e55b4e
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/build.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="RastermillSamples" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <target name="-pre-build">
+        <ant dir="../../" target="release" inheritAll="false" />
+        <copy todir="libs">
+            <fileset dir="../../exported_libs" />
+        </copy>
+    </target>
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/framesequence/samples/FrameSequenceSamples/proguard.flags b/framesequence/samples/FrameSequenceSamples/proguard.flags
new file mode 100644
index 0000000..4acde2d
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/proguard.flags
@@ -0,0 +1,3 @@
+-keep class android.support.rastermill.** {
+  *;
+}
diff --git a/framesequence/samples/FrameSequenceSamples/project.properties b/framesequence/samples/FrameSequenceSamples/project.properties
new file mode 100644
index 0000000..ce39f2d
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/framesequence/samples/FrameSequenceSamples/res/drawable-hdpi/ic_launcher.png b/framesequence/samples/FrameSequenceSamples/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/framesequence/samples/FrameSequenceSamples/res/drawable-hdpi/ic_launcher.png differ
diff --git a/framesequence/samples/FrameSequenceSamples/res/drawable-mdpi/ic_launcher.png b/framesequence/samples/FrameSequenceSamples/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/framesequence/samples/FrameSequenceSamples/res/drawable-mdpi/ic_launcher.png differ
diff --git a/framesequence/samples/FrameSequenceSamples/res/drawable-xhdpi/ic_launcher.png b/framesequence/samples/FrameSequenceSamples/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/framesequence/samples/FrameSequenceSamples/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/framesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml b/framesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml
new file mode 100644
index 0000000..0b9a2df
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <ImageView
+            android:id="@+id/imageview"
+            android:layout_width="match_parent"
+            android:layout_height="300dp" />
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        <Button
+                android:id="@+id/start"
+                android:text="@string/start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        <Button
+                android:id="@+id/stop"
+                android:text="@string/stop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        <Button
+                android:id="@+id/vis"
+                android:text="@string/vis"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        <Button
+                android:id="@+id/invis"
+                android:text="@string/invis"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/framesequence/samples/FrameSequenceSamples/res/raw/animated_gif.gif b/framesequence/samples/FrameSequenceSamples/res/raw/animated_gif.gif
new file mode 100644
index 0000000..51baf15
Binary files /dev/null and b/framesequence/samples/FrameSequenceSamples/res/raw/animated_gif.gif differ
diff --git a/framesequence/samples/FrameSequenceSamples/res/raw/animated_webp.webp b/framesequence/samples/FrameSequenceSamples/res/raw/animated_webp.webp
new file mode 100644
index 0000000..25c6a4d
Binary files /dev/null and b/framesequence/samples/FrameSequenceSamples/res/raw/animated_webp.webp differ
diff --git a/framesequence/samples/FrameSequenceSamples/res/values/strings.xml b/framesequence/samples/FrameSequenceSamples/res/values/strings.xml
new file mode 100644
index 0000000..dc0962e
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/res/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- NOTE: all strings should be marked as translatable=false,
+         since this sample app is for testing, and won't be shipped -->
+
+    <string name="app_name" translatable="false">FrameSequence Samples</string>
+    <string name="action_settings" translatable="false">Settings</string>
+
+    <string name="start" translatable="false">start</string>
+    <string name="stop" translatable="false">stop</string>
+    <string name="vis" translatable="false">vis</string>
+    <string name="invis" translatable="false">invis</string>
+
+</resources>
diff --git a/framesequence/samples/FrameSequenceSamples/res/values/styles.xml b/framesequence/samples/FrameSequenceSamples/res/values/styles.xml
new file mode 100644
index 0000000..737bdc3
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/res/values/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    </style>
+
+</resources>
diff --git a/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java b/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java
new file mode 100644
index 0000000..5587dc6
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.framesequence.samples;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.rastermill.FrameSequence;
+import android.support.rastermill.FrameSequenceDrawable;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import java.io.InputStream;
+import java.util.HashSet;
+
+public class FrameSequenceTest extends Activity {
+    FrameSequenceDrawable mDrawable;
+    int mResourceId;
+
+    // This provider is entirely unnecessary, just here to validate the acquire/release process
+    private class CheckingProvider implements FrameSequenceDrawable.BitmapProvider {
+        HashSet<Bitmap> mBitmaps = new HashSet<Bitmap>();
+        @Override
+        public Bitmap acquireBitmap(int minWidth, int minHeight) {
+            Bitmap bitmap =
+                    Bitmap.createBitmap(minWidth + 1, minHeight + 4, Bitmap.Config.ARGB_8888);
+            mBitmaps.add(bitmap);
+            return bitmap;
+        }
+
+        @Override
+        public void releaseBitmap(Bitmap bitmap) {
+            if (!mBitmaps.contains(bitmap)) throw new IllegalStateException();
+            mBitmaps.remove(bitmap);
+            bitmap.recycle();
+        }
+
+        public boolean isEmpty() {
+            return mBitmaps.isEmpty();
+        }
+    }
+
+    final CheckingProvider mProvider = new CheckingProvider();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mResourceId = getIntent().getIntExtra("resourceId", R.raw.animated_gif);
+
+        setContentView(R.layout.basic_test_activity);
+        findViewById(R.id.start).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mDrawable.start();
+            }
+        });
+        findViewById(R.id.stop).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mDrawable.stop();
+            }
+        });
+        findViewById(R.id.vis).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mDrawable.setVisible(true, true);
+            }
+        });
+        findViewById(R.id.invis).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mDrawable.setVisible(false, true);
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        ImageView imageView = (ImageView) findViewById(R.id.imageview);
+        InputStream is = getResources().openRawResource(mResourceId);
+
+        FrameSequence fs = FrameSequence.decodeStream(is);
+        mDrawable = new FrameSequenceDrawable(fs, mProvider);
+        mDrawable.setOnFinishedListener(new FrameSequenceDrawable.OnFinishedListener() {
+            @Override
+            public void onFinished(FrameSequenceDrawable drawable) {
+                Toast.makeText(getApplicationContext(),
+                        "The animation has finished", Toast.LENGTH_SHORT).show();
+            }
+        });
+        imageView.setImageDrawable(mDrawable);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ImageView imageView = (ImageView) findViewById(R.id.imageview);
+
+        mDrawable.destroy();
+        if (!mProvider.isEmpty()) throw new IllegalStateException("All bitmaps not recycled");
+
+        mDrawable = null;
+        imageView.setImageDrawable(null);
+
+    }
+}
diff --git a/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/SamplesList.java b/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/SamplesList.java
new file mode 100644
index 0000000..c67b83c
--- /dev/null
+++ b/framesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/SamplesList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.framesequence.samples;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SamplesList extends ListActivity {
+
+    static final String KEY_NAME = "name";
+    static final String KEY_CLASS = "clazz";
+    static final String KEY_RESOURCE = "res";
+
+    static Map<String,?> makeSample(String name, Class<?> activity, int resourceId) {
+        Map<String,Object> ret = new HashMap<String,Object>();
+        ret.put(KEY_NAME, name);
+        ret.put(KEY_CLASS, activity);
+        ret.put(KEY_RESOURCE, resourceId);
+        return ret;
+    }
+
+    @SuppressWarnings("serial")
+    static final ArrayList<Map<String,?>> SAMPLES = new ArrayList<Map<String,?>>() {{
+            add(makeSample("GIF animation", FrameSequenceTest.class, R.raw.animated_gif));
+            add(makeSample("WEBP animation", FrameSequenceTest.class, R.raw.animated_webp));
+    }};
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setListAdapter(new SimpleAdapter(this, SAMPLES,
+                android.R.layout.simple_list_item_1, new String[] { KEY_NAME },
+                new int[] { android.R.id.text1 }));
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Class<?> clazz = (Class<?>) SAMPLES.get(position).get(KEY_CLASS);
+        int resourceId = ((Integer) SAMPLES.get(position).get(KEY_RESOURCE)).intValue();
+
+        Intent intent = new Intent(this, clazz);
+        intent.putExtra("resourceId", resourceId);
+        startActivity(intent);
+    }
+
+}
diff --git a/framesequence/samples/RastermillSamples/Android.mk b/framesequence/samples/RastermillSamples/Android.mk
deleted file mode 100644
index bb8920f..0000000
--- a/framesequence/samples/RastermillSamples/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := FrameSequenceSample
-
-# java dependency
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-framesequence
-
-# native dependency
-ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libframesequence
-else
-  LOCAL_REQUIRED_MODULES := libframesequence
-endif
-
-# proguard for framesequence library code
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_SDK_VERSION := 19
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.rastermill.samples
-
-include $(BUILD_PACKAGE)
diff --git a/framesequence/samples/RastermillSamples/AndroidManifest.xml b/framesequence/samples/RastermillSamples/AndroidManifest.xml
deleted file mode 100644
index b554021..0000000
--- a/framesequence/samples/RastermillSamples/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.rastermill.samples"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="18" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <activity
-            android:name=".SamplesList"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".AnimatedGifTest" />
-    </application>
-
-</manifest>
diff --git a/framesequence/samples/RastermillSamples/build.xml b/framesequence/samples/RastermillSamples/build.xml
deleted file mode 100644
index 5e55b4e..0000000
--- a/framesequence/samples/RastermillSamples/build.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="RastermillSamples" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <target name="-pre-build">
-        <ant dir="../../" target="release" inheritAll="false" />
-        <copy todir="libs">
-            <fileset dir="../../exported_libs" />
-        </copy>
-    </target>
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/framesequence/samples/RastermillSamples/proguard.flags b/framesequence/samples/RastermillSamples/proguard.flags
deleted file mode 100644
index 4acde2d..0000000
--- a/framesequence/samples/RastermillSamples/proguard.flags
+++ /dev/null
@@ -1,3 +0,0 @@
--keep class android.support.rastermill.** {
-  *;
-}
diff --git a/framesequence/samples/RastermillSamples/project.properties b/framesequence/samples/RastermillSamples/project.properties
deleted file mode 100644
index ce39f2d..0000000
--- a/framesequence/samples/RastermillSamples/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18
diff --git a/framesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png b/framesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e..0000000
Binary files a/framesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/framesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png b/framesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/framesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/framesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png b/framesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/framesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/framesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml b/framesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
deleted file mode 100644
index 0b9a2df..0000000
--- a/framesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <ImageView
-            android:id="@+id/imageview"
-            android:layout_width="match_parent"
-            android:layout_height="300dp" />
-    <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        <Button
-                android:id="@+id/start"
-                android:text="@string/start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        <Button
-                android:id="@+id/stop"
-                android:text="@string/stop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        <Button
-                android:id="@+id/vis"
-                android:text="@string/vis"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        <Button
-                android:id="@+id/invis"
-                android:text="@string/invis"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/framesequence/samples/RastermillSamples/res/raw/animated.gif b/framesequence/samples/RastermillSamples/res/raw/animated.gif
deleted file mode 100644
index 51baf15..0000000
Binary files a/framesequence/samples/RastermillSamples/res/raw/animated.gif and /dev/null differ
diff --git a/framesequence/samples/RastermillSamples/res/values/strings.xml b/framesequence/samples/RastermillSamples/res/values/strings.xml
deleted file mode 100644
index 811c979..0000000
--- a/framesequence/samples/RastermillSamples/res/values/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- NOTE: all strings should be marked as translatable=false,
-         since this sample app is for testing, and won't be shipped -->
-
-    <string name="app_name" translatable="false">Rastermill Samples</string>
-    <string name="action_settings" translatable="false">Settings</string>
-
-    <string name="start" translatable="false">start</string>
-    <string name="stop" translatable="false">stop</string>
-    <string name="vis" translatable="false">vis</string>
-    <string name="invis" translatable="false">invis</string>
-
-</resources>
diff --git a/framesequence/samples/RastermillSamples/res/values/styles.xml b/framesequence/samples/RastermillSamples/res/values/styles.xml
deleted file mode 100644
index 737bdc3..0000000
--- a/framesequence/samples/RastermillSamples/res/values/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-    </style>
-
-</resources>
diff --git a/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java b/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
deleted file mode 100644
index 2328975..0000000
--- a/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.rastermill.samples;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.support.rastermill.FrameSequence;
-import android.support.rastermill.FrameSequenceDrawable;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import java.io.InputStream;
-import java.util.HashSet;
-
-public class AnimatedGifTest extends Activity {
-    FrameSequenceDrawable mDrawable;
-
-    // This provider is entirely unnecessary, just here to validate the acquire/release process
-    private class CheckingProvider implements FrameSequenceDrawable.BitmapProvider {
-        HashSet<Bitmap> mBitmaps = new HashSet<Bitmap>();
-        @Override
-        public Bitmap acquireBitmap(int minWidth, int minHeight) {
-            Bitmap bitmap =
-                    Bitmap.createBitmap(minWidth + 1, minHeight + 4, Bitmap.Config.ARGB_8888);
-            mBitmaps.add(bitmap);
-            return bitmap;
-        }
-
-        @Override
-        public void releaseBitmap(Bitmap bitmap) {
-            if (!mBitmaps.contains(bitmap)) throw new IllegalStateException();
-            mBitmaps.remove(bitmap);
-            bitmap.recycle();
-        }
-
-        public boolean isEmpty() {
-            return mBitmaps.isEmpty();
-        }
-    }
-
-    final CheckingProvider mProvider = new CheckingProvider();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.basic_test_activity);
-        findViewById(R.id.start).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mDrawable.start();
-            }
-        });
-        findViewById(R.id.stop).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mDrawable.stop();
-            }
-        });
-        findViewById(R.id.vis).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mDrawable.setVisible(true, true);
-            }
-        });
-        findViewById(R.id.invis).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mDrawable.setVisible(false, true);
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        ImageView imageView = (ImageView) findViewById(R.id.imageview);
-        InputStream is = getResources().openRawResource(R.raw.animated);
-
-        FrameSequence fs = FrameSequence.decodeStream(is);
-        mDrawable = new FrameSequenceDrawable(fs, mProvider);
-        mDrawable.setOnFinishedListener(new FrameSequenceDrawable.OnFinishedListener() {
-            @Override
-            public void onFinished(FrameSequenceDrawable drawable) {
-                Toast.makeText(getApplicationContext(),
-                        "THE ANIMATION HAS FINISHED", Toast.LENGTH_SHORT).show();
-            }
-        });
-        imageView.setImageDrawable(mDrawable);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        ImageView imageView = (ImageView) findViewById(R.id.imageview);
-
-        mDrawable.destroy();
-        if (!mProvider.isEmpty()) throw new IllegalStateException("All bitmaps not recycled");
-
-        mDrawable = null;
-        imageView.setImageDrawable(null);
-
-    }
-}
diff --git a/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java b/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java
deleted file mode 100644
index 0447537..0000000
--- a/framesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.rastermill.samples;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SamplesList extends ListActivity {
-
-    static final String KEY_NAME = "name";
-    static final String KEY_CLASS = "clazz";
-
-    static Map<String,?> makeSample(String name, Class<?> activity) {
-        Map<String,Object> ret = new HashMap<String,Object>();
-        ret.put(KEY_NAME, name);
-        ret.put(KEY_CLASS, activity);
-        return ret;
-    }
-
-    @SuppressWarnings("serial")
-    static final ArrayList<Map<String,?>> SAMPLES = new ArrayList<Map<String,?>>() {{
-        add(makeSample("Animation Test", AnimatedGifTest.class));
-    }};
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setListAdapter(new SimpleAdapter(this, SAMPLES,
-                android.R.layout.simple_list_item_1, new String[] { KEY_NAME },
-                new int[] { android.R.id.text1 }));
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        Class<?> clazz = (Class<?>) SAMPLES.get(position).get(KEY_CLASS);
-        startActivity(new Intent(this, clazz));
-    }
-
-}
diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
index cda0cfe..351b8a3 100644
--- a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
+++ b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
@@ -270,9 +270,6 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna
     protected void finalize() throws Throwable {
         try {
             mFrameSequenceState.destroy();
-            if (!mDestroyed) {
-                destroy();
-            }
         } finally {
             super.finalize();
         }
-- 
cgit v1.2.3