History log of /packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
70df03bea1eb05ac5adf9c5425e5e4a0cc6aed16 20-Aug-2013 ztenghui <ztenghui@google.com> Check whether save button should be enabled when time bar updates

bug:10260216

Change-Id: Ic9714d5b5415ddc6f181bf2caf9efedf3fd871ac
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
8b9de91b3c01664b24deda202acb5db8594db503 08-Apr-2013 ztenghui <ztenghui@google.com> Use MediaMuxer for the video trim and mute.

bug:8548085

Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
2abaaf7caa9a83ba1ea759868aabde7f21387184 12-Dec-2012 John Reck <jreck@google.com> remove actionbar sherlock

Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
b5f374c30d06dc0409891f85a4bd5e1e3ddf8700 13-Nov-2012 Teng-Hui Zhu <ztenghui@google.com> Video: Fix crash in trimming/muting video in GB.

Basically switched to use sherlock actionbar and protect various new methods
with API level check.

bug:7546257

Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
648b339c74da2b863304ffc61c8528cc74c2afb3 13-Nov-2012 Teng-Hui Zhu <ztenghui@google.com> Video: Add the mute functionality.

1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.

bug:7543943

Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
bf1677a434760fcb7389a30c18e05cc3e7926d40 29-Oct-2012 Doris Liu <tianliu@google.com> Disable save button when there's no modification

Bug: 7353884
Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
89c755cbe16f5fe6f57be429a850331cc67a46d5 25-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Initialize the modified date correctly.

On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.

bug:7307090

Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
b7a0b0926258acc67c9d447c880b9ae8be96333d 16-Oct-2012 Doris Liu <tianliu@google.com> Make save button in video trimming consistent

Bug: 7353884

Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
2833355c86cff90163457779adb2bc78a6ca0faa 02-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: Exit current activity after click done

Don't auto exit the trimmed video playing.
bug:7093055

Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
d44b0d8348a9f91259ecbd59ec48c9df9f058141 29-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: clean up strings and prevent too short or no trimming.

Also view the result if the activity is not stopped.
bug:7093055

Change-Id: If244d567a4be9da22542398f6b7c22a081786339
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
4450e439731d12638525c86a36cd26ac97bdc735 28-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: Use OnClickListener for saving

bug:7093055

Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
028ecd4e3bbd68c3b5b2fb91d3e7a666bc151765 27-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: clean up the UI for trimming.

Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.

bug:7093240

Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
5e92668f42b5f29a0e55653b0bbf2df342723a6d 26-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: switch to use sherlock action bar

Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.

bug:7093240

Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2 24-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> The trimming solution with the mp4parser library.

bug:7093055

Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java
3f1f1baf3a674927e25cd5cd885fb372796bd3a0 24-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> 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
/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java