Merge branch 'favourites' of https://github.com/nextcloud/android into favourites

# Conflicts:
#	src/main/res/layout/grid_item.xml
#	src/main/res/layout/list_item.xml

src/custom/res/values/setup.xml

@@ -8,6 +8,7 @@
     <string name="account_type">nextcloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">com.custom.client.provider</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.custom.client.provider.UsersAndGroupsSearch</string>
+    <string name="users_and_groups_share_with">com.custom.client.provider.UsersAndGroupsSearch.action.SHARE_WITH</string>
     <string name="document_provider_authority">com.custom.provider.Documents</string>
     <string name="file_provider_authority">com.custom.provider.Files</string>
     <string name ="db_file">nextcloud.db</string>

src/main/res/values/setup.xml

@@ -8,6 +8,7 @@
     <string name="account_type">nextcloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_share_with">    com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
     <string name="document_provider_authority">org.nextcloud.documents</string>
     <string name="file_provider_authority">org.nextcloud.files</string>
     <string name ="db_file">nextcloud.db</string>

src/main/res/xml/users_and_groups_searchable.xml

@@ -22,7 +22,7 @@
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/app_name"
     android:hint="@string/search_users_and_groups_hint"
-    android:searchSuggestAuthority="com.nextcloud.android.providers.UsersAndGroupsSearchProvider"
-    android:searchSuggestIntentAction="com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH"
+    android:searchSuggestAuthority="@string/users_and_groups_search_authority"
+    android:searchSuggestIntentAction="@string/users_and_groups_share_with"
     android:searchSuggestThreshold="1" >
 </searchable>