From a5b8caa4525070a4428f50af9e662e70b082c588 Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Mon, 30 Mar 2020 17:03:05 +0100
Subject: [PATCH 1/2] Disable align button on the heading block for Android

---
 packages/block-library/src/heading/edit.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index a9241cab5543e..e4b801cd6b522 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -38,12 +38,14 @@ function HeadingEdit( { attributes, setAttributes, mergeBlocks, onReplace } ) {
 						setAttributes( { level: newLevel } )
 					}
 				/>
-				<AlignmentToolbar
-					value={ align }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { align: nextAlign } );
-					} }
-				/>
+				{ Platform.OS !== 'android' && (
+					<AlignmentToolbar
+						value={ align }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { align: nextAlign } );
+						} }
+					/>
+				) }
 			</BlockControls>
 			{ Platform.OS === 'web' && (
 				<InspectorControls>

From 8d94d7ad0bf34551cddfc8bd9cb1e79f912f4361 Mon Sep 17 00:00:00 2001
From: Sergio Estevao <sergioestevao@gmail.com>
Date: Tue, 31 Mar 2020 00:37:54 +0100
Subject: [PATCH 2/2] Disable align heading options for android

---
 packages/block-library/src/heading/edit.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index e4b801cd6b522..1647cdc32496b 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -26,7 +26,11 @@ import { Platform } from '@wordpress/element';
 function HeadingEdit( { attributes, setAttributes, mergeBlocks, onReplace } ) {
 	const { align, content, level, placeholder } = attributes;
 	const tagName = 'h' + level;
-
+	const isAndroid = Platform.select( {
+		android: true,
+		native: false,
+		web: false,
+	} );
 	return (
 		<>
 			<BlockControls>
@@ -38,7 +42,7 @@ function HeadingEdit( { attributes, setAttributes, mergeBlocks, onReplace } ) {
 						setAttributes( { level: newLevel } )
 					}
 				/>
-				{ Platform.OS !== 'android' && (
+				{ ! isAndroid && (
 					<AlignmentToolbar
 						value={ align }
 						onChange={ ( nextAlign ) => {