Merge dev

47 files changed, 411 insertions, 32 deletions

diff --git a/app/src/main/res/drawable/notification_widget_preview.xml b/app/src/main/res/drawable/notification_widget_preview.xml
new file mode 100644
index 00000000..a03fd362
--- /dev/null
+++ b/app/src/main/res/drawable/notification_widget_preview.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="40dp"
+    android:viewportWidth="300"
+    android:viewportHeight="400">
+  <path
+      android:pathData="M0,0h300v400H0V0z"
+      android:fillColor="#fafafa"/>
+  <path
+      android:pathData="M0,0h300v50H0V0z"
+      android:fillColor="@color/facebook_blue"/>
+  <path
+      android:pathData="M65,170a20,20 0,1 1,-40 0,20 20,0 0,1 40,0z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,150h184v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,179h146v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M65,95a20,20 0,1 1,-40 0,20 20,0 0,1 40,0z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,75h184v11H85V75z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,104h146v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M65,245a20,20 0,1 1,-40 0,20 20,0 0,1 40,0z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,225h184v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,254h146v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M65,320a20,20 0,1 1,-40 0,20 20,0 0,1 40,0z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,300h184v11H85v-11z"
+      android:fillColor="#DE000000"/>
+  <path
+      android:pathData="M85,329h146v11H85v-11z"
+      android:fillColor="#DE000000"/>
+</vector>
diff --git a/app/src/main/res/layout/widget_notification_item.xml b/app/src/main/res/layout/widget_notification_item.xml
new file mode 100644
index 00000000..f36f2766
--- /dev/null
+++ b/app/src/main/res/layout/widget_notification_item.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/kau_activity_horizontal_margin"
+    android:paddingTop="@dimen/kau_activity_vertical_margin"
+    android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+    android:paddingBottom="@dimen/kau_activity_vertical_margin">
+
+    <ImageView
+        android:id="@+id/item_avatar"
+        android:layout_width="@dimen/avatar_image_size"
+        android:layout_height="@dimen/avatar_image_size" />
+
+    <!--
+    Unlike the actual notification panel,
+    we do not show thumbnails, and we limit the title length
+    -->
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/kau_padding_normal"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/item_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="2" />
+
+        <TextView
+            android:id="@+id/item_date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_notifications.xml b/app/src/main/res/layout/widget_notifications.xml
new file mode 100644
index 00000000..4c42be85
--- /dev/null
+++ b/app/src/main/res/layout/widget_notifications.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget_layout_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/widget_layout_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/kau_padding_small"
+        android:paddingEnd="@dimen/kau_padding_small">
+
+        <ImageView
+            android:id="@+id/img_frost"
+            android:layout_width="@dimen/toolbar_icon_size"
+            android:layout_height="@dimen/toolbar_icon_size"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/kau_padding_small"
+            android:background="?android:selectableItemBackgroundBorderless" />
+
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/widget_notification_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 8d8d7c1a..357c7fd7 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -46,4 +46,12 @@ plně funkční náhrada za oficiální aplikaci Facebooku, vytvořena od nuly a
     <string name="options">Nastavení</string>
     <string name="tab_customizer_instructions">Dlouhým stiskem přeuspořádejte horní ikony.</string>
     <string name="no_new_notifications">Žádné nové oznámení</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 4d154d06..fc7a0f44 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -45,4 +45,12 @@
     <string name="options">Valgmuligheder</string>
     <string name="tab_customizer_instructions">Hold nede og træk for at flytte de øverste ikoner.</string>
     <string name="no_new_notifications">Ingen nye notifikationer</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index f87447c4..84b9ae8d 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Geburtstage</string>
     <string name="chat">Chat</string>
     <string name="photos">Fotos</string>
+    <string name="marketplace">Marktplatz</string>
     <string name="notes">Notizen</string>
     <string name="on_this_day">An diesem Tag</string>
     <string name="loading_account">Alles wird vorbereitet…</string>
@@ -45,4 +46,12 @@
     <string name="options">Optionen</string>
     <string name="tab_customizer_instructions">Durch langes Drücken und Ziehen können Sie die oberen Symbole neu anordnen.</string>
     <string name="no_new_notifications">Keine neue Benachrichtigungen gefunden</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings_pref_feed.xml b/app/src/main/res/values-de-rDE/strings_pref_feed.xml
index 07844d89..8877de04 100644
--- a/app/src/main/res/values-de-rDE/strings_pref_feed.xml
+++ b/app/src/main/res/values-de-rDE/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Zeige \"Leute die du vielleicht kennst\" im Feed</string>
     <string name="suggested_groups">Empfohlene Gruppen</string>
     <string name="suggested_groups_desc">Zeige \"Empfohlene Gruppen\" im Feed</string>
+    <string name="show_stories">Story\'s anzeigen</string>
+    <string name="show_stories_desc">Story\'s in den Feed anzeigen</string>
     <string name="facebook_ads">Facebook Werbung</string>
     <string name="facebook_ads_desc">Zeige native Facebook Werbung</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 6b96de27..200b923b 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Cumpleaños</string>
     <string name="chat">Chat</string>
     <string name="photos">Fotos</string>
+    <string name="marketplace">Marketplace</string>
     <string name="notes">Notas</string>
     <string name="on_this_day">En este día</string>
     <string name="loading_account">Preparando todo…</string>
@@ -45,4 +46,14 @@
     <string name="options">Opciones</string>
     <string name="tab_customizer_instructions">Mantén pulsado y arrastra para reorganizar los iconos superiores.</string>
     <string name="no_new_notifications">No se han encontrado Notificaciones</string>
+    <string name="today">Hoy</string>
+    <string name="yesterday">Ayer</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings_pref_behaviour.xml b/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
index dd64c6d1..925f058c 100644
--- a/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
@@ -17,6 +17,8 @@
     <string name="force_message_bottom_desc">Al cargar un hilo de mensaje, activa un desplazamiento hacia la parte inferior de la página en lugar de cargar la página tal como es.</string>
     <string name="enable_pip">Activar PIP</string>
     <string name="enable_pip_desc">Activar función de video en miniatura</string>
+    <string name="autoplay_settings">Configuración de jugadas automáticas</string>
+    <string name="autoplay_settings_desc">Abra configuración de juego de auto de Facebook. Tenga en cuenta que debe estar desactivada para que PIP trabajar.</string>
     <string name="exit_confirmation">Confirmar salida</string>
     <string name="exit_confirmation_desc">Muestra un diálogo de confirmación antes de salir de la app</string>
     <string name="analytics">Analytics</string>
diff --git a/app/src/main/res/values-es-rES/strings_pref_feed.xml b/app/src/main/res/values-es-rES/strings_pref_feed.xml
index b5b3451d..2ebbdf87 100644
--- a/app/src/main/res/values-es-rES/strings_pref_feed.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Mostrar \"Gente que quizá conozcas\" en el feed</string>
     <string name="suggested_groups">Grupos sugeridos</string>
     <string name="suggested_groups_desc">Mostrar \"grupos sugeridos\" en el feed</string>
+    <string name="show_stories">Historias destacadas</string>
+    <string name="show_stories_desc">Mostrar historias en el feed</string>
     <string name="facebook_ads">Anuncios de Facebook</string>
     <string name="facebook_ads_desc">Mostrar anuncios nativos de Facebook</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings_pref_feed.xml b/app/src/main/res/values-es/strings_pref_feed.xml
deleted file mode 100644
index 646c87e2..00000000
--- a/app/src/main/res/values-es/strings_pref_feed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
-<resources>
-    <string name="newsfeed_sort">Orden de las Publicaciones</string>
-    <string name="newsfeed_sort_desc">Define el orden en que aparecen las publicaciones</string>
-    <string name="aggressive_recents">Modo \"Más Recientes\" agresivo</string>
-    <string name="aggressive_recents_desc">Filtra de manera adicional las publicaciones más antiguas de Facebook de las noticias recientes. Deshabilita esta opción si el feed se encuentra vacio.</string>
-    <string name="composer">Escritor de Estado</string>
-    <string name="composer_desc">Mostrar escritor de estado en el feed</string>
-    <string name="suggested_friends">Sugerencias de Amigos</string>
-    <string name="suggested_friends_desc">Mostrar \"Gente que quizá conozcas\" en el feed</string>
-    <string name="suggested_groups">Grupos sugeridos</string>
-    <string name="suggested_groups_desc">Mostrar \"grupos sugeridos\" en el feed</string>
-    <string name="facebook_ads">Publicidad de Facebook</string>
-    <string name="facebook_ads_desc">Mostrar Publicidad Nativa de Facebook</string>
-</resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 16b14ac2..b0e179e9 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Anniversaires</string>
     <string name="chat">Conversations</string>
     <string name="photos">Photos</string>
+    <string name="marketplace">Marketplace</string>
     <string name="notes">Notes</string>
     <string name="on_this_day">Aujourd\'hui</string>
     <string name="loading_account">Tout se prépare…</string>
@@ -45,4 +46,15 @@
     <string name="options">Options</string>
     <string name="tab_customizer_instructions">Appuyez longuement et faites glisser pour réorganiser les icônes du haut.</string>
     <string name="no_new_notifications">Pas de nouvelles notifications trouvées</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="yesterday">Hier</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
+    <string name="time_template">%1s à %2s</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings_pref_behaviour.xml b/app/src/main/res/values-fr-rFR/strings_pref_behaviour.xml
index 9c819308..7dec9c46 100644
--- a/app/src/main/res/values-fr-rFR/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-fr-rFR/strings_pref_behaviour.xml
@@ -17,6 +17,8 @@
     <string name="force_message_bottom_desc">Lors du chargement d’un fil de message, déclencher un défilement vers le bas de la page au lieu de charger la page telle quelle.</string>
     <string name="enable_pip">Activer le PIP</string>
     <string name="enable_pip_desc">Activer les vidéos Picture In Picture</string>
+    <string name="autoplay_settings">Paramètres de lecture automatique</string>
+    <string name="autoplay_settings_desc">Ouvrir les paramètres de lecture automatique de Facebook. Notez qu\'il doit être désactivé pour que PIP fonctionne.</string>
     <string name="exit_confirmation">Confirmation de la sortie</string>
     <string name="exit_confirmation_desc">Afficher la boîte de dialogue de confirmation avant de quitter l’application</string>
     <string name="analytics">Analytics</string>
diff --git a/app/src/main/res/values-fr-rFR/strings_pref_feed.xml b/app/src/main/res/values-fr-rFR/strings_pref_feed.xml
index 581d869a..1de2ab0c 100644
--- a/app/src/main/res/values-fr-rFR/strings_pref_feed.xml
+++ b/app/src/main/res/values-fr-rFR/strings_pref_feed.xml
@@ -4,13 +4,15 @@
     <string name="newsfeed_sort">Ordre du fil d\'actualité</string>
     <string name="newsfeed_sort_desc">Définit l’ordre dans lequel les messages sont affichés</string>
     <string name="aggressive_recents">Récents agressifs</string>
-    <string name="aggressive_recents_desc">Filtrer les vieilles publications additionnelles du fil d\'actualité les plus récentes de Facebook. Désactivez cette option si votre fil d\'actualités est vide.</string>
+    <string name="aggressive_recents_desc">Éliminer les anciennes publications additionnelles du fil d\'actualité récentes de Facebook. Désactivez cette option si votre fil d\'actualités est vide.</string>
     <string name="composer">Compositeur de statut</string>
     <string name="composer_desc">Montrer le compositeur de statut dans le fil d\'actualité</string>
     <string name="suggested_friends">Amis suggérés</string>
     <string name="suggested_friends_desc">Afficher les «Personnes que vous pouvez connaître» dans le fil d\'actualité</string>
     <string name="suggested_groups">Groupes Suggérés</string>
     <string name="suggested_groups_desc">Afficher les «Groupes Suggérés» dans le fil d\'actualité</string>
+    <string name="show_stories">Montrer les Top Stories</string>
+    <string name="show_stories_desc">Montrer les stories dans le fil d\'actualité</string>
     <string name="facebook_ads">Publicités Facebook</string>
     <string name="facebook_ads_desc">Afficher les publicités Facebook</string>
 </resources>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 9d9c8e50..48547a6c 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -48,4 +48,12 @@
     <string name="options">Opcións</string>
     <string name="tab_customizer_instructions">Toque longo e arrastra para reorganizar as iconas superiores.</string>
     <string name="no_new_notifications">Non se atopou ningunha nova notificación</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 1978cacf..6b62f285 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Születésnapok</string>
     <string name="chat">Chat</string>
     <string name="photos">Fényképek</string>
+    <string name="marketplace">Piactér</string>
     <string name="notes">Jegyzetek</string>
     <string name="on_this_day">Ezen a napon</string>
     <string name="loading_account">Előkészítés…</string>
@@ -45,4 +46,12 @@
     <string name="options">Beállítások</string>
     <string name="tab_customizer_instructions">Tartsd nyomva és húzd a felső ikonokat az átrendezéshez.</string>
     <string name="no_new_notifications">Nem találhatók új értesítések</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings_pref_feed.xml b/app/src/main/res/values-hu-rHU/strings_pref_feed.xml
index fa85b06e..a784c376 100644
--- a/app/src/main/res/values-hu-rHU/strings_pref_feed.xml
+++ b/app/src/main/res/values-hu-rHU/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">\"Emberek, akiket ismerhetsz\" megjelenítése a hírcsatornában</string>
     <string name="suggested_groups">Javasolt csoportok</string>
     <string name="suggested_groups_desc">\"Javasolt csoportok\" megjelenítése a hírcsatornában</string>
+    <string name="show_stories">Történetek megjelenítése</string>
+    <string name="show_stories_desc">Történetek megjelenítése a hírfolyamban</string>
     <string name="facebook_ads">Facebook hirdetések</string>
     <string name="facebook_ads_desc">Natív Facebook-hirdetések megjelenítése</string>
 </resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index fd6c3abe..73c6c61d 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -45,4 +45,12 @@
     <string name="preview">Pratinjau</string>
     <string name="options">Pilihan</string>
     <string name="tab_customizer_instructions">Tekan lama dan tarik untuk mengatur ulang ikon atas.</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 5a5acbd6..be8c04f4 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -46,4 +46,12 @@
     <string name="options">Opzioni</string>
     <string name="tab_customizer_instructions">Per riordinare un\'icona tienila premuta e trascinala.</string>
     <string name="no_new_notifications">Nessuna nuova notifica trovata</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-it/strings_pref_feed.xml b/app/src/main/res/values-it/strings_pref_feed.xml
deleted file mode 100644
index e04dc077..00000000
--- a/app/src/main/res/values-it/strings_pref_feed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
-<resources>
-    <string name="newsfeed_sort">Ordine della Sezione Notizie</string>
-    <string name="newsfeed_sort_desc">Definisce l\'ordine in cui sono mostrati i post</string>
-    <string name="aggressive_recents">Recenti Aggressivi</string>
-    <string name="aggressive_recents_desc">Filtra ulteriori post vecchi dalla sezione originale più recenti di Facebook. Disabilita se il tuo feed è vuoto.</string>
-    <string name="composer">Compositore di Stato</string>
-    <string name="composer_desc">Mostra la casella per comporre uno stato nelle Notizie</string>
-    <string name="suggested_friends">Amici Suggeriti</string>
-    <string name="suggested_friends_desc">Mostra \"Persone Che Potresti Conoscere\" nel feed</string>
-    <string name="suggested_groups">Gruppi Suggeriti</string>
-    <string name="suggested_groups_desc">Mostra \"Gruppi Suggeriti\" nel feed</string>
-    <string name="facebook_ads">Pubblicità Facebook</string>
-    <string name="facebook_ads_desc">Mostra le pubblicità native di Facebook</string>
-</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index df91e3e0..ef490091 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -42,4 +42,12 @@
     <string name="file_chooser_not_found">파일 선택기를 찾을 수 없습니다.</string>
     <string name="top_bar">상단 바</string>
     <string name="bottom_bar">하단 바</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 5a0373f7..0c506137 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -46,4 +46,12 @@
     <string name="options">Opties</string>
     <string name="tab_customizer_instructions">Klik en houd vast om de iconen in de gewenste volgorde te slepen.</string>
     <string name="no_new_notifications">Geen nieuwe notificaties</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 08aab533..770ee6d8 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -44,4 +44,12 @@
     <string name="preview">Forhåndsvisning</string>
     <string name="options">Alternativer</string>
     <string name="tab_customizer_instructions">Langt trykk og dra for å endre topp ikonene.</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 35b3c991..8d8dca94 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -45,4 +45,12 @@
     <string name="options">Opcje</string>
     <string name="tab_customizer_instructions">Długie naciśnięcie i przeciągnięcie, aby zmienić kolejność ikon.</string>
     <string name="no_new_notifications">Brak nowych powiadomień</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9525dec8..cca038df 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Aniversários</string>
     <string name="chat">Amigos online</string>
     <string name="photos">Fotos</string>
+    <string name="marketplace">Marketplace</string>
     <string name="notes">Notas</string>
     <string name="on_this_day">Neste Dia</string>
     <string name="loading_account">Preparando tudo…</string>
@@ -46,4 +47,15 @@
     <string name="options">Opções</string>
     <string name="tab_customizer_instructions">Mantenha pressionado e arraste para reorganizar os ícones superiores.</string>
     <string name="no_new_notifications">Nenhuma nova notificação encontrada</string>
+    <string name="today">Hoje</string>
+    <string name="yesterday">Ontem</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
+    <string name="time_template">%1s às %2s</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings_pref_behaviour.xml b/app/src/main/res/values-pt-rBR/strings_pref_behaviour.xml
index db06b1e8..7355c3d5 100644
--- a/app/src/main/res/values-pt-rBR/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-pt-rBR/strings_pref_behaviour.xml
@@ -17,6 +17,8 @@
     <string name="force_message_bottom_desc">Ao carregar um tópico de mensagem, aciona uma rolagem para a parte inferior da página em vez de carregar a página como está.</string>
     <string name="enable_pip">Habilitar o PIP</string>
     <string name="enable_pip_desc">Habilita o Picture in Picture (janelas flutuantes de vídeos)</string>
+    <string name="autoplay_settings">Configurações de reprodução automática</string>
+    <string name="autoplay_settings_desc">Abra as configurações de reprodução automática do Facebook. Observe que ele deve ser desativado para que o PIP funcione.</string>
     <string name="exit_confirmation">Confirmação de Saída</string>
     <string name="exit_confirmation_desc">Mostrar caixa de diálogo de confirmação antes de sair do aplicativo</string>
     <string name="analytics">Telemetria</string>
diff --git a/app/src/main/res/values-pt-rBR/strings_pref_feed.xml b/app/src/main/res/values-pt-rBR/strings_pref_feed.xml
index e03b132e..1a37345f 100644
--- a/app/src/main/res/values-pt-rBR/strings_pref_feed.xml
+++ b/app/src/main/res/values-pt-rBR/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Mostra \"Pessoas Que Talvez Você Conheça\" no Feed</string>
     <string name="suggested_groups">Grupos Sugeridos</string>
     <string name="suggested_groups_desc">Mostra \"Grupos Sugeridos\" no Feed</string>
+    <string name="show_stories">Mostrar Histórias</string>
+    <string name="show_stories_desc">Mostrar histórias no feed</string>
     <string name="facebook_ads">Anúncios do Facebook</string>
     <string name="facebook_ads_desc">Mostrar anúncios nativos do Facebook</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 471abe90..0bbdc5ad 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -45,4 +45,12 @@
     <string name="options">Opções</string>
     <string name="tab_customizer_instructions">Toque longo e arraste para dispor os ícones superiores.</string>
     <string name="no_new_notifications">Sem notificações novas</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index a1f53622..1fcfce92 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -46,4 +46,12 @@
     <string name="options">Opțiuni</string>
     <string name="tab_customizer_instructions">Apasă lung și trage să rearanjezi.</string>
     <string name="no_new_notifications">Nu s-au găsit notificări</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 3ac25564..3a0c30af 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Дни рождения</string>
     <string name="chat">Написать</string>
     <string name="photos">Фотографии</string>
+    <string name="marketplace">Marketplace</string>
     <string name="notes">Заметки</string>
     <string name="on_this_day">В этот день</string>
     <string name="loading_account">Почти готово…</string>
@@ -45,4 +46,14 @@
     <string name="options">Опции</string>
     <string name="tab_customizer_instructions">Долго нажмите и перетащите чтобы переставить иконки</string>
     <string name="no_new_notifications">Новые уведомления отсутствуют</string>
+    <string name="today">Сегодня</string>
+    <string name="yesterday">Вчера</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings_pref_feed.xml b/app/src/main/res/values-ru-rRU/strings_pref_feed.xml
index 61718079..d48a56f1 100644
--- a/app/src/main/res/values-ru-rRU/strings_pref_feed.xml
+++ b/app/src/main/res/values-ru-rRU/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Смотреть «Люди которых вы можете знать» в канале</string>
     <string name="suggested_groups">Предлагаемые группы</string>
     <string name="suggested_groups_desc">Смотреть «Предложения групп» в канале</string>
+    <string name="show_stories">Показывать Истории</string>
+    <string name="show_stories_desc">Показывать Истории в ленте</string>
     <string name="facebook_ads">- Реклама в Facebook</string>
     <string name="facebook_ads_desc">Показать родной Facebook объявления</string>
 </resources>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index f526edcf..9cb3ef9c 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -45,4 +45,12 @@
     <string name="options">Опције</string>
     <string name="tab_customizer_instructions">Задржите и превуците да би прерасподелили горње иконице.</string>
     <string name="no_new_notifications">Нема нових обавештења</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index aeabdbb4..456bcae1 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -46,4 +46,12 @@
     <string name="options">Inställningar</string>
     <string name="tab_customizer_instructions">Tryck och håll kvar för att arrangera om topp-ikonerna.</string>
     <string name="no_new_notifications">Inga nya notifikationer hittades</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
index 5c1e63ec..4f2c4734 100644
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ b/app/src/main/res/values-th-rTH/strings.xml
@@ -44,4 +44,12 @@
     <string name="preview">แสดงตัวอย่าง</string>
     <string name="options">ตัวเลือก</string>
     <string name="tab_customizer_instructions">กดค้างและลากเพื่อจัดเรียงไอคอนด้านบน</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-tl-rPH/strings.xml b/app/src/main/res/values-tl-rPH/strings.xml
index e9139373..6880e40e 100644
--- a/app/src/main/res/values-tl-rPH/strings.xml
+++ b/app/src/main/res/values-tl-rPH/strings.xml
@@ -45,4 +45,12 @@
     <string name="preview">Pribyu</string>
     <string name="options">Ang mga opsyon</string>
     <string name="tab_customizer_instructions">Pindutin ng matagal at hilahin para mabago ang ayos ng pangunahing imahe.</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 828a2abb..f2dc54b2 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Doğum Günleri</string>
     <string name="chat">Sohbet</string>
     <string name="photos">Fotoğraflar</string>
+    <string name="marketplace">Pazar yeri</string>
     <string name="notes">Notlar</string>
     <string name="on_this_day">Bu günde</string>
     <string name="loading_account">Her şey hazır alınıyor…</string>
@@ -45,4 +46,14 @@
     <string name="options">Seçenekler</string>
     <string name="tab_customizer_instructions">Üstteki simgeleri yeniden düzenlemek için uzun basın ve sonra sürükleyin.</string>
     <string name="no_new_notifications">Yeni bildirim bulunmadı</string>
+    <string name="today">Bugün</string>
+    <string name="yesterday">Dün</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings_pref_behaviour.xml b/app/src/main/res/values-tr-rTR/strings_pref_behaviour.xml
index 9c60e461..58f3ca43 100644
--- a/app/src/main/res/values-tr-rTR/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-tr-rTR/strings_pref_behaviour.xml
@@ -21,6 +21,7 @@
     <string name="force_message_bottom_desc">Birileti dizisi yüklerken, sayfayı olduğu gibi yüklemek yerine, sayfanın altına kaydırma yapın.</string>
     <string name="enable_pip">PIP\'i etkinleştir</string>
     <string name="enable_pip_desc">PIP (Picture in Picture) videolarını etkinleştir</string>
+    <string name="autoplay_settings">Otomatik oynatma ayarları</string>
     <string name="exit_confirmation">Çıkış Onayı</string>
     <string name="exit_confirmation_desc">Uygulamadan çıkmadanönce onay iletişim kutusunu göster</string>
     <string name="analytics">Analiz</string>
diff --git a/app/src/main/res/values-tr-rTR/strings_pref_feed.xml b/app/src/main/res/values-tr-rTR/strings_pref_feed.xml
index 30963338..e70e96cf 100644
--- a/app/src/main/res/values-tr-rTR/strings_pref_feed.xml
+++ b/app/src/main/res/values-tr-rTR/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Özet akışında \"Tanıdığınız İnsanları\" gösterin</string>
     <string name="suggested_groups">Önerilen gruplar</string>
     <string name="suggested_groups_desc">Özet akışında \"önerilen grup\" ları göster</string>
+    <string name="show_stories">Hikayeleri göster</string>
+    <string name="show_stories_desc">Akışda ki hikayeleri göster</string>
     <string name="facebook_ads">Facebook reklamları</string>
     <string name="facebook_ads_desc">Yerli Facebook reklamlarını göster</string>
 </resources>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 7d051a3f..1abb84d5 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Дні народження</string>
     <string name="chat">Чат</string>
     <string name="photos">Фотографії</string>
+    <string name="marketplace">Магазин</string>
     <string name="notes">Замітки</string>
     <string name="on_this_day">Цього дня</string>
     <string name="loading_account">Отримання всього готове…</string>
@@ -45,4 +46,12 @@
     <string name="options">Опції</string>
     <string name="tab_customizer_instructions">Довге натискання та перетягніть, щоб переставити верхній значок.</string>
     <string name="no_new_notifications">Нових повідомлень не знайдено</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-uk-rUA/strings_pref_feed.xml b/app/src/main/res/values-uk-rUA/strings_pref_feed.xml
index 1b4176e0..29ecc9d6 100644
--- a/app/src/main/res/values-uk-rUA/strings_pref_feed.xml
+++ b/app/src/main/res/values-uk-rUA/strings_pref_feed.xml
@@ -11,6 +11,8 @@
     <string name="suggested_friends_desc">Показати \"Люди, яких ви можете знати\" у новинній стрічці</string>
     <string name="suggested_groups">Пропоновані групи</string>
     <string name="suggested_groups_desc">Показати \"Пропоновані групи\" у новинній стрічці</string>
+    <string name="show_stories">Показати Історії</string>
+    <string name="show_stories_desc">Показувати історії у стрічці</string>
     <string name="facebook_ads">Реклама у Facebook</string>
     <string name="facebook_ads_desc">Показувати вбудовану рекламу Facebook</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index f65193bc..9b7c39e6 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -46,4 +46,12 @@
     <string name="options">Tuỳ chọn</string>
     <string name="tab_customizer_instructions">Bấm giữ và kéo để sắp xếp biểu tượng trên cùng.</string>
     <string name="no_new_notifications">Không có thông báo mới</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 76105ca1..bf5ced6a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -40,4 +40,12 @@
     <string name="file_chooser_not_found">未找到文件选择程序</string>
     <string name="top_bar">顶栏</string>
     <string name="bottom_bar">底栏</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5ee8d7bd..3d22540b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -45,4 +45,12 @@
     <string name="options">選項</string>
     <string name="tab_customizer_instructions">長按及拖曳頂部圖標可重新排列位置</string>
     <string name="no_new_notifications">沒有新通知。</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 713bd1b4..847e74cb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,4 +9,6 @@
     <dimen name="tab_bar_height">50dp</dimen>
     <dimen name="intro_bar_height">64dp</dimen>
     <dimen name="badge_icon_size">20dp</dimen>
+
+    <dimen name="toolbar_icon_size">24dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10481b50..5eb1c9e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,4 +64,15 @@
 
     <!--Biometrics-->
     <string name="biometrics_prompt_title">Authenticate Frost</string>
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+    <!--
+    Template used to display human readable string;
+    For instance:
+    Today at 1:23 PM
+    Mar 13 at 9:00 AM
+
+    The first element is the day, and the second element is the time
+    -->
+    <string name="time_template">%1s at %2s</string>
 </resources>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 1895e46f..560b1111 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,12 +6,22 @@
     <item text="" />
     -->
 
+    <version title="v2.3.0" />
+    <item text="Converted internals of Facebook data storage; auto migration will only work from 2.2.x to 2.3.x" />
+    <item text="Added notification widget" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+
     <version title="v2.2.4" />
     <item text="Show top bar to allow sharing posts" />
     <item text="Fix unmuting videos when autoplay is enabled" />
     <item text="Add shortcut to toggle autoplay in settings > behaviour" />
     <item text="Update theme" />
-    <item text="" />
 
     <version title="v2.2.3" />
     <item text="Add ability to hide stories" />
diff --git a/app/src/main/res/xml/notification_widget_info.xml b/app/src/main/res/xml/notification_widget_info.xml
new file mode 100644
index 00000000..c14bbfb2
--- /dev/null
+++ b/app/src/main/res/xml/notification_widget_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+For sizing see:
+https://developer.android.com/guide/practices/ui_guidelines/widget_design.html#anatomy_determining_size
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialKeyguardLayout="@layout/widget_notifications"
+    android:initialLayout="@layout/widget_notifications"
+    android:minWidth="180dp"
+    android:minHeight="250dp"
+    android:previewImage="@drawable/notification_widget_preview" />