Merge branch 'develop' into navigationDrawer_basic

Conflicts FIXED:
	res/layout/files.xml

diff --combined res/layout/files.xml
index 268ee51,3f3617b..649c863
--- 1/res/layout/files.xml
--- 2/res/layout/files.xml
+++ b/res/layout/files.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="utf-8"?>\r
 -<!-- \r
 +<!--\r
    ownCloud Android client application\r
  \r
    Copyright (C) 2012  Bartek Przybylski\r
@@@ -16,40 -16,29 +16,43 @@@
  \r
    You should have received a copy of the GNU General Public License\r
    along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 - -->\r
 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
 +  -->\r
 +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
 +    android:id="@+id/drawer_layout"\r
      android:layout_width="match_parent"\r
      android:layout_height="match_parent"\r
 -    android:background="@color/background_color"\r
 -    android:orientation="horizontal"\r
 -    android:baselineAligned="false"\r
 -    android:id="@+id/ListLayout"\r
 -    android:contentDescription="@string/list_layout"\r
 -    >\r
 -\r
 -      <FrameLayout \r
 -              android:layout_width="0dp"\r
 -              android:layout_height="match_parent"\r
 -              android:layout_weight="1"\r
 -              android:id="@+id/left_fragment_container"\r
 -          />\r
 -      \r
 -      <FrameLayout \r
 -              android:layout_width="0dp"\r
 -              android:layout_height="match_parent"\r
 -              android:layout_weight="2"\r
 -              android:id="@+id/right_fragment_container"\r
 -          />\r
 -      \r
 - </LinearLayout>
 +    android:clickable="true" >\r
 +\r
 +    <!-- The main content view -->\r
 +    <LinearLayout\r
 +        xmlns:android="http://schemas.android.com/apk/res/android"\r
 +        android:layout_width="match_parent"\r
 +        android:layout_height="match_parent"\r
 +        android:background="@color/background_color"\r
 +        android:baselineAligned="false"\r
-         android:orientation="horizontal" >\r
++        android:orientation="horizontal"\r
++        android:id="@+id/ListLayout"\r
++        android:contentDescription="@string/list_layout"\r
++        >\r
 +\r
 +\r
 +        <FrameLayout\r
 +            android:id="@+id/left_fragment_container"\r
 +            android:layout_width="0dp"\r
 +            android:layout_height="match_parent"\r
 +            android:layout_weight="1" />\r
 +\r
 +        <FrameLayout\r
 +            android:id="@+id/right_fragment_container"\r
 +            android:layout_width="0dp"\r
 +            android:layout_height="match_parent"\r
 +            android:layout_weight="2" />\r
 +    </LinearLayout>\r
 +\r
 +    <include\r
 +        layout="@layout/drawer"\r
 +        android:layout_width="240dp"\r
 +        android:layout_height="match_parent"\r
 +        android:layout_gravity="start"/>\r
 +\r
- </android.support.v4.widget.DrawerLayout>
++</android.support.v4.widget.DrawerLayout>\r

diff --combined res/values/strings.xml
index a429808,5b19c75..7d180be
--- 1/res/values/strings.xml
--- 2/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>