Merge branch 'trunk' into fix/improve-loading-time

aztec/build.gradle

@@ -72,6 +72,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
 
     implementation 'org.apache.commons:commons-lang3:3.8.1'
+
+    lintChecks "org.wordpress:lint:$wordpressLintVersion"
 }
 
 project.afterEvaluate {

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -36,6 +36,7 @@ import android.os.Parcelable
 import android.provider.Settings
 import android.text.Editable
 import android.text.InputFilter
+import android.text.InputType
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -695,13 +696,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection {
-        val baseInputConnection = requireNotNull(super.onCreateInputConnection(outAttrs)).wrapWithBackSpaceHandler()
-        return if (shouldOverridePredictiveTextBehavior()) {
-            AppLog.d(AppLog.T.EDITOR, "Overriding predictive text behavior on Samsung device with Samsung Keyboard with API 33")
-            SamsungInputConnection(this, baseInputConnection)
-        } else {
-            baseInputConnection
+        val inputConnection = requireNotNull(super.onCreateInputConnection(outAttrs)).wrapWithBackSpaceHandler()
+
+        if (shouldOverridePredictiveTextBehavior()) {
+            AppLog.d(AppLog.T.EDITOR, "Disabling autocorrect on Samsung device with Samsung Keyboard with API 33")
+            outAttrs.inputType = outAttrs.inputType or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
         }
+
+        return inputConnection
     }
 
     private fun InputConnection.wrapWithBackSpaceHandler(): InputConnection {
@@ -1838,7 +1840,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         bypassMediaDeletedListener = false
     }
 
-    // removes Grammarly suggestions from default keyboard on Samsung devices on Android 13 (API 33)
+    // removes auto-correct from default keyboard on Samsung devices on Android 13 (API 33)
     // Grammarly implementation is often messing spans and cursor position, as described here:
     // https://github.com/wordpress-mobile/AztecEditor-Android/issues/1023
     fun enableSamsungPredictiveBehaviorOverride() {

build.gradle

@@ -69,6 +69,7 @@ ext {
 }
 
 ext {
+    // mixed
     gradlePluginVersion = '3.3.1'
     kotlinCoroutinesVersion = '1.6.4'
     tagSoupVersion = '1.2.1'
@@ -80,5 +81,9 @@ ext {
     wordpressUtilsVersion = '3.5.0'
     espressoVersion = '3.0.1'
 
+    // other
+    wordpressLintVersion = '2.0.0'
+
+    // project
     aztecProjectDependency = project.hasProperty("aztecVersion") ? "org.wordpress:aztec:${project.getProperty("aztecVersion")}" : project(":aztec")
 }