Merge branch 'trunk' into feature/item-indent

Author: planarvoid

.buildkite/pipeline.yml

@@ -1,7 +1,7 @@
 common-params:
   &publish-android-artifacts-docker-container
   docker#v3.8.0:
-    image: "public.ecr.aws/automattic/android-build-image:v1.1.0"
+    image: "public.ecr.aws/automattic/android-build-image:v1.2.0"
     propagate-environment: true
     environment:
       # DO NOT MANUALLY SET THESE VALUES!

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -14,7 +14,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.os.Handler
@@ -664,12 +663,7 @@ open class MainActivity : AppCompatActivity(),
 
     private fun onPhotosMediaOptionSelected() {
         if (PermissionUtils.checkAndRequestStoragePermission(this, MEDIA_PHOTOS_PERMISSION_REQUEST_CODE)) {
-            val intent: Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                Intent(Intent.ACTION_OPEN_DOCUMENT)
-            } else {
-                Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT), getString(R.string.title_select_photo))
-            }
-
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
             intent.addCategory(Intent.CATEGORY_OPENABLE)
             intent.type = "image/*"
 
@@ -684,12 +678,7 @@ open class MainActivity : AppCompatActivity(),
 
     private fun onVideosMediaOptionSelected() {
         if (PermissionUtils.checkAndRequestStoragePermission(this, MEDIA_PHOTOS_PERMISSION_REQUEST_CODE)) {
-            val intent: Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                Intent(Intent.ACTION_OPEN_DOCUMENT)
-            } else {
-                Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT), getString(R.string.title_select_video))
-            }
-
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
             intent.addCategory(Intent.CATEGORY_OPENABLE)
             intent.type = "video/*"
 

app/src/main/res/drawable-ldrtl-v17/ic_action_redo_white_24dp.xml

@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-
-    <dimen name="bullet_margin">32dp</dimen>
-    <dimen name="bullet_padding">8dp</dimen>
-    <dimen name="bullet_width">2dp</dimen>
-    <dimen name="quote_margin">32dp</dimen>
-    <dimen name="quote_padding">8dp</dimen>
-    <dimen name="quote_width">2dp</dimen>
-    <dimen name="spacing_extra">4dp</dimen>
-    <item type="dimen" format="string" name="spacing_multiplier">1.0</item>
-
     <bool name="is_large_tablet_landscape">false</bool>
-
 </resources>

app/src/main/res/drawable-ldrtl-v17/ic_action_redo_white_30_24dp.xml

@@ -7,12 +7,6 @@
     <string name="edit_hint">Tenochtitlan is the hint</string>
     <string name="source_hint">Codex is the source</string>
 
-    <!-- DIALOG -->
-    <string name="dialog_title">Insert link</string>
-    <string name="dialog_edit_hint">http(s)://</string>
-    <string name="dialog_button_ok">OK</string>
-    <string name="dialog_button_cancel">Cancel</string>
-
     <!-- MENU -->
     <string name="menu_undo">Undo</string>
     <string name="menu_redo">Redo</string>