[Android] Move the DVD menu button back on top

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Feb 26 17:34:12 2016 +0100| [8bb13f134ac439ddf25605a262e68c89102d9584] | committer: Geoffrey Métais

Move the DVD menu button back on top

> https://code.videolan.org/videolan/vlc-android/commit/8bb13f134ac439ddf25605a262e68c89102d9584
---

 vlc-android/res/layout-v16/player_action_bar.xml | 14 +++++++++++++-
 vlc-android/res/layout/player_action_bar.xml     | 11 +++++++++++
 vlc-android/res/layout/player_hud.xml            | 11 -----------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/vlc-android/res/layout-v16/player_action_bar.xml b/vlc-android/res/layout-v16/player_action_bar.xml
index 09173c9..841c5e1 100644
--- a/vlc-android/res/layout-v16/player_action_bar.xml
+++ b/vlc-android/res/layout-v16/player_action_bar.xml
@@ -25,8 +25,20 @@
         android:id="@+id/playlist_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_toLeftOf="@+id/player_overlay_navmenu"
         android:src="@drawable/ic_playlist_circle"
         android:focusable="true"
         android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/player_overlay_navmenu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:clickable="true"
+        android:src="@drawable/ic_navmenu_circle"
+        android:layout_alignParentRight="true"
+        android:scaleType="center"
+        android:focusable="true"
+        android:visibility="gone" />
 </RelativeLayout>
diff --git a/vlc-android/res/layout/player_action_bar.xml b/vlc-android/res/layout/player_action_bar.xml
index 039ca66..54a6dae 100644
--- a/vlc-android/res/layout/player_action_bar.xml
+++ b/vlc-android/res/layout/player_action_bar.xml
@@ -38,7 +38,18 @@
         android:id="@+id/playlist_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginRight="5dp"
         android:src="@drawable/ic_playlist_circle"
         android:focusable="true"
         android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/player_overlay_navmenu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:src="@drawable/ic_navmenu_circle"
+        android:scaleType="center"
+        android:focusable="true"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/vlc-android/res/layout/player_hud.xml b/vlc-android/res/layout/player_hud.xml
index 4f0f61e..954afaf 100644
--- a/vlc-android/res/layout/player_hud.xml
+++ b/vlc-android/res/layout/player_hud.xml
@@ -118,17 +118,6 @@
             android:visibility="gone" />
 
         <ImageView
-            android:id="@+id/player_overlay_navmenu"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:clickable="true"
-            android:src="@drawable/ic_navmenu_circle"
-            android:scaleType="center"
-            android:focusable="true"
-            android:visibility="gone" />
-
-        <ImageView
             android:id="@+id/player_overlay_adv_function"
             android:layout_width="0dp"
             android:layout_height="match_parent"