[Android] Useless <merge>

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Mar  2 16:02:29 2015 +0100| [d35fc4831e239ebacd76596c06c9f593c02b735f] | committer: Geoffrey Métais

Useless <merge>

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

 vlc-android/res/layout/sidebar.xml |  165 ++++++++++++++++++------------------
 1 file changed, 82 insertions(+), 83 deletions(-)

diff --git a/vlc-android/res/layout/sidebar.xml b/vlc-android/res/layout/sidebar.xml
index 5293f2e..ca5375b 100644
--- a/vlc-android/res/layout/sidebar.xml
+++ b/vlc-android/res/layout/sidebar.xml
@@ -1,90 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout
-        android:id="@+id/side_menu"
-        android:layout_width="208dp"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/side_menu"
+    android:layout_width="208dp"
+    android:layout_height="match_parent"
+    android:layout_gravity="start"
+    android:background="?attr/background_menu">
+    <ListView
+        android:id="@+id/sidelist"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="?attr/background_menu">
-        <ListView
-            android:id="@+id/sidelist"
-            android:layout_width="208dp"
-            android:layout_height="match_parent"
-            android:paddingTop="?attr/actionBarSize"
-            android:cacheColorHint="#0000"
-            android:layout_above="@+id/sidebar_separator_settings"
-            android:nextFocusForward="@id/sidelist"
-            android:nextFocusUp="@id/sidelist"
-            android:nextFocusDown="@id/sidelist"
-            android:nextFocusLeft="@id/sidelist"
-            android:nextFocusRight="@id/sidelist" >
-        </ListView>
+        android:focusable="true"
+        android:paddingTop="?attr/actionBarSize"
+        android:layout_above="@+id/sidebar_separator_settings"
+        android:nextFocusForward="@id/sidelist"
+        android:nextFocusUp="@id/sidelist"
+        android:nextFocusDown="@id/sidelist"
+        android:nextFocusLeft="@id/sidelist"
+        android:nextFocusRight="@id/sidelist" >
+    </ListView>
 
-        <View
-            android:id="@+id/sidebar_separator_settings"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_above="@+id/settings"
-            android:background="?attr/playlist_item_footer" />
+    <View
+        android:id="@+id/sidebar_separator_settings"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_above="@+id/settings"
+        android:background="?attr/playlist_item_footer" />
 
-        <ImageView
-            android:id="@+id/settings_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_alignParentLeft="true"
-            android:layout_above="@+id/about_icon"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginRight="5dp"
-            android:clickable="true"
-            android:onClick="onClick"
-            android:src="?attr/ic_menu_preferences"/>
+    <ImageView
+        android:id="@+id/settings_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignParentLeft="true"
+        android:layout_above="@+id/about_icon"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="5dp"
+        android:clickable="true"
+        android:onClick="onClick"
+        android:src="?attr/ic_menu_preferences"/>
 
-        <TextView
-            android:id="@+id/settings"
-            android:layout_width="match_parent"
-            android:layout_height="32dp"
-            android:layout_toRightOf="@+id/settings_icon"
-            android:layout_above="@+id/about_icon"
-            android:gravity="left|center_vertical"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:clickable="true"
-            android:onClick="onClick"
-            android:text="@string/preferences"
-            android:textColor="?attr/list_menu"
-            android:textSize="16sp"
-            android:fontFamily="sans-serif"/>
+    <TextView
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:layout_toRightOf="@+id/settings_icon"
+        android:layout_above="@+id/about_icon"
+        android:gravity="left|center_vertical"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:clickable="true"
+        android:onClick="onClick"
+        android:text="@string/preferences"
+        android:textColor="?attr/list_menu"
+        android:textSize="16sp"
+        android:fontFamily="sans-serif"/>
 
-        <ImageView
-            android:id="@+id/about_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginRight="5dp"
-            android:clickable="true"
-            android:onClick="onClick"
-            android:src="?attr/ic_menu_cone"/>
+    <ImageView
+        android:id="@+id/about_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="5dp"
+        android:clickable="true"
+        android:onClick="onClick"
+        android:src="?attr/ic_menu_cone"/>
+
+    <TextView
+        android:id="@+id/about"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:layout_toRightOf="@+id/about_icon"
+        android:layout_alignParentBottom="true"
+        android:gravity="left|center_vertical"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:clickable="true"
+        android:onClick="onClick"
+        android:text="@string/about"
+        android:textColor="?attr/list_menu"
+        android:textSize="16sp"
+        android:fontFamily="sans-serif"/>
+</RelativeLayout>
 
-        <TextView
-            android:id="@+id/about"
-            android:layout_width="match_parent"
-            android:layout_height="32dp"
-            android:layout_toRightOf="@+id/about_icon"
-            android:layout_alignParentBottom="true"
-            android:gravity="left|center_vertical"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:clickable="true"
-            android:onClick="onClick"
-            android:text="@string/about"
-            android:textColor="?attr/list_menu"
-            android:textSize="16sp"
-            android:fontFamily="sans-serif"/>
-    </RelativeLayout>
-</merge>