From df1ba3594b4b536b16078da935e585b795ed8817 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 30 May 2014 20:27:56 +0200 Subject: Android: add support for extracting AnimationDrawable Required for implementing indeterminate ProgressBar Task-number: QTBUG-39215 Change-Id: I128eaf2879dd493da86541767a870ea786a5ddf9 Reviewed-by: BogDan Vatra --- .../org/qtproject/qt5/android/ExtractStyle.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/android/jar') diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java index cd67c95264..3e98d4ec32 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -66,6 +66,7 @@ import android.graphics.NinePatch; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ClipDrawable; import android.graphics.drawable.ColorDrawable; @@ -654,6 +655,27 @@ public class ExtractStyle { return json; } + private JSONObject getAnimationDrawable(AnimationDrawable drawable, String filename) { + JSONObject json = new JSONObject(); + try { + json.put("type", "animation"); + json.put("oneshot", drawable.isOneShot()); + final int count = drawable.getNumberOfFrames(); + JSONArray frames = new JSONArray(); + for (int i = 0; i < count; ++i) + { + JSONObject frame = new JSONObject(); + frame.put("duration", drawable.getDuration(i)); + frame.put("drawable", getDrawable(drawable.getFrame(i), filename+"__"+i)); + frames.put(frame); + } + json.put("frames", frames); + } catch (Exception e) { + e.printStackTrace(); + } + return json; + } + private JSONObject getJsonRect(Rect rect) throws JSONException { JSONObject jsonRect = new JSONObject(); @@ -743,6 +765,10 @@ public class ExtractStyle { { return getRotateDrawable((RotateDrawable) drawable, filename); } + if (drawable instanceof AnimationDrawable) + { + return getAnimationDrawable((AnimationDrawable) drawable, filename); + } if (drawable instanceof ClipDrawable) { try { -- cgit v1.2.3