summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-06-19 14:35:06 +0800
committerOwen Lin <owenlin@google.com>2012-06-19 14:35:06 +0800
commit0b4e90974bb2f171ec3b684c10d8b9c4d97afbde (patch)
treeed38c06b57729e76826ca27db7300d7cb919ebe5 /src
parent6dd670997a88fe7502f9ce0e4f9c872b7352027f (diff)
downloadandroid_packages_apps_Gallery2-0b4e90974bb2f171ec3b684c10d8b9c4d97afbde.tar.gz
android_packages_apps_Gallery2-0b4e90974bb2f171ec3b684c10d8b9c4d97afbde.tar.bz2
android_packages_apps_Gallery2-0b4e90974bb2f171ec3b684c10d8b9c4d97afbde.zip
Make SystemUI always consists with the contrller overlay.
Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/MoviePlayer.java11
-rw-r--r--src/com/android/gallery3d/app/TimeBar.java1
2 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 13a77f472..11b40bdf8 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -86,9 +86,6 @@ public class MoviePlayer implements
// If the time bar is visible.
private boolean mShowing;
- // Control when system UI can be shown
- private boolean mAllowShowingSystemUI;
-
private final Runnable mPlayingChecker = new Runnable() {
@Override
public void run() {
@@ -162,7 +159,6 @@ public class MoviePlayer implements
mLastSystemUiVis = visibility;
if ((diff & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
&& (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
- mAllowShowingSystemUI = true;
mController.show();
// We need to set the background to clear ghosting images
@@ -371,12 +367,7 @@ public class MoviePlayer implements
public void onShown() {
mShowing = true;
setProgress();
-
- // System UI is invisible by default until the flag is set by user interaction
- // See VideoView's onSystemUiVisibilityChange listener for details.
- if (mAllowShowingSystemUI) {
- showSystemUi(true);
- }
+ showSystemUi(true);
}
@Override
diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java
index 1f5bfd96b..1f3630622 100644
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -255,6 +255,7 @@ public class TimeBar extends View {
return true;
}
break;
+ case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
if (scrubbing) {
listener.onScrubbingEnd(getScrubberTime());