[Android] VideoPlayer: fix overlay not displayed when locked

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Oct  6 10:40:52 2015 +0200| [ad34ae374dbb6e8dfa1c4a78bbbee4ef0e2b24f1] | committer: Thomas Guillem

VideoPlayer: fix overlay not displayed when locked

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=ad34ae374dbb6e8dfa1c4a78bbbee4ef0e2b24f1
---

 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java     |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index da26ba0..e562a81 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -2277,8 +2277,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                 if (mAdvOptions !=null)
                     mAdvOptions.setVisibility(View.VISIBLE);
                 mSize.setVisibility(View.VISIBLE);
-                dimStatusBar(false);
             }
+            dimStatusBar(false);
             mOverlayProgress.setVisibility(View.VISIBLE);
             if (mPresentation != null) mOverlayBackground.setVisibility(View.VISIBLE);
         }
@@ -2346,7 +2346,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
             navbar = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
         }
         visibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
-        if (dim) {
+        if (dim || mIsLocked) {
             navbar |= View.SYSTEM_UI_FLAG_LOW_PROFILE;
             if (!AndroidDevices.hasCombBar()) {
                 navbar |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
@@ -2354,7 +2354,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                     visibility |= View.SYSTEM_UI_FLAG_IMMERSIVE;
                 visibility |= View.SYSTEM_UI_FLAG_FULLSCREEN;
             }
-        } else {
+        }
+        if (!dim) {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             visibility |= View.SYSTEM_UI_FLAG_VISIBLE;
         }