diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-08-24 14:50:37 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-09-11 10:36:05 -0700 |
| commit | e7d37f56af35bbbb4a86392328a82cc4680aff47 (patch) | |
| tree | ec6fe9d44605dd92827d42e094f587cf1dfd8338 /AndroidManifest.xml | |
| parent | 9b095a3b59740534cf528db2b179b30fef267663 (diff) | |
| download | android_packages_apps_Snap-e7d37f56af35bbbb4a86392328a82cc4680aff47.tar.gz android_packages_apps_Snap-e7d37f56af35bbbb4a86392328a82cc4680aff47.tar.bz2 android_packages_apps_Snap-e7d37f56af35bbbb4a86392328a82cc4680aff47.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 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 778830b65..f29240a8a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -208,6 +208,9 @@ <category android:name="android.intent.category.SELECTED_ALTERNATIVE" /> </intent-filter> </activity> + <activity android:name="com.android.gallery3d.app.TrimVideo" + android:label="@string/trim_label"> + </activity> <activity android:name="com.android.gallery3d.photoeditor.PhotoEditor" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" |