nextcloud · AndyScherzinger · Jul 21, 2016 · Jun 12, 2016 · Jun 14, 2016 · Nov 9, 2015
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 apply plugin: 'com.android.application'
 
 ext {
-    supportLibraryVersion = '23.1.1'
+    supportLibraryVersion = '23.4.0'
 }
 
 repositories {
@@ -54,6 +54,9 @@ dependencies {
     // Android JUnit Runner
     androidTestCompile 'com.android.support.test:runner:0.5'
 
+    // Android Annotation Support
+    androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
+
     // Espresso core
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
 

diff --git a/res/drawable-hdpi/ic_action_cancel_grey.png b/res/drawable-hdpi/ic_action_cancel_grey.png
diff --git a/res/drawable-hdpi/ic_action_cancel_white.png b/res/drawable-hdpi/ic_action_cancel_white.png
diff --git a/res/drawable-hdpi/ic_action_delete.png → res/drawable-hdpi/ic_action_delete_grey.png b/res/drawable-hdpi/ic_action_delete.png → res/drawable-hdpi/ic_action_delete_grey.png
diff --git a/res/drawable-hdpi/ic_action_refresh_white.png b/res/drawable-hdpi/ic_action_refresh_white.png
diff --git a/res/drawable-hdpi/ic_action_set_available_offline.png b/res/drawable-hdpi/ic_action_set_available_offline.png
diff --git a/res/drawable-hdpi/ic_action_share.png b/res/drawable-hdpi/ic_action_share.png
diff --git a/res/drawable-hdpi/ic_action_unset_available_offline.png b/res/drawable-hdpi/ic_action_unset_available_offline.png
diff --git a/res/drawable-hdpi/ic_open_in_app.png b/res/drawable-hdpi/ic_open_in_app.png
diff --git a/res/drawable-hdpi/ic_pencil.png b/res/drawable-hdpi/ic_pencil.png
diff --git a/res/drawable-mdpi/ic_action_cancel_grey.png b/res/drawable-mdpi/ic_action_cancel_grey.png
diff --git a/res/drawable-mdpi/ic_action_cancel_white.png b/res/drawable-mdpi/ic_action_cancel_white.png
diff --git a/res/drawable-mdpi/ic_action_delete.png → res/drawable-mdpi/ic_action_delete_grey.png b/res/drawable-mdpi/ic_action_delete.png → res/drawable-mdpi/ic_action_delete_grey.png
diff --git a/res/drawable-mdpi/ic_action_refresh_grey.png b/res/drawable-mdpi/ic_action_refresh_grey.png
diff --git a/res/drawable-mdpi/ic_action_refresh_white.png b/res/drawable-mdpi/ic_action_refresh_white.png
diff --git a/res/drawable-mdpi/ic_action_set_available_offline.png b/res/drawable-mdpi/ic_action_set_available_offline.png
diff --git a/res/drawable-mdpi/ic_action_share.png b/res/drawable-mdpi/ic_action_share.png
diff --git a/res/drawable-mdpi/ic_action_unset_available_offline.png b/res/drawable-mdpi/ic_action_unset_available_offline.png
diff --git a/res/drawable-mdpi/ic_open_in_app.png b/res/drawable-mdpi/ic_open_in_app.png
diff --git a/res/drawable-mdpi/ic_pencil.png b/res/drawable-mdpi/ic_pencil.png
diff --git a/res/drawable-xhdpi/ic_cancel.png → res/drawable-xhdpi/ic_action_cancel_grey.png b/res/drawable-xhdpi/ic_cancel.png → res/drawable-xhdpi/ic_action_cancel_grey.png
diff --git a/res/drawable-xhdpi/ic_action_cancel_white.png b/res/drawable-xhdpi/ic_action_cancel_white.png
diff --git a/res/drawable-xhdpi/ic_action_delete.png → res/drawable-xhdpi/ic_action_delete_grey.png b/res/drawable-xhdpi/ic_action_delete.png → res/drawable-xhdpi/ic_action_delete_grey.png
diff --git a/res/drawable-xhdpi/ic_action_download.png b/res/drawable-xhdpi/ic_action_download.png
diff --git a/res/drawable-xhdpi/ic_action_refresh.png → ...rawable-xhdpi/ic_action_refresh_white.png b/res/drawable-xhdpi/ic_action_refresh.png → ...rawable-xhdpi/ic_action_refresh_white.png
diff --git a/res/drawable-xhdpi/ic_action_set_available_offline.png b/res/drawable-xhdpi/ic_action_set_available_offline.png
diff --git a/res/drawable-xhdpi/ic_action_share.png b/res/drawable-xhdpi/ic_action_share.png
diff --git a/res/drawable-xhdpi/ic_action_unset_available_offline.png b/res/drawable-xhdpi/ic_action_unset_available_offline.png
diff --git a/res/drawable-xhdpi/ic_open_in_app.png b/res/drawable-xhdpi/ic_open_in_app.png
diff --git a/res/drawable-xhdpi/ic_pencil.png b/res/drawable-xhdpi/ic_pencil.png
diff --git a/res/drawable-xxhdpi/ic_cancel.png → ...drawable-xxhdpi/ic_action_cancel_grey.png b/res/drawable-xxhdpi/ic_cancel.png → ...drawable-xxhdpi/ic_action_cancel_grey.png
diff --git a/res/drawable-xxhdpi/ic_action_cancel_white.png b/res/drawable-xxhdpi/ic_action_cancel_white.png
diff --git a/res/drawable-xxhdpi/ic_action_delete.png → ...drawable-xxhdpi/ic_action_delete_grey.png b/res/drawable-xxhdpi/ic_action_delete.png → ...drawable-xxhdpi/ic_action_delete_grey.png
diff --git a/res/drawable-xxhdpi/ic_action_download.png b/res/drawable-xxhdpi/ic_action_download.png
diff --git a/res/drawable-xxhdpi/ic_action_refresh.png → ...awable-xxhdpi/ic_action_refresh_white.png b/res/drawable-xxhdpi/ic_action_refresh.png → ...awable-xxhdpi/ic_action_refresh_white.png
diff --git a/res/drawable-xxhdpi/ic_action_set_available_offline.png b/res/drawable-xxhdpi/ic_action_set_available_offline.png
diff --git a/res/drawable-xxhdpi/ic_action_share.png b/res/drawable-xxhdpi/ic_action_share.png
diff --git a/res/drawable-xxhdpi/ic_action_unset_available_offline.png b/res/drawable-xxhdpi/ic_action_unset_available_offline.png
diff --git a/res/drawable-xxhdpi/ic_pencil.png b/res/drawable-xxhdpi/ic_pencil.png
diff --git a/res/drawable-xxxhdpi/ic_action_delete.png → ...rawable-xxxhdpi/ic_action_delete_grey.png b/res/drawable-xxxhdpi/ic_action_delete.png → ...rawable-xxxhdpi/ic_action_delete_grey.png
diff --git a/res/drawable-xxxhdpi/ic_action_download.png b/res/drawable-xxxhdpi/ic_action_download.png
diff --git a/res/drawable-xxxhdpi/ic_open_in_app.png b/res/drawable-xxxhdpi/ic_open_in_app.png
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
@@ -65,6 +65,6 @@
         android:paddingBottom="@dimen/standard_padding"
         android:paddingRight="@dimen/standard_padding"
         android:background="?android:selectableItemBackground"
-        android:src="@drawable/ic_action_delete"/>
+        android:src="@drawable/ic_action_delete_grey"/>
 
 </LinearLayout>         
diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
@@ -207,7 +207,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginLeft="12dp"
-						android:src="@drawable/ic_cancel"
+						android:src="@drawable/ic_action_cancel_grey"
 						android:background="@android:color/transparent"
 						/>
 

diff --git a/res/layout/file_download_fragment.xml b/res/layout/file_download_fragment.xml
@@ -60,7 +60,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="12dp"
-			android:src="@drawable/ic_cancel"
+			android:src="@drawable/ic_action_cancel_grey"
 			android:background="@android:color/transparent"
 		/>
 

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
@@ -64,6 +64,16 @@
             android:layout_marginBottom="4dp"
             android:layout_marginRight="4dp"
             android:src="@drawable/ic_available_offline" />
+
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|top"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:gravity=""
+            android:src="@android:drawable/checkbox_off_background" />
     </FrameLayout>
 
 </LinearLayout>
diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
@@ -65,7 +65,15 @@
             android:layout_marginRight="2dp"
             android:src="@drawable/ic_available_offline" />
 
-
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|top"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:src="@android:drawable/checkbox_off_background"
+            android:elevation="30dp" />
 
     </FrameLayout>
 

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
@@ -121,26 +121,35 @@
 
         </LinearLayout>
 
-        <ImageView
-            android:id="@+id/sharedIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="4dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginRight="4dp"
-            android:src="@drawable/shared_via_link" />
-
-        <ImageView
-            android:id="@+id/custom_checkbox"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="@dimen/standard_margin"
-            android:gravity=""
-            android:src="@drawable/ic_checkbox_blank_outline" />
+            android:paddingRight="@dimen/standard_padding">
+
+            <ImageView
+                android:id="@+id/sharedIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="4dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginBottom="4dp"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/shared_via_link" />
+
+            <ImageView
+                android:id="@+id/custom_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+
+                android:src="@drawable/ic_checkbox_blank_outline"
+                android:layout_toRightOf="@id/sharedIcon"/>
+        </RelativeLayout>
+
+
     </LinearLayout>
 
     <View

diff --git a/res/layout/share_user_item.xml b/res/layout/share_user_item.xml
@@ -52,7 +52,7 @@
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:id="@+id/unshareButton"
-            android:src="@drawable/ic_action_delete"
+            android:src="@drawable/ic_action_delete_grey"
             android:layout_gravity="center_vertical"
             android:padding="@dimen/standard_half_padding"/>
 

diff --git a/res/layout/text_file_preview.xml b/res/layout/text_file_preview.xml
@@ -25,10 +25,7 @@
         android:id="@+id/text_preview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="8dp"
+        android:padding="@dimen/standard_padding"
         android:textIsSelectable="true"
         android:visibility="gone"/>
 </ScrollView>
diff --git a/res/layout/toolbar_standard.xml b/res/layout/toolbar_standard.xml
@@ -38,7 +38,6 @@
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_margin="0dp"
-        android:background="@color/primary"
         android:indeterminate="false"
         android:indeterminateOnly="false"
         android:padding="0dp"

diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml
@@ -17,28 +17,32 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_share_file"
         android:title="@string/action_share"
         android:icon="@drawable/ic_share"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
-
     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"
-        android:icon="@drawable/ic_open_with"
+        android:icon="@drawable/ic_open_in_app"
+        app:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_download_file"
         android:title="@string/filedetails_download"
         android:icon="@drawable/ic_action_download"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_sync_file"
         android:title="@string/filedetails_sync_file"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="@drawable/ic_action_refresh_white"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_cancel_sync"
@@ -49,41 +53,49 @@
         android:id="@+id/action_rename_file"
         android:title="@string/common_rename"
         android:icon="@drawable/ic_edit"
+        app:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_move"
         android:title="@string/actionbar_move"
         android:icon="@drawable/ic_action_move"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_copy"
         android:title="@android:string/copy"
         android:icon="@drawable/ic_action_copy"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_remove_file"
         android:title="@string/common_remove"
         android:icon="@drawable/ic_action_delete_white"
+        app:showAsAction="ifRoom"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_send_file"
         android:title="@string/actionbar_send_file"
         android:icon="@drawable/ic_send"
+        app:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_favorite_file"
         android:title="@string/favorite"
         android:icon="@drawable/ic_action_set_available_offline_white"
+        app:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_unfavorite_file"
         android:title="@string/unfavorite"
         android:icon="@drawable/ic_action_unset_available_offline_white"
+        app:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_see_details"
         android:title="@string/actionbar_see_details"
         android:icon="@drawable/ic_information"
+        app:showAsAction="never"
         android:orderInCategory="1" />
 
 </menu>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
@@ -35,7 +35,7 @@
         android:title="@string/action_switch_grid_view" />
     <item
         android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="@drawable/ic_action_refresh_white"
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/actionbar_sync"

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
@@ -55,7 +55,6 @@
   <string name="sync_string_files">الملفات</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">رفع</string>
-  <string name="uploader_top_message">اختر مجلد الرفع</string>
   <string name="uploader_wrn_no_account_title">لم يتم العثور على أي حساب</string>
   <string name="uploader_wrn_no_account_text">لا توجد حسابات %1$s على جهازك.  أنت بحاجة لإعداد حساب في البداية.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">تهيئة</string>
@@ -269,7 +268,10 @@
   <string name="prefs_category_accounts">حسابات</string>
   <string name="actionbar_logger">سجل</string>
   <string name="saml_authentication_wrong_pass">كلمة مرور خاطئة</string>
+  <string name="actionbar_move">أنقل</string>
   <string name="folder_picker_choose_button_text">اختيار</string>
+  <string name="move_file_invalid_overwrite">الملف موجود بالفعل في المجلد الوجهة</string>
+  <string name="copy_file_invalid_overwrite">الملف موجود بالفعل في المجلد الوجهة</string>
   <string name="prefs_category_details">تفاصيل</string>
   <string name="auth_host_address">عنوان الخادم</string>
   <string name="share_dialog_title">مشاركة</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
@@ -47,7 +47,6 @@
   <string name="sync_string_files">Fayllar</string>
   <string name="setup_btn_connect">Qoşul</string>
   <string name="uploader_btn_upload_text">Serverə yüklə</string>
-  <string name="uploader_top_message">Yüklənmə qovluöunu seçin:</string>
   <string name="uploader_wrn_no_account_title">Hesab tapılmadı</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Qurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıx</string>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
@@ -38,7 +38,6 @@
   <string name="sync_string_files">ফাইল</string>
   <string name="setup_btn_connect">সংযুক্ত হও</string>
   <string name="uploader_btn_upload_text">আপলোড</string>
-  <string name="uploader_top_message">আপলোডের ফোলডার পছনদ করেন</string>
   <string name="uploader_wrn_no_account_title">কোন একাউন্ট খুঁজে পাওয়া গেল না</string>
   <string name="uploader_wrn_no_account_setup_btn_text">সেট-আপ</string>
   <string name="uploader_wrn_no_account_quit_btn_text">বন্ধ</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
@@ -56,7 +56,6 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Tilslut</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_top_message">Vælg upload-mappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto fundet</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Opsætning</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afslut</string>

diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
@@ -44,7 +44,6 @@
   <string name="sync_string_files">Dosieroj</string>
   <string name="setup_btn_connect">Konekti</string>
   <string name="uploader_btn_upload_text">Alŝuti</string>
-  <string name="uploader_top_message">Elektu alŝutan dosierujon:</string>
   <string name="uploader_wrn_no_account_title">Neniu konto troviĝis</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Agordi</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Forlasi</string>

diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
@@ -49,7 +49,6 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_top_message">Elija la carpeta de subida:</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>

diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
@@ -25,7 +25,6 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_top_message">Elija el directorio donde subir los archivos:</string>
   <string name="uploader_wrn_no_account_title">No se encuentra la cuenta</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
@@ -53,7 +53,6 @@
   <string name="sync_string_files">Fitxategiak</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
-  <string name="uploader_top_message">Hautatu igoera karpeta:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
@@ -44,7 +44,6 @@
   <string name="sync_string_files">پرونده‌ها</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">بارگزاری</string>
-  <string name="uploader_top_message">انتخاب پوشه آپلود:</string>
   <string name="uploader_wrn_no_account_title">هیچ حسابی یافت نشد</string>
   <string name="uploader_wrn_no_account_setup_btn_text">نصب</string>
   <string name="uploader_wrn_no_account_quit_btn_text">خروج</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
@@ -54,7 +54,6 @@ Descárgueo de aquí: %2$s</string>
   <string name="sync_string_files">Ficheiros</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
-  <string name="uploader_top_message">Escolla o cartafol de envío:</string>
   <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Saír</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
@@ -51,7 +51,6 @@
   <string name="sync_string_files">Датотеки</string>
   <string name="setup_btn_connect">Поврзи се</string>
   <string name="uploader_btn_upload_text">Подигни</string>
-  <string name="uploader_top_message">Избери папка за префрлање:</string>
   <string name="uploader_wrn_no_account_title">Не е пронајдена сметка</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Нагодување</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Прекини</string>

diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml
@@ -53,7 +53,6 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Kopla til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
-  <string name="uploader_top_message">Vel opplastingsmappe:</string>
   <string name="uploader_wrn_no_account_title">Fann ingen konto</string>
   <string name="uploader_wrn_no_account_text">Det finst ingen %1$s-kontoar på eininga di. Ver venleg og set opp ein konto først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>

diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
@@ -54,7 +54,6 @@ Telecargatz-lo aicí : %2$s</string>
   <string name="sync_string_files">Fichièrs</string>
   <string name="setup_btn_connect">Connectar</string>
   <string name="uploader_btn_upload_text">Mandar</string>
-  <string name="uploader_top_message">Seleccionar lo dorsièr de mandadís :</string>
   <string name="uploader_wrn_no_account_title">Cap de compte es pas estat trobat</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuracion</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Quitar</string>

diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
@@ -27,6 +27,7 @@
         <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
         <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.ownCloud.Toolbar.Drawer">

diff --git a/res/values/setup.xml b/res/values/setup.xml
@@ -46,7 +46,12 @@
 
     <!-- Button -->
     <color name="button_text_color">#000000</color>
-
+
+    <!-- Multiselect backgrounds -->
+    <color name="action_mode_background">#757575</color>
+    <color name="action_mode_status_bar_background">#616161</color>
+    <color name="selected_item_background">#ECECEC</color>
+
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>