Merge branch 'master' into 289-upload-sources

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
#	app/src/main/res/values/strings.xml

1 files changed, 29 insertions, 5 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af5f83305..609c022bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="it.niedermann.nextcloud.deck">
 
-    <uses-permission android:name="com.nextcloud.android.sso" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -76,7 +75,7 @@
         <activity
             android:name=".ui.archivedboards.ArchivedBoardsActvitiy"
             android:label="@string/archived_boards"
-            android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity"  />
+            android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" />
 
         <activity
             android:name=".ui.card.EditActivity"
@@ -101,7 +100,7 @@
         <activity
             android:name=".ui.preparecreate.PrepareCreateActivity"
             android:description="@string/add_a_new_card_using_the_button"
-            android:label="@string/add_card" >
+            android:label="@string/add_card">
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -117,7 +116,7 @@
 
         <activity
             android:name=".ui.PushNotificationActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -127,6 +126,25 @@
             android:name=".ui.exception.ExceptionActivity"
             android:process=":error_activity" />
 
+        <activity android:name=".ui.widget.stack.StackWidgetConfigurationActivity">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name="it.niedermann.nextcloud.deck.ui.widget.stack.StackWidget"
+            android:label="@string/widget_stack_title">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/stack_widget_provider" />
+        </receiver>
+
         <service
             android:name=".ui.tiles.EditCardTileService"
             android:description="@string/add_a_new_card_using_the_button"
@@ -138,6 +156,10 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".ui.widget.stack.StackWidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
         <activity
             android:name=".ui.widget.singlecard.SelectCardForWidgetActivity"
             android:label="@string/share_add_to_card"
@@ -148,7 +170,9 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".ui.widget.singlecard.SingleCardWidget">
+        <receiver
+            android:name=".ui.widget.singlecard.SingleCardWidget"
+            android:label="@string/single_card">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>