[Android] Layout optimization

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Oct 22 18:11:24 2015 +0200| [f552025fc0552f35ef24e96ff95c16629375e13b] | committer: Geoffrey Métais

Layout optimization

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

 vlc-android/res/layout/main.xml      |    8 ++------
 vlc-android/res/layout/secondary.xml |    8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/vlc-android/res/layout/main.xml b/vlc-android/res/layout/main.xml
index 67310d2..9b296e4 100644
--- a/vlc-android/res/layout/main.xml
+++ b/vlc-android/res/layout/main.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <org.videolan.vlc.widget.HackyDrawerLayout
         android:id="@+id/root_container"
@@ -100,4 +96,4 @@
     </org.videolan.vlc.widget.HackyDrawerLayout>
 
     <include layout="@layout/toolbar"/>
-</FrameLayout>
+</merge>
diff --git a/vlc-android/res/layout/secondary.xml b/vlc-android/res/layout/secondary.xml
index 462c232..98e1440 100644
--- a/vlc-android/res/layout/secondary.xml
+++ b/vlc-android/res/layout/secondary.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.android.widget.SlidingPaneLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,4 +39,4 @@
     </com.android.widget.SlidingPaneLayout>
 
     <include layout="@layout/toolbar"/>
-</FrameLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file