Merge pull request #1410 from wordpress-mobile/master-v1.14.0-to-develop

Merge master (v1.14.0) back to develop
wordpress-mobile · Oct 8, 2019 · 0d13e85 · 0d13e85
2 parents e0fbf04 + 6ceeab3
commit 0d13e85
Show file tree

Hide file tree

Showing 9 changed files with 1,187 additions and 1,159 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -8,6 +8,7 @@
 ------
 * Fix a bug on iOS 13.0 were tapping on a link opens Safari
 * Fix a link editing issue, where trying to add a empty link at the start of another link would remove the existing link.
+* Fix missing content on long posts in html mode on Android
 
 1.12.0
 ------

diff --git a/bundle/android/App.js b/bundle/android/App.js
diff --git a/bundle/android/App.js.map b/bundle/android/App.js.map
diff --git a/bundle/ios/App.js b/bundle/ios/App.js
diff --git a/bundle/ios/App.js.map b/bundle/ios/App.js.map
diff --git a/gutenberg b/gutenberg
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         wordpressUtilsVersion = '1.22'
         espressoVersion = '3.0.1'
 
-        aztecVersion = 'v1.3.30'
+        aztecVersion = 'v1.3.31'
     }
 
     repositories {

diff --git a/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -4,6 +4,7 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.MutableContextWrapper;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -524,6 +525,20 @@ public void appendMediaFile(int mediaId, final String mediaUrl, final boolean is
         }
     }
 
+
+    public void toggleEditorMode(boolean htmlModeEnabled) {
+        // Turn off hardware acceleration for Oreo
+        // see https://github.com/wordpress-mobile/gutenberg-mobile/issues/1268#issuecomment-535887390
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                && Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
+            if (htmlModeEnabled) {
+                mReactRootView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+            } else {
+                mReactRootView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+            }
+        }
+    }
+
     public void appendMediaFiles(ArrayList<Media> mediaList) {
         if (mPendingMediaSelectedCallback != null && mMediaPickedByUserOnBlock) {
             mMediaPickedByUserOnBlock = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     ------
     * Fix a bug on iOS 13.0 were tapping on a link opens Safari
     * Fix a link editing issue, where trying to add a empty link at the start of another link would remove the existing link.
+    * Fix missing content on long posts in html mode on Android
 .12.0
     ------
@@ Expand Down @@
+2 −2		packages/block-library/src/heading/heading-level-icon.js
+3 −2		packages/block-library/src/heading/heading-toolbar.js
+6 −1		packages/components/src/primitives/svg/index.js
+1 −1		packages/components/src/primitives/svg/index.native.js
+1 −1		packages/edit-post/src/plugins/copy-content-menu-item/index.js
+13 −9		packages/rich-text/src/component/index.native.js
+0 −1		packages/rich-text/src/component/style.native.scss