diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 6306195fd205..bc5ced6c87e0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,9 @@
16.0
-----
* [*] Stats: Added the possibility to report and unreport a referrer as spam. [https://github.com/wordpress-mobile/WordPress-Android/pull/13047]
+* [***] Block Editor: Full-width and wide alignment support for Video, Latest-posts, Gallery, Media & text, and Pullquote block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2605]
+* [***] Block Editor: Fix unsupported block bottom sheet is triggered when device is rotated. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2710]
+* [***] Block Editor: Unsupported Block Editor: Fixed issue when cannot view or interact with the classic block on Jetpack site. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2709]
* [**] Reader: Allow users to access Reader even when they do not follow any tags/topics.
15.9
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 0a01426be2f0..ae4f05b450c8 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3008,7 +3008,6 @@
An unknown error occurred. Please try again.
Angle
Annotations Sidebar
- Black
Block copied
@@ -3022,16 +3021,14 @@
Block settings
Blog
- Blush bordeaux
- Blush light purple
Choose from device
Choose image
Choose image or video
+ Choose images
Choose video
City, 10100
Content…
- Cool to warm spectrum
Copied block
Copy block
@@ -3039,7 +3036,7 @@
CUSTOMIZE
Customize Gradient
Cut block
- Cyan bluish gray
+ Dismiss
Don’t cry because it’s over, smile because it happened.
Double tap to add a block
@@ -3068,8 +3065,8 @@
Dr. Seuss
Duplicate block
+ Edit using web editor
Edit video
- Electric grass
Email me: <a href=\"mailto:mail@example.com\">mail@example.com</a>
Excerpt length (words)
@@ -3083,6 +3080,8 @@ translators: sample content for "Services" page template
translators: sample content for "Team" page template -->
Get in Touch
Gradient Type
+ Help button
+ Help icon
Here is the panel content!
Hide keyboard
@@ -3103,15 +3102,7 @@ translators: sample content for "Services" page template -->
Let\'s build something together!
Let\'s talk 👋 Don\'t hesitate to reach out with the contact information below, or send a message using the form.
- Light green cyan
- Light green cyan to vivid green cyan
Link To
- Luminous dusk
- Luminous vivid amber
- Luminous vivid amber to luminous vivid orange
- Luminous vivid orange
- Luminous vivid orange to vivid red
- Midnight
Move block down
Move block down from row %1$s to row %2$s
@@ -3147,9 +3138,6 @@ translators: sample content for "Services" page template -->
Page title. Empty
Page title. %s
- Pale cyan blue
- Pale ocean
- Pale pink
Paste block after
Paste URL
@@ -3175,6 +3163,8 @@ translators: sample content for "Services" page template -->
%s block options
%s block. This block has invalid content
+
+ \'%s\' is not fully–supported
Sally Smith
@@ -3197,6 +3187,7 @@ translators: sample content for "Services" page template -->
Take a Photo
Take a Photo or Video
Take a Video
+ Tap here to show help
Tap to hide the keyboard
Team
@@ -3212,18 +3203,12 @@ translators: sample content for "Services" page template -->
Updates the title.
USA
- Very light gray to cyan bluish gray
Video caption. Empty
Video caption. %s
Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.
- Vivid cyan blue
- Vivid cyan blue to vivid purple
- Vivid green cyan
- Vivid purple
- Vivid red
Walt Disney
@@ -3231,13 +3216,13 @@ translators: sample content for "Services" page template -->
Warning Message
We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.
+ We are working hard to add more blocks with each release.
We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.
Welcome to our new blog
What People Say
- White
WordPress Media Library
You need to grant the app audio recording permission in order to record video
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
index 883943af7483..3e4095d2213a 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
@@ -24,7 +24,7 @@ public class WPGutenbergWebViewActivity extends GutenbergWebViewActivity {
public static final String ARG_USER_ID = "authenticated_user_id";
public static final String ARG_BLOCK_ID = "block_id";
- public static final String ARG_BLOCK_NAME = "block_name";
+ public static final String ARG_BLOCK_TITLE = "block_title";
public static final String ARG_BLOCK_CONTENT = "block_content";
private boolean mIsJetpackSsoEnabled;
@@ -73,9 +73,9 @@ && getIntent().getExtras() != null) {
@Override
protected String getToolbarTitle() {
- String blockName = getIntent().getExtras().getString(ARG_BLOCK_NAME);
- if (blockName != null) {
- return String.format(getString(R.string.menu_toolbar_title), blockName);
+ String blockTitle = getIntent().getExtras().getString(ARG_BLOCK_TITLE);
+ if (blockTitle != null) {
+ return String.format(getString(R.string.menu_toolbar_title), blockTitle);
}
return "";
}
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
index 2080c1e866fe..f6ee37e51a8f 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
@@ -307,7 +307,8 @@ public void gutenbergDidRequestUnsupportedBlockFallback(UnsupportedBlock unsuppo
openGutenbergWebViewActivity(
unsupportedBlock.getContent(),
unsupportedBlock.getId(),
- unsupportedBlock.getName()
+ unsupportedBlock.getName(),
+ unsupportedBlock.getTitle()
);
}
},
@@ -360,7 +361,7 @@ public void run() {
return view;
}
- private void openGutenbergWebViewActivity(String content, String blockId, String blockName) {
+ private void openGutenbergWebViewActivity(String content, String blockId, String blockName, String blockTitle) {
GutenbergWebViewAuthorizationData gutenbergWebViewAuthData =
getArguments().getParcelable(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA);
@@ -370,7 +371,7 @@ private void openGutenbergWebViewActivity(String content, String blockId, String
Intent intent = new Intent(getActivity(), WPGutenbergWebViewActivity.class);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_ID, blockId);
- intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_NAME, blockName);
+ intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_TITLE, blockTitle);
intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_CONTENT, content);
intent.putExtra(WPGutenbergWebViewActivity.ARG_GUTENBERG_WEB_VIEW_AUTH_DATA, gutenbergWebViewAuthData);
diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index 8f48746bda6e..9f2615778c98 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit 8f48746bda6ee74fc3b22e64ce93f6a09a00dff7
+Subproject commit 9f2615778c9868643d756047424725f0e7828a74