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?ds=inline;hp=-c

Merge branch 'develop' into navigationDrawer_basic

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

66f3a45d050c27e41296ddc9083d968cfd8803a4
diff --combined res/layout/files.xml
index 268ee514,3f3617bc..649c863a
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="utf-8"?>
 -<!-- 
 +<!--
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
@@@ -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>
diff --combined res/values/strings.xml
index a4298087,5b19c75c..7d180be4
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -20,14 -20,6 +20,14 @@@
      	<!-- TODO re-enable when server-side folder size calculation is available   
      	<item>Biggest - Smallest</item>  -->
      </string-array>
 +    <!-- TODO re-enable when "Accounts" is available in Navigation Drawer -->
 +    <!--<string name="drawer_item_accounts">Accounts</string>-->
 +    <string name="drawer_item_all_files">All files</string>
 +    <!-- TODO re-enable when "On Device" is available
 +    <string name="drawer_item_on_device">On device</string>-->
 +    <string name="drawer_item_settings">Settings</string>
 +    <string name="drawer_item_logs">Logs</string>
 +	<string name="drawer_close">Close</string>
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_more">More</string>
      <string name="prefs_accounts">Accounts</string>
@@@ -86,6 -78,7 +86,7 @@@
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh file</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
+     <string name="list_layout">List Layout</string>
      <string name="action_share_file">Share link</string>
      <string name="action_unshare_file">Unshare link</string>
      <string name="common_yes">Yes</string>
@@@ -338,14 -331,10 +339,14 @@@
  	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
      <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
  
 -	<string name="subject_token">%1$s shared \"%2$s\" with you</string>
 +	<string name="shared_subject_header">shared</string>
 +	<string name="with_you_subject_header">with you</string>
 +    
 +	<string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
  
      <string name="auth_refresh_button">Refresh connection</string>
      <string name="auth_host_address">Server address</string>
      <string name="common_error_out_memory">Not enough memory</string>
  
 +    <string name="username">Username</string>
  </resources>