diff options
author | wjiang <wjiang@codeaurora.org> | 2014-02-14 17:45:53 +0800 |
---|---|---|
committer | Xiaojing Zhang <zhangx@codeaurora.org> | 2014-11-04 20:38:14 -0800 |
commit | 47184c7b2bfb477a1ff800ac8a463478e4674dd9 (patch) | |
tree | c7646ed7247010ca7d483d93e37d2b99c90c20b9 /src/com/android/gallery3d/app/MoviePlayer.java | |
parent | 99cfa4d1f436735ec403b1e1dbb4167b26d43cd9 (diff) | |
download | android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.tar.gz android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.tar.bz2 android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.zip |
Gallery2: Fix batches of issues in movie effects
Fix following issues:
- All settings aren't restored to previous state when user cancel
his operations.
- Check the validity to avoid calling member function of an already
released object.
- Recycle effect instance when MovieActivity pauses.
- Don't restore strength from pref when toggling switch.
- Force the Effect's dialog to be uncancelable.
- Fix null pointer and effect leak issue due to CMCC features.
- Fix audio effects dialog display on small screens.
- Recognize bluetooth headset.
- Update visual design.
Conflicts:
src/com/android/gallery3d/ui/Knob.java
Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1
Diffstat (limited to 'src/com/android/gallery3d/app/MoviePlayer.java')
-rwxr-xr-x | src/com/android/gallery3d/app/MoviePlayer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 3afd32abf..48818a8bb 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1099,6 +1099,7 @@ public class MoviePlayer implements mVideoView.stopPlayback(); mVideoView.setVisibility(View.INVISIBLE); clearVideoInfo(); + mActivityContext.releaseEffects(); mMovieItem = next; mActivityContext.refreshMovieInfo(mMovieItem); doStartVideo(false, 0, 0); @@ -1135,6 +1136,7 @@ public class MoviePlayer implements mVideoView.setVisibility(View.INVISIBLE); mVideoView.setVisibility(View.VISIBLE); clearVideoInfo(); + mActivityContext.releaseEffects(); mFirstBePlayed = false; mController.setCanReplay(true); mController.showEnded(); |