From c5748e2d94b62645fff6d5a518ddb9c9367d3fde Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Thu, 5 Feb 2015 14:39:16 +0100
Subject: [PATCH] Buttons now use drawable padding (via InsetDrawable) to have
 some margins between them

---
 .../res/drawable-v21/metro_button_green.xml   |  1 -
 .../res/drawable/blue_button_dark_shape.xml   | 18 +++++++++-----
 .../main/res/drawable/blue_button_shape.xml   | 18 +++++++++-----
 .../cpp_wizard_button_shape_normal.xml        | 15 ++++++++----
 .../cpp_wizard_button_shape_pressed.xml       | 14 +++++++----
 .../res/drawable/gray_button_dark_shape.xml   | 18 +++++++++-----
 .../main/res/drawable/gray_button_shape.xml   | 18 +++++++++-----
 .../res/drawable/metro_blue_button_shape.xml  | 15 ++++++++----
 .../res/drawable/metro_button_dark_shape.xml  | 15 ++++++++----
 .../res/drawable/metro_button_green_shape.xml | 14 +++++++----
 .../res/drawable/metro_button_light_shape.xml | 14 +++++++----
 .../res/drawable/metro_button_pressed.xml     | 14 +++++++----
 .../drawable/metro_button_purple_shape.xml    | 14 +++++++----
 .../src/main/res/drawable/pane_background.xml |  2 +-
 .../res/drawable/violet_button_dark_shape.xml | 18 +++++++++-----
 .../main/res/drawable/violet_button_shape.xml | 18 +++++++++-----
 .../main/res/layout-land/main_first_pane.xml  | 24 +++++++++----------
 .../layout-land/main_first_pane_mobile.xml    |  7 +-----
 .../src/main/res/layout/main_calculator.xml   |  1 -
 .../res/layout/main_calculator_mobile.xml     | 10 ++++----
 .../src/main/res/layout/onscreen_layout.xml   |  1 -
 .../src/main/res/layout/widget_layout.xml     |  1 -
 .../res/layout/widget_layout_lockscreen.xml   |  1 -
 .../widget_layout_lockscreen_collapsed.xml    |  1 -
 android-app/src/main/res/values/dimens.xml    |  4 ++--
 android-app/src/main/res/values/styles.xml    |  3 ++-
 26 files changed, 178 insertions(+), 101 deletions(-)

diff --git a/android-app/src/main/res/drawable-v21/metro_button_green.xml b/android-app/src/main/res/drawable-v21/metro_button_green.xml
index bfa30618..94aca4c9 100644
--- a/android-app/src/main/res/drawable-v21/metro_button_green.xml
+++ b/android-app/src/main/res/drawable-v21/metro_button_green.xml
@@ -25,5 +25,4 @@
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
 	a:color="?attr/colorControlHighlight">
 	<item a:drawable="@drawable/metro_button_green_shape" />
-
 </ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/blue_button_dark_shape.xml b/android-app/src/main/res/drawable/blue_button_dark_shape.xml
index 77ffecfd..cfa81a68 100644
--- a/android-app/src/main/res/drawable/blue_button_dark_shape.xml
+++ b/android-app/src/main/res/drawable/blue_button_dark_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#000d1f"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#002255"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#000d1f" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/blue_button_shape.xml b/android-app/src/main/res/drawable/blue_button_shape.xml
index 2f27a937..ff610b86 100644
--- a/android-app/src/main/res/drawable/blue_button_shape.xml
+++ b/android-app/src/main/res/drawable/blue_button_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#001c45"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#003481"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#001c45" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml b/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
index 045b0f01..8cd284f1 100644
--- a/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
+++ b/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
@@ -20,7 +20,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_wizard_button_normal"/>
-	<corners a:radius="1dp"/>
-</shape>
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+
+	<shape>
+		<solid a:color="@color/cpp_wizard_button_normal" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml b/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
index 1bcffc65..862a4e59 100644
--- a/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
+++ b/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
@@ -20,7 +20,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_wizard_button_pressed"/>
-	<corners a:radius="1dp"/>
-</shape>
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="@color/cpp_wizard_button_pressed" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/gray_button_dark_shape.xml b/android-app/src/main/res/drawable/gray_button_dark_shape.xml
index 09c8dab8..c9bd26ea 100644
--- a/android-app/src/main/res/drawable/gray_button_dark_shape.xml
+++ b/android-app/src/main/res/drawable/gray_button_dark_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#000000"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#333333"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#000000" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/gray_button_shape.xml b/android-app/src/main/res/drawable/gray_button_shape.xml
index 0ebdbe72..c48afccc 100644
--- a/android-app/src/main/res/drawable/gray_button_shape.xml
+++ b/android-app/src/main/res/drawable/gray_button_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#071622"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#253541"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#071622" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/metro_blue_button_shape.xml b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
index 444dba47..e73624fc 100644
--- a/android-app/src/main/res/drawable/metro_blue_button_shape.xml
+++ b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
@@ -19,8 +19,13 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_metro_blue"/>
-	<corners a:radius="1dp"/>
-</shape>
\ No newline at end of file
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="@color/cpp_metro_blue" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_dark_shape.xml b/android-app/src/main/res/drawable/metro_button_dark_shape.xml
index 01ebba9b..431f9818 100644
--- a/android-app/src/main/res/drawable/metro_button_dark_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_dark_shape.xml
@@ -20,7 +20,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_metro_button"/>
-	<corners a:radius="1dp"/>
-</shape>
\ No newline at end of file
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+
+	<shape>
+		<solid a:color="@color/cpp_metro_button" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_green_shape.xml b/android-app/src/main/res/drawable/metro_button_green_shape.xml
index f7283980..ea29e6d8 100644
--- a/android-app/src/main/res/drawable/metro_button_green_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_green_shape.xml
@@ -20,7 +20,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_metro_green"/>
-	<corners a:radius="1dp"/>
-</shape>
\ No newline at end of file
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="@color/cpp_metro_green" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_light_shape.xml b/android-app/src/main/res/drawable/metro_button_light_shape.xml
index cc79ee29..e117bb28 100644
--- a/android-app/src/main/res/drawable/metro_button_light_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_light_shape.xml
@@ -20,7 +20,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_metro_button_light"/>
-	<corners a:radius="1dp"/>
-</shape>
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="@color/cpp_metro_button_light" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/metro_button_pressed.xml b/android-app/src/main/res/drawable/metro_button_pressed.xml
index 986e9493..011b180e 100644
--- a/android-app/src/main/res/drawable/metro_button_pressed.xml
+++ b/android-app/src/main/res/drawable/metro_button_pressed.xml
@@ -20,7 +20,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="#ff4d4d4d"/>
-	<corners a:radius="1dp"/>
-</shape>
\ No newline at end of file
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="#ff4d4d4d" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_purple_shape.xml b/android-app/src/main/res/drawable/metro_button_purple_shape.xml
index 272d6d0d..2e4575ed 100644
--- a/android-app/src/main/res/drawable/metro_button_purple_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_purple_shape.xml
@@ -20,7 +20,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_metro_purple"/>
-	<corners a:radius="1dp"/>
-</shape>
\ No newline at end of file
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<solid a:color="@color/cpp_metro_purple" />
+		<corners a:radius="@dimen/cpp_button_corner" />
+	</shape>
+</inset>
diff --git a/android-app/src/main/res/drawable/pane_background.xml b/android-app/src/main/res/drawable/pane_background.xml
index be8b33f7..9926010f 100644
--- a/android-app/src/main/res/drawable/pane_background.xml
+++ b/android-app/src/main/res/drawable/pane_background.xml
@@ -22,5 +22,5 @@
 
 <shape xmlns:a="http://schemas.android.com/apk/res/android">
 	<solid a:color="@color/cpp_pane_background"/>
-	<corners a:radius="1dp"/>
+	<corners a:radius="@dimen/cpp_button_corner"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/violet_button_dark_shape.xml b/android-app/src/main/res/drawable/violet_button_dark_shape.xml
index 5caaca03..fe31534f 100644
--- a/android-app/src/main/res/drawable/violet_button_dark_shape.xml
+++ b/android-app/src/main/res/drawable/violet_button_dark_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#2b0325"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#4f1c47"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#2b0325" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/violet_button_shape.xml b/android-app/src/main/res/drawable/violet_button_shape.xml
index 771c2f9b..9539efa8 100644
--- a/android-app/src/main/res/drawable/violet_button_shape.xml
+++ b/android-app/src/main/res/drawable/violet_button_shape.xml
@@ -22,10 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient
-			a:startColor="#520546"
+<inset xmlns:a="http://schemas.android.com/apk/res/android"
+	a:insetBottom="@dimen/cpp_button_padding"
+	a:insetLeft="@dimen/cpp_button_padding"
+	a:insetRight="@dimen/cpp_button_padding"
+	a:insetTop="@dimen/cpp_button_padding">
+	<shape>
+		<gradient
+			a:angle="90"
 			a:endColor="#8a307c"
-			a:angle="90"/>
-	<corners a:radius="0dp"/>
-</shape>
+			a:startColor="#520546" />
+		<corners a:radius="0dp" />
+	</shape>
+</inset>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout-land/main_first_pane.xml b/android-app/src/main/res/layout-land/main_first_pane.xml
index 6567d91e..d2746b83 100644
--- a/android-app/src/main/res/layout-land/main_first_pane.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane.xml
@@ -31,44 +31,43 @@
 			a:id="@+id/editorContainer"
 			a:layout_weight="2"
 			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+			a:layout_height="0dp"
+			a:orientation="horizontal"/>
 
 	<LinearLayout
 			a:layout_weight="1"
 			a:layout_width="match_parent"
-			a:layout_height="0dp">
+			a:layout_height="0dp"
+			a:baselineAligned="false"
+			a:orientation="horizontal">
 
 		<include
 				layout="@layout/cpp_drag_button_left"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
 		<include
 				layout="@layout/cpp_app_button_erase"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
 		<LinearLayout
-				a:id="@+id/displayContainer"
-				a:layout_height="match_parent"
-				a:layout_width="0dp"
-				a:layout_weight="4"
-				a:layout_margin="@dimen/cpp_display_margin_land"/>
+			a:id="@+id/displayContainer"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="4"
+			a:orientation="horizontal" />
 
 		<include
 				layout="@layout/cpp_drag_button_clear"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
 		<include
 				layout="@layout/cpp_drag_button_right"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
@@ -79,7 +78,8 @@
 			a:id="@+id/keyboardContainer"
 			a:layout_weight="3"
 			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+			a:layout_height="0dp"
+			a:orientation="horizontal"/>
 
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
index 6567d91e..fecc7c2f 100644
--- a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
@@ -40,14 +40,12 @@
 
 		<include
 				layout="@layout/cpp_drag_button_left"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
 		<include
 				layout="@layout/cpp_app_button_erase"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
@@ -56,19 +54,16 @@
 				a:id="@+id/displayContainer"
 				a:layout_height="match_parent"
 				a:layout_width="0dp"
-				a:layout_weight="4"
-				a:layout_margin="@dimen/cpp_display_margin_land"/>
+				a:layout_weight="4"/>
 
 		<include
 				layout="@layout/cpp_drag_button_clear"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
 		<include
 				layout="@layout/cpp_drag_button_right"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
diff --git a/android-app/src/main/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator.xml
index 77d335b7..e3e8f0a6 100644
--- a/android-app/src/main/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator.xml
@@ -42,7 +42,6 @@
 
 		<include
 				layout="@layout/cpp_drag_button_equals"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_weight="1"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"/>
diff --git a/android-app/src/main/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
index 77d335b7..3bcc7dae 100644
--- a/android-app/src/main/res/layout/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -33,7 +33,8 @@
 			a:id="@+id/editorContainer"
 			a:layout_weight="2"
 			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+			a:layout_height="0dp"
+			a:orientation="horizontal" />
 
 	<LinearLayout
 			a:layout_weight="1"
@@ -42,7 +43,6 @@
 
 		<include
 				layout="@layout/cpp_drag_button_equals"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_weight="1"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"/>
@@ -51,7 +51,8 @@
 				a:id="@+id/displayContainer"
 				a:layout_weight="4"
 				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
+				a:layout_height="match_parent"
+				a:orientation="horizontal" />
 
 	</LinearLayout>
 
@@ -59,6 +60,7 @@
 			a:id="@+id/keyboardContainer"
 			a:layout_weight="5"
 			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+			a:layout_height="0dp"
+			a:orientation="vertical" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/onscreen_layout.xml b/android-app/src/main/res/layout/onscreen_layout.xml
index d13c744a..55b3629f 100644
--- a/android-app/src/main/res/layout/onscreen_layout.xml
+++ b/android-app/src/main/res/layout/onscreen_layout.xml
@@ -26,7 +26,6 @@
 
 			<include
 					layout="@layout/cpp_simple_button_equals"
-					a:layout_margin="@dimen/cpp_button_margin"
 					a:layout_weight="1"
 					a:layout_width="0dp"
 					a:layout_height="match_parent"/>
diff --git a/android-app/src/main/res/layout/widget_layout.xml b/android-app/src/main/res/layout/widget_layout.xml
index 96c83c0a..25d1e0e9 100644
--- a/android-app/src/main/res/layout/widget_layout.xml
+++ b/android-app/src/main/res/layout/widget_layout.xml
@@ -19,7 +19,6 @@
 
 		<include
 				layout="@layout/cpp_simple_button_equals"
-				a:layout_margin="@dimen/cpp_button_margin"
 				a:layout_weight="1"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"/>
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen.xml b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
index e23f3db7..ab03574c 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
@@ -19,7 +19,6 @@
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
-			a:layout_margin="@dimen/cpp_button_margin"
 			a:layout_weight="1"
 			a:layout_width="0dp"
 			a:layout_height="match_parent" />
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
index 2f5799a6..49f64d9f 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
@@ -30,7 +30,6 @@
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
-			a:layout_margin="@dimen/cpp_button_margin"
 			a:layout_weight="1"
 			a:layout_width="0dp"
 			a:layout_height="match_parent" />
diff --git a/android-app/src/main/res/values/dimens.xml b/android-app/src/main/res/values/dimens.xml
index d965f28f..2aac1c0b 100644
--- a/android-app/src/main/res/values/dimens.xml
+++ b/android-app/src/main/res/values/dimens.xml
@@ -7,8 +7,8 @@
 	<dimen name="cpp_widget_margin">6dp</dimen>
 	<dimen name="min_expanded_height_lock_screen">300dp</dimen>
 	<dimen name="cpp_text_size">20sp</dimen>
-	<dimen name="cpp_button_margin">0.5dp</dimen>
-	<dimen name="cpp_display_margin_land">2.5dp</dimen>
+	<dimen name="cpp_button_padding">1px</dimen>
+	<dimen name="cpp_button_corner">1dp</dimen>
 
 	<dimen name="cpp_fragment_text_size">15sp</dimen>
 	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index 98c14e04..216b16d1 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -55,7 +55,8 @@
 		<item name="android:layout_weight">1</item>
 		<item name="android:focusable">true</item>
 		<item name="android:background">@drawable/metro_button_dark</item>
-		<item name="android:layout_margin">@dimen/cpp_button_margin</item>
+		<item name="android:layout_margin">0dp</item>
+		<item name="android:padding">@dimen/cpp_button_padding</item>
 		<item name="android:textSize">@dimen/cpp_keyboard_button_text_size</item>
 		<item name="android:textColor">@color/cpp_button_text</item>
 		<item name="android:scaleType">centerInside</item>