summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com/android/gallery3d
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-08-24 14:50:37 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-09-11 10:36:05 -0700
commit25930913dc7129a1e6d07a88f9b79d69029d2535 (patch)
treed8d5efe785696d0ffd4b894c5f1113fc529d0680 /gallerycommon/src/com/android/gallery3d
parent1a980d945c8715de18bdbe6406599503d812185f (diff)
downloadandroid_packages_apps_Snap-25930913dc7129a1e6d07a88f9b79d69029d2535.tar.gz
android_packages_apps_Snap-25930913dc7129a1e6d07a88f9b79d69029d2535.tar.bz2
android_packages_apps_Snap-25930913dc7129a1e6d07a88f9b79d69029d2535.zip
Add the UI elements for video trim activity.
1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d')
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/ApiHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
index 68aa50dda..20d7e1dc6 100644
--- a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
+++ b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
@@ -160,6 +160,9 @@ public class ApiHelper {
public static final boolean CAN_USE_FLAG_SECURE =
Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
+ public static final boolean HAS_MEDIA_MUXER =
+ Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1;
+
public static int getIntFieldIfExists(Class<?> klass, String fieldName,
Class<?> obj, int defaultVal) {
try {