[Android] Fix status bar display

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Dec 16 17:55:08 2014 +0100| [1c5f32cf6815ac9f73d8a941a673db4d3c988e0a] | committer: Jean-Baptiste Kempf

Fix status bar display

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

 vlc-android/res/layout-v17/player_action_bar.xml                |    1 -
 vlc-android/res/layout/player_action_bar.xml                    |    7 ++-----
 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java     |    4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/vlc-android/res/layout-v17/player_action_bar.xml b/vlc-android/res/layout-v17/player_action_bar.xml
index 72f5ba5..ea731f6 100644
--- a/vlc-android/res/layout-v17/player_action_bar.xml
+++ b/vlc-android/res/layout-v17/player_action_bar.xml
@@ -12,7 +12,6 @@
         android:background="?attr/status_bar_overlay"
         android:text="@string/title"
         android:textColor="#ffffff"
-        android:layout_marginTop="10dp"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
         android:textSize="15sp"
diff --git a/vlc-android/res/layout/player_action_bar.xml b/vlc-android/res/layout/player_action_bar.xml
index 01175ae..174a898 100644
--- a/vlc-android/res/layout/player_action_bar.xml
+++ b/vlc-android/res/layout/player_action_bar.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="fill_parent"
     android:layout_alignParentTop="true"
-    android:layout_gravity="top"
     android:background="?attr/video_player_overlay"
-    android:layout_marginTop="10dp"
     android:paddingLeft="5dp"
     android:paddingRight="5dp" >
 
     <TextView
         android:id="@+id/player_overlay_title"
         android:layout_width="0dp"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="center_horizontal"
         android:text="@string/title"
         android:textColor="#ffffff"
         android:textSize="15sp" />
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 5bd3492..1872c6e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -2069,10 +2069,7 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
 
         if (!AndroidDevices.hasCombBar() && LibVlcUtil.isJellyBeanOrLater()) {
             visibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
-            navbar = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
         }
-        visibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
-
         if (dim) {
             navbar |= View.SYSTEM_UI_FLAG_LOW_PROFILE;
             if (!AndroidDevices.hasCombBar()) {
@@ -2082,6 +2079,7 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
                 visibility |= View.SYSTEM_UI_FLAG_FULLSCREEN;
             }
         } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             visibility |= View.SYSTEM_UI_FLAG_VISIBLE;
         }