From 8b90e092e2422123ef5ae94065801b65f5e6c624 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Thu, 30 Jul 2020 09:19:23 +1000
Subject: [PATCH] Integrate new copy

---
 res/layout-sw400dp/activity_pn_mode.xml | 188 ++++++++++++------------
 res/layout/activity_pn_mode.xml         | 186 +++++++++++------------
 res/xml/preferences_notifications.xml   |   4 +-
 3 files changed, 191 insertions(+), 187 deletions(-)

diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index e2e5433453..5efbf059bd 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -1,114 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/default_session_background"
-        android:orientation="vertical">
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Message Notifications" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="There are two ways Session can notify you of new messages." />
+
+    <LinearLayout
+        android:id="@+id/fcmOptionView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/pn_option_background">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/very_large_font_size"
-            android:textStyle="bold"
-            android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_explanation" />
+            android:textStyle="bold"
+            android:text="Fast Mode" />
 
-        <LinearLayout
-            android:id="@+id/fcmOptionView"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/very_small_font_size"
+            android:textColor="@color/text"
+            android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_fcm_option_title" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/text"
-                android:text="@string/activity_pn_mode_fcm_option_explanation" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/accent"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_recommended_option_tag" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/backgroundPollingOptionView"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_background_polling_option_title" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/text"
-                android:text="@string/activity_pn_mode_background_polling_option_explanation" />
-
-        </LinearLayout>
-
-        <Button
-            style="@style/MediumProminentFilledButton"
-            android:id="@+id/registerButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/medium_button_height"
-            android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/massive_spacing"
-            android:layout_marginBottom="@dimen/medium_spacing"
-            android:text="@string/continue_2" />
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/accent"
+            android:textStyle="bold"
+            android:text="@string/activity_pn_mode_recommended_option_tag" />
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/backgroundPollingOptionView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/small_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/pn_option_background">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
+            android:textStyle="bold"
+            android:text="Slow Mode" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/very_small_font_size"
+            android:textColor="@color/text"
+            android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
+        android:text="@string/continue_2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index f8b2b75145..1b4897ae7d 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -1,114 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/default_session_background"
-        android:orientation="vertical">
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Message Notifications" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="There are two ways Session can notify you of new messages." />
+
+    <LinearLayout
+        android:id="@+id/fcmOptionView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/pn_option_background">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/large_font_size"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
             android:textStyle="bold"
-            android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_title" />
+            android:text="Fast Mode" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/small_font_size"
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/very_small_font_size"
             android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_explanation" />
+            android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
 
-        <LinearLayout
-            android:id="@+id/fcmOptionView"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="12dp"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_spacing"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_fcm_option_title" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/text"
-                android:text="@string/activity_pn_mode_fcm_option_explanation" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/accent"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_recommended_option_tag" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/backgroundPollingOptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_spacing"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                android:text="@string/activity_pn_mode_background_polling_option_title" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="@color/text"
-                android:text="@string/activity_pn_mode_background_polling_option_explanation" />
-
-        </LinearLayout>
-
-        <Button
-            style="@style/MediumProminentFilledButton"
-            android:id="@+id/registerButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/medium_button_height"
-            android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/massive_spacing"
-            android:layout_marginBottom="@dimen/medium_spacing"
-            android:text="@string/continue_2" />
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/accent"
+            android:textStyle="bold"
+            android:text="@string/activity_pn_mode_recommended_option_tag" />
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/backgroundPollingOptionView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/small_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/pn_option_background">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
+            android:textStyle="bold"
+            android:text="Slow Mode" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/very_small_font_size"
+            android:textColor="@color/text"
+            android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
+        android:text="@string/continue_2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/xml/preferences_notifications.xml b/res/xml/preferences_notifications.xml
index 9a9c918179..a1b33553ac 100644
--- a/res/xml/preferences_notifications.xml
+++ b/res/xml/preferences_notifications.xml
@@ -26,8 +26,8 @@
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:dependency="pref_key_enable_notifications"
             android:key="pref_key_use_fcm"
-            android:title="@string/preferences_notifications_use_fcm_option_title"
-            android:summary="@string/preferences_notifications_use_fcm_option_explanation"
+            android:title="Use Fast Mode"
+            android:summary="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google."
             android:defaultValue="false" />
 
     </PreferenceCategory>