From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 15 Jun 2015 11:43:17 +0000 (+0200)
Subject: Merge branch 'develop' into navigationDrawer_basic
X-Git-Tag: oc-android-1.7.2~1^2~23^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66f3a45d050c27e41296ddc9083d968cfd8803a4?hp=--cc

Merge branch 'develop' into navigationDrawer_basic

Conflicts FIXED:
	res/layout/files.xml
---

66f3a45d050c27e41296ddc9083d968cfd8803a4
diff --cc res/layout/files.xml
index 268ee514,3f3617bc..649c863a
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@@ -16,40 -16,29 +16,43 @@@
  
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 - -->
 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +  -->
 +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +    android:id="@+id/drawer_layout"
      android:layout_width="match_parent"
      android:layout_height="match_parent"
 -    android:background="@color/background_color"
 -    android:orientation="horizontal"
 -    android:baselineAligned="false"
 -    android:id="@+id/ListLayout"
 -    android:contentDescription="@string/list_layout"
 -    >
 -
 -	<FrameLayout 
 -		android:layout_width="0dp"
 -		android:layout_height="match_parent"
 -		android:layout_weight="1"
 -		android:id="@+id/left_fragment_container"
 -	    />
 -	
 -	<FrameLayout 
 -		android:layout_width="0dp"
 -		android:layout_height="match_parent"
 -		android:layout_weight="2"
 -		android:id="@+id/right_fragment_container"
 -	    />
 -	
 - </LinearLayout>
 +    android:clickable="true" >
 +
 +    <!-- The main content view -->
 +    <LinearLayout
 +        xmlns:android="http://schemas.android.com/apk/res/android"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
 +        android:background="@color/background_color"
 +        android:baselineAligned="false"
-         android:orientation="horizontal" >
++        android:orientation="horizontal"
++        android:id="@+id/ListLayout"
++        android:contentDescription="@string/list_layout"
++        >
 +
 +
 +        <FrameLayout
 +            android:id="@+id/left_fragment_container"
 +            android:layout_width="0dp"
 +            android:layout_height="match_parent"
 +            android:layout_weight="1" />
 +
 +        <FrameLayout
 +            android:id="@+id/right_fragment_container"
 +            android:layout_width="0dp"
 +            android:layout_height="match_parent"
 +            android:layout_weight="2" />
 +    </LinearLayout>
 +
 +    <include
 +        layout="@layout/drawer"
 +        android:layout_width="240dp"
 +        android:layout_height="match_parent"
 +        android:layout_gravity="start"/>
 +
- </android.support.v4.widget.DrawerLayout>
++</android.support.v4.widget.DrawerLayout>