Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail

AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10010001"
-    android:versionName="1.1.0" >
+    android:versionCode="10010099"
+    android:versionName="1.1.0">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -61,7 +61,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.ownCloud.Toolbar"
-        android:manageSpaceActivity=".ui.activity.ManageSpaceActivity">
+        android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity">
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"

CHANGELOG.md

@@ -1,10 +1,11 @@
-## 1.1.0 RC1 (June 27, 2016)
+## 1.1.0 (July 6, 2016)
 
 - New main menu to switch accounts easily
 - Ability to open Nextcloud hosted files (read-only) from other apps that support the standard file chooser (requires Android 4.4 / KitKat or higher)
 - "Select all files" for upload within a folder
-- optional feature to auto-create monthly folders for your instant uploads
-- revamped login screen
+- Optional feature to auto-create monthly folders for your instant uploads
+- Revamped login screen
+- Minor bugfixes
 
 ## 1.0.1 (June 20, 2016)
 

res/layout/account_item.xml

@@ -43,7 +43,7 @@
         android:textColor="@color/textColor"
         android:textSize="@dimen/two_line_primary_text_size"/>
 
-    <ImageView
+    <ImageButton
         android:id="@+id/passwordButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -52,9 +52,10 @@
         android:paddingTop="@dimen/standard_padding"
         android:paddingBottom="@dimen/standard_padding"
         android:paddingRight="@dimen/standard_half_padding"
+        android:background="?android:selectableItemBackground"
         android:src="@drawable/ic_key"/>
 
-    <ImageView
+    <ImageButton
         android:id="@+id/removeButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -63,6 +64,7 @@
         android:paddingTop="@dimen/standard_padding"
         android:paddingBottom="@dimen/standard_padding"
         android:paddingRight="@dimen/standard_padding"
-        android:src="@drawable/ic_close"/>
+        android:background="?android:selectableItemBackground"
+        android:src="@drawable/ic_action_delete"/>
 
 </LinearLayout>         

res/menu/drawer_menu.xml

@@ -27,18 +27,16 @@
             android:id="@+id/nav_all_files"
             android:icon="@drawable/ic_folder_open"
             android:title="@string/drawer_item_all_files"/>
-        <!-- TODO activate when On Device branch is merged
         <item
             android:orderInCategory="0"
             android:id="@+id/nav_on_device"
-            android:icon="@drawable/ic_action_download_grey"
+            android:icon="@drawable/ic_action_available_offline"
             android:title="@string/drawer_item_on_device"/>
-         -->
         <item
             android:orderInCategory="0"
             android:id="@+id/nav_uploads"
             android:icon="@drawable/ic_uploads"
-            android:title="Uploads"/>
+            android:title="@string/drawer_item_uploads_list"/>
     </group>
 
     <!--

res/menu/file_actions_menu.xml

@@ -22,13 +22,13 @@
     <item
         android:id="@+id/action_share_file"
         android:title="@string/action_share"
-        android:icon="@android:drawable/ic_menu_share"
+        android:icon="@drawable/ic_share"
         android:orderInCategory="1" />
 
     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_open_with"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_download_file"
@@ -43,47 +43,47 @@
     <item
         android:id="@+id/action_cancel_sync"
         android:title="@string/common_cancel_sync"
-        android:icon="@android:drawable/ic_menu_close_clear_cancel"
+        android:icon="@drawable/ic_action_cancel_sync"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_rename_file"
         android:title="@string/common_rename"
-        android:icon="@android:drawable/ic_menu_edit"
+        android:icon="@drawable/ic_edit"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_move"
         android:title="@string/actionbar_move"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_action_move"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_copy"
         android:title="@android:string/copy"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_action_copy"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_remove_file"
         android:title="@string/common_remove"
-        android:icon="@android:drawable/ic_menu_delete"
+        android:icon="@drawable/ic_action_delete_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_send_file"
         android:title="@string/actionbar_send_file"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_send"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_favorite_file"
         android:title="@string/favorite"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_action_set_available_offline_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_unfavorite_file"
         android:title="@string/unfavorite"
-        android:icon="@android:drawable/ic_menu_set_as"
+        android:icon="@drawable/ic_action_unset_available_offline_white"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_see_details"
         android:title="@string/actionbar_see_details"
-        android:icon="@android:drawable/ic_menu_info_details"
+        android:icon="@drawable/ic_information"
         android:orderInCategory="1" />
 
 </menu>

res/menu/upload_files_picker.xml

@@ -26,4 +26,11 @@
         android:title="@string/select_all"
         android:icon="@drawable/ic_select_all"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_sort"
+        android:icon="@drawable/ic_sort_variant"
+        android:orderInCategory="2"
+        app:showAsAction="ifRoom"
+        android:title="@string/actionbar_sort"
+        android:contentDescription="@string/actionbar_sort"/>
 </menu>