Merge branch 'trunk' into issue/16068-android-12-update-target-sdk

# Conflicts:
#	build.gradle

Author: AjeshRPai

RELEASE-NOTES.txt

@@ -4,11 +4,18 @@
 -----
 * [***] [internal] Updates the target sdk to 31 - Android 12 [https://github.com/wordpress-mobile/WordPress-Android/pull/17153]
 
+* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
+* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
+* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
+* [*] Stats: Fix Western Arabic Numerals not being shown on every text of the stats screens in Arabic languages [https://github.com/wordpress-mobile/WordPress-Android/pull/17217]
 
 20.9
 -----
 * [***] [internal] Redesigned the landing screen of the WordPress and Jetpack apps, behind a feature flag. [https://github.com/wordpress-mobile/WordPress-Android/pull/17203]
 * [**] [internal] Added sensor feedback to influence the speed of the scrolling large text on the redesigned Jetpack landing screen based on the vertical rotation of the device. [https://github.com/wordpress-mobile/WordPress-Android/pull/17207]
+* [*] Quick Start: Retain Quick Start focus point after device rotation [https://github.com/wordpress-mobile/WordPress-Android/pull/17187]
+* [*] Stats: Fix Long title problem on stats cards [https://github.com/wordpress-mobile/WordPress-Android/pull/17084]
+* [*] Support "Enter" key for Excerpt editing in Post settings [https://github.com/wordpress-mobile/WordPress-Android/pull/17078]
 
 20.8
 -----

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -11,6 +11,14 @@ msgstr ""
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_209"
+msgid ""
+"20.9:\n"
+"- “Get to know your app” flows now stay on screen after rotating your device.\n"
+"- Long titles display properly on Stats cards without being cut off.\n"
+"- We added the Enter key to Post excerpts to allow for easy line breaks.\n"
+msgstr ""
+
 msgctxt "release_note_208"
 msgid ""
 "20.8:\n"
@@ -19,15 +27,6 @@ msgid ""
 "Arabic language users will see numerals on Stats screens exclusively in Western Arabic numbers.\n"
 msgstr ""
 
-msgctxt "release_note_207"
-msgid ""
-"20.7:\n"
-"- Jetpack widgets are now available on your device’s home screen\n"
-"- Media preview controls are visible in both light and dark mode\n"
-"- Compose theme’s Login Code screen has better color contrast\n"
-"- Certain elements of the editor and post settings are now WordPress blue\n"
-msgstr ""
-
 #. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
 msgctxt "play_store_app_title"
 msgid "Jetpack – Website Builder"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,3 +1,3 @@
-* [***] [internal] Redesigned the landing screen of the WordPress and Jetpack apps, behind a feature flag. [https://github.com/wordpress-mobile/WordPress-Android/pull/17203]
-* [**] [internal] Added sensor feedback to influence the speed of the scrolling large text on the redesigned Jetpack landing screen based on the vertical rotation of the device. [https://github.com/wordpress-mobile/WordPress-Android/pull/17207]
-
+- “Get to know your app” flows now stay on screen after rotating your device.
+- Long titles display properly on Stats cards without being cut off.
+- We added the Enter key to Post excerpts to allow for easy line breaks.

WordPress/metadata/PlayStoreStrings.po

@@ -11,21 +11,21 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_209"
+msgid ""
+"20.9:\n"
+"- “Get to know your app” flows now stay on screen after rotating your device.\n"
+"- Long titles display properly on Stats cards without being cut off.\n"
+"- We added the Enter key to Post excerpts to allow for easy line breaks.\n"
+msgstr ""
+
 msgctxt "release_note_208"
 msgid ""
 "20.8:\n"
 "Users on multi-author sites can change content authors in post and page settings.\n"
 "Arabic language users will now see numerals on Stats screens exclusively in Western Arabic numbers—no more mix and match with Eastern Arabic numbers.\n"
 msgstr ""
 
-msgctxt "release_note_207"
-msgid ""
-"20.7:\n"
-"We can see clearly now—media preview controls (like the back button) are now visible in both light and dark mode.\n"
-"\n"
-"The Login Code screen in the Compose theme also has better color contrast for more readable text. Shiny.\n"
-msgstr ""
-
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

@@ -1,2 +1,3 @@
-* [***] [internal] Redesigned the landing screen of the WordPress and Jetpack apps, behind a feature flag. [https://github.com/wordpress-mobile/WordPress-Android/pull/17203]
-
+- “Get to know your app” flows now stay on screen after rotating your device.
+- Long titles display properly on Stats cards without being cut off.
+- We added the Enter key to Post excerpts to allow for easy line breaks.

WordPress/src/androidTest/java/org/wordpress/android/AppInitializerTest.kt

@@ -17,6 +17,7 @@ import org.wordpress.android.support.BaseTest
 class AppInitializerTest : BaseTest() {
     @Test
     fun verifyOnAppComesFromBackgroundCalled() {
+        Thread.sleep(100)
         assertFalse(WordPress.appIsInTheBackground)
     }
 }

WordPress/src/androidTest/java/org/wordpress/android/TestUtils.java

@@ -4,9 +4,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.sqlite.SQLiteDatabase;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceManager;
+
 import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.util.DateTimeUtils;
 

WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java

@@ -39,7 +39,7 @@ public void setUp() {
                        + "<!-- /wp:image --></div>\n";
 
     @Test
-    public void publishSimplePost() {
+    public void e2ePublishSimplePost() {
         String title = "publishSimplePost";
 
         new MySitesPage()
@@ -55,7 +55,7 @@ public void publishSimplePost() {
     }
 
     @Test
-    public void publishFullPost() {
+    public void e2ePublishFullPost() {
         String title = "publishFullPost";
 
         new MySitesPage()
@@ -75,7 +75,7 @@ public void publishFullPost() {
     }
 
     @Test
-    public void blockEditorCanDisplayElementAddedInHtmlMode() {
+    public void e2eBlockEditorCanDisplayElementAddedInHtmlMode() {
         String title = "blockEditorCanDisplayElementAddedInHtmlMode";
 
         new MySitesPage()

WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java

@@ -1,7 +1,6 @@
 package org.wordpress.android.e2e;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.e2e.pages.ContactSupportScreen;
@@ -18,9 +17,8 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void sendButtonEnabledWhenTextIsEntered() {
+    public void e2eSendButtonEnabledWhenTextIsEntered() {
         try {
             new LoginFlow()
                 .chooseContinueWithWpCom()
@@ -38,39 +36,16 @@ public void sendButtonEnabledWhenTextIsEntered() {
         }
     }
 
-    @Ignore("As long as CI does not use gradle.properties from MobileSecrets")
     @Test
-    public void messageCanBeSent() {
-        String userMessageText = "Please ignore, this is an automated test.";
-        String automatedReplyText = "Mobile support will respond as soon as possible, "
-                                    + "generally within 48-96 hours. "
-                                    + "Please reply with your site address (URL) "
-                                    + "and any additional details we should know.";
-
-        try {
-            new LoginFlow()
-                .chooseContinueWithWpCom()
-                .tapHelp()
-                .openContactUs()
-                .setMessageText(userMessageText)
-                .tapSendButton()
-                .assertUserMessageDelivered(userMessageText)
-                .assertSystemMessageReceived(automatedReplyText);
-        } finally {
-            new ContactSupportScreen().goBackAndDeleteUnsentMessageIfNeeded();
-        }
-    }
-
-    @Test
-    public void helpCanBeOpenedWhileEnteringEmail() {
+    public void e2eHelpCanBeOpenedWhileEnteringEmail() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .tapHelp()
                 .assertHelpAndSupportScreenLoaded();
     }
 
     @Test
-    public void helpCanBeOpenedWhileEnteringPassword() {
+    public void e2eHelpCanBeOpenedWhileEnteringPassword() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .enterEmailAddress(E2E_WP_COM_USER_EMAIL)

WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java

@@ -56,7 +56,7 @@ public void setUp() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishSimplePost() {
+    public void e2ePublishSimplePostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
 
@@ -70,7 +70,7 @@ public void testPublishSimplePost() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishFullPost() {
+    public void e2ePublishFullPostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
                          + "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "