From 94d67c12373d85e33ba4521cc71a5ce9828968ce Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sat, 21 Apr 2012 17:14:17 +0400
Subject: [PATCH] Layout simplifications

---
 .../res/layout-land/main_calculator.xml       | 186 +++++++++---------
 .../res/layout-land/main_cellphone.xml        | 185 +++++++++--------
 .../res/layout-port/main_calculator.xml       | 113 +++++------
 .../res/layout-port/main_cellphone.xml        | 114 +++++------
 4 files changed, 288 insertions(+), 310 deletions(-)

diff --git a/calculatorpp/res/layout-land/main_calculator.xml b/calculatorpp/res/layout-land/main_calculator.xml
index c466d2d5..9fd00589 100644
--- a/calculatorpp/res/layout-land/main_calculator.xml
+++ b/calculatorpp/res/layout-land/main_calculator.xml
@@ -5,120 +5,114 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
+<LinearLayout
+        xmlns:a="http://schemas.android.com/apk/res/android"
+        xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+        a:layout_width="fill_parent"
+        a:id="@+id/ad_parent_view"
+        a:layout_height="fill_parent"
+        a:orientation="vertical"
+        a:layout_gravity="center"
+        a:background="#ff000000">
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:background="#ff000000">
+    <include layout="@layout/calc_editor"/>
 
-	<LinearLayout
-			a:layout_width="fill_parent"
-			a:id="@+id/ad_parent_view"
-			a:layout_height="fill_parent"
-			a:orientation="vertical"
-			a:layout_gravity="center">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<include layout="@layout/calc_editor"/>
-
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
-
-			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-																   a:id="@+id/leftButton"
-																   c:textUp="◀◀"
-																   a:text="◀"
-																   c:directionTextScale="0.5"
-																   style="?controlButtonStyle"
-																   a:onClick="moveLeftButtonClickHandler"
-																   a:layout_width="0dp"
-																   a:layout_height="fill_parent"
-																   a:layout_weight="1"/>
+        <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                            xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                            a:id="@+id/leftButton"
+                                                            c:textUp="◀◀"
+                                                            a:text="◀"
+                                                            c:directionTextScale="0.5"
+                                                            style="?controlButtonStyle"
+                                                            a:onClick="moveLeftButtonClickHandler"
+                                                            a:layout_width="0dp"
+                                                            a:layout_height="fill_parent"
+                                                            a:layout_weight="1"/>
 
 
-			<org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-														   a:id="@+id/eraseButton"
-														   a:drawableTop="@drawable/sym_keyboard_delete"
-														   style="?controlImageButtonStyle"
-														   a:onClick="eraseButtonClickHandler"
-														   a:layout_width="0dp"
-														   a:layout_height="fill_parent"
-														   a:layout_weight="1"/>
+        <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                               xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                               a:id="@+id/eraseButton"
+                                               a:drawableTop="@drawable/sym_keyboard_delete"
+                                               style="?controlImageButtonStyle"
+                                               a:onClick="eraseButtonClickHandler"
+                                               a:layout_width="0dp"
+                                               a:layout_height="fill_parent"
+                                               a:layout_weight="1"/>
 
 
-			<include layout="@layout/calc_display"
-					 a:layout_width="0dp"
-					 a:layout_height="fill_parent"
-					 a:layout_weight="4"/>
+        <include layout="@layout/calc_display"
+                 a:layout_width="0dp"
+                 a:layout_height="fill_parent"
+                 a:layout_weight="4"/>
 
-			<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-														   a:id="@+id/clearButton"
-														   c:textUp="dec"
-														   a:text="@string/c_clear"
-														   c:textDown="bin"
-														   c:textLeft="hex"
-														   a:textStyle="bold"
-														   style="?controlImageButtonStyle"
-														   a:onClick="clearButtonClickHandler"
-														   a:layout_width="0dp"
-														   a:layout_height="fill_parent"
-														   a:layout_weight="1"/>
+        <org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                                 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                                 a:id="@+id/clearButton"
+                                                                 c:textUp="dec"
+                                                                 a:text="@string/c_clear"
+                                                                 c:textDown="bin"
+                                                                 c:textLeft="hex"
+                                                                 a:textStyle="bold"
+                                                                 style="?controlImageButtonStyle"
+                                                                 a:onClick="clearButtonClickHandler"
+                                                                 a:layout_width="0dp"
+                                                                 a:layout_height="fill_parent"
+                                                                 a:layout_weight="1"/>
 
-			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-																   a:id="@+id/rightButton"
-																   c:textUp="▶▶"
-																   a:text="▶"
-																   c:directionTextScale="0.5"
-																   style="?controlButtonStyle"
-																   a:onClick="moveRightButtonClickHandler"
-																   a:layout_width="0dp"
-																   a:layout_height="fill_parent"
-																   a:layout_weight="1"/>
+        <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                            xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                            a:id="@+id/rightButton"
+                                                            c:textUp="▶▶"
+                                                            a:text="▶"
+                                                            c:directionTextScale="0.5"
+                                                            style="?controlButtonStyle"
+                                                            a:onClick="moveRightButtonClickHandler"
+                                                            a:layout_width="0dp"
+                                                            a:layout_height="fill_parent"
+                                                            a:layout_weight="1"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_vars_button"/>
-			<include layout="@layout/calc_copy_button"/>
-			<include layout="@layout/calc_seven_digit_button"/>
-			<include layout="@layout/calc_eight_digit_button"/>
-			<include layout="@layout/calc_nine_digit_button"/>
-			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_equals_button"/>
+        <include layout="@layout/calc_vars_button"/>
+        <include layout="@layout/calc_copy_button"/>
+        <include layout="@layout/calc_seven_digit_button"/>
+        <include layout="@layout/calc_eight_digit_button"/>
+        <include layout="@layout/calc_nine_digit_button"/>
+        <include layout="@layout/calc_multiplication_button"/>
+        <include layout="@layout/calc_division_button"/>
+        <include layout="@layout/calc_equals_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_functions_button"/>
-			<include layout="@layout/calc_paste_button"/>
-			<include layout="@layout/calc_four_digit_button"/>
-			<include layout="@layout/calc_five_digit_button"/>
-			<include layout="@layout/calc_six_digit_button"/>
-			<include layout="@layout/calc_plus_button"/>
-			<include layout="@layout/calc_subtraction_button"/>
-			<include layout="@layout/calc_round_brackets_button"/>
+        <include layout="@layout/calc_functions_button"/>
+        <include layout="@layout/calc_paste_button"/>
+        <include layout="@layout/calc_four_digit_button"/>
+        <include layout="@layout/calc_five_digit_button"/>
+        <include layout="@layout/calc_six_digit_button"/>
+        <include layout="@layout/calc_plus_button"/>
+        <include layout="@layout/calc_subtraction_button"/>
+        <include layout="@layout/calc_round_brackets_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_operators_button"/>
-			<include layout="@layout/calc_donate_button"/>
-			<include layout="@layout/calc_one_digit_button"/>
-			<include layout="@layout/calc_two_digit_button"/>
-			<include layout="@layout/calc_three_digit_button"/>
-			<include layout="@layout/calc_zero_digit_button"/>
-			<include layout="@layout/calc_dot_button"/>
-			<include layout="@layout/calc_history_button"/>
+        <include layout="@layout/calc_operators_button"/>
+        <include layout="@layout/calc_donate_button"/>
+        <include layout="@layout/calc_one_digit_button"/>
+        <include layout="@layout/calc_two_digit_button"/>
+        <include layout="@layout/calc_three_digit_button"/>
+        <include layout="@layout/calc_zero_digit_button"/>
+        <include layout="@layout/calc_dot_button"/>
+        <include layout="@layout/calc_history_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-	</LinearLayout>
 </LinearLayout>
diff --git a/calculatorpp/res/layout-land/main_cellphone.xml b/calculatorpp/res/layout-land/main_cellphone.xml
index fdafbf58..93b691c3 100644
--- a/calculatorpp/res/layout-land/main_cellphone.xml
+++ b/calculatorpp/res/layout-land/main_cellphone.xml
@@ -1,118 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:background="#ff000000">
+<LinearLayout
+        xmlns:a="http://schemas.android.com/apk/res/android"
+        xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
+        a:id="@+id/ad_parent_view"
+        a:orientation="vertical"
+        a:layout_gravity="center"
+        a:background="#ff000000">
 
-	<LinearLayout
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
-			a:id="@+id/ad_parent_view"
-			a:orientation="vertical"
-			a:layout_gravity="center">
+    <include layout="@layout/calc_editor"/>
 
-		<include layout="@layout/calc_editor"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
-
-			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-																   a:id="@+id/leftButton"
-																   c:textUp="◀◀"
-																   a:text="◀"
-																   c:directionTextScale="0.5"
-																   style="?controlButtonStyle"
-																   a:onClick="moveLeftButtonClickHandler"
-																   a:layout_width="0dp"
-																   a:layout_height="fill_parent"
-																   a:layout_weight="1"/>
+        <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                            xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                            a:id="@+id/leftButton"
+                                                            c:textUp="◀◀"
+                                                            a:text="◀"
+                                                            c:directionTextScale="0.5"
+                                                            style="?controlButtonStyle"
+                                                            a:onClick="moveLeftButtonClickHandler"
+                                                            a:layout_width="0dp"
+                                                            a:layout_height="fill_parent"
+                                                            a:layout_weight="1"/>
 
 
-			<org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-														   a:id="@+id/eraseButton"
-														   a:drawableTop="@drawable/sym_keyboard_delete"
-														   style="?controlImageButtonStyle"
-														   a:onClick="eraseButtonClickHandler"
-														   a:layout_width="0dp"
-														   a:layout_height="fill_parent"
-														   a:layout_weight="1"/>
+        <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                               xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                               a:id="@+id/eraseButton"
+                                               a:drawableTop="@drawable/sym_keyboard_delete"
+                                               style="?controlImageButtonStyle"
+                                               a:onClick="eraseButtonClickHandler"
+                                               a:layout_width="0dp"
+                                               a:layout_height="fill_parent"
+                                               a:layout_weight="1"/>
 
 
-			<include layout="@layout/calc_display"
-					 a:layout_width="0dp"
-					 a:layout_height="fill_parent"
-					 a:layout_weight="4"/>
+        <include layout="@layout/calc_display"
+                 a:layout_width="0dp"
+                 a:layout_height="fill_parent"
+                 a:layout_weight="4"/>
 
-			<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-														   a:id="@+id/clearButton"
-														   c:textUp="dec"
-														   a:text="@string/c_clear"
-														   c:textDown="bin"
-														   c:textLeft="hex"
-														   a:textStyle="bold"
-														   style="?controlImageButtonStyle"
-														   a:onClick="clearButtonClickHandler"
-														   a:layout_width="0dp"
-														   a:layout_height="fill_parent"
-														   a:layout_weight="1"/>
+        <org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                                 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                                 a:id="@+id/clearButton"
+                                                                 c:textUp="dec"
+                                                                 a:text="@string/c_clear"
+                                                                 c:textDown="bin"
+                                                                 c:textLeft="hex"
+                                                                 a:textStyle="bold"
+                                                                 style="?controlImageButtonStyle"
+                                                                 a:onClick="clearButtonClickHandler"
+                                                                 a:layout_width="0dp"
+                                                                 a:layout_height="fill_parent"
+                                                                 a:layout_weight="1"/>
 
-			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-																   a:id="@+id/rightButton"
-																   c:textUp="▶▶"
-																   a:text="▶"
-																   c:directionTextScale="0.5"
-																   style="?controlButtonStyle"
-																   a:onClick="moveRightButtonClickHandler"
-																   a:layout_width="0dp"
-																   a:layout_height="fill_parent"
-																   a:layout_weight="1"/>
+        <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+                                                            xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+                                                            a:id="@+id/rightButton"
+                                                            c:textUp="▶▶"
+                                                            a:text="▶"
+                                                            c:directionTextScale="0.5"
+                                                            style="?controlButtonStyle"
+                                                            a:onClick="moveRightButtonClickHandler"
+                                                            a:layout_width="0dp"
+                                                            a:layout_height="fill_parent"
+                                                            a:layout_weight="1"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_vars_button"/>
-			<include layout="@layout/calc_copy_button"/>
-			<include layout="@layout/calc_one_digit_button"/>
-			<include layout="@layout/calc_two_digit_button"/>
-			<include layout="@layout/calc_three_digit_button"/>
-			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_equals_button"/>
+        <include layout="@layout/calc_vars_button"/>
+        <include layout="@layout/calc_copy_button"/>
+        <include layout="@layout/calc_one_digit_button"/>
+        <include layout="@layout/calc_two_digit_button"/>
+        <include layout="@layout/calc_three_digit_button"/>
+        <include layout="@layout/calc_multiplication_button"/>
+        <include layout="@layout/calc_division_button"/>
+        <include layout="@layout/calc_equals_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_functions_button"/>
-			<include layout="@layout/calc_paste_button"/>
-			<include layout="@layout/calc_four_digit_button"/>
-			<include layout="@layout/calc_five_digit_button"/>
-			<include layout="@layout/calc_six_digit_button"/>
-			<include layout="@layout/calc_plus_button"/>
-			<include layout="@layout/calc_subtraction_button"/>
-			<include layout="@layout/calc_round_brackets_button"/>
+        <include layout="@layout/calc_functions_button"/>
+        <include layout="@layout/calc_paste_button"/>
+        <include layout="@layout/calc_four_digit_button"/>
+        <include layout="@layout/calc_five_digit_button"/>
+        <include layout="@layout/calc_six_digit_button"/>
+        <include layout="@layout/calc_plus_button"/>
+        <include layout="@layout/calc_subtraction_button"/>
+        <include layout="@layout/calc_round_brackets_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_operators_button"/>
-			<include layout="@layout/calc_donate_button"/>
-			<include layout="@layout/calc_seven_digit_button"/>
-			<include layout="@layout/calc_eight_digit_button"/>
-			<include layout="@layout/calc_nine_digit_button"/>
-			<include layout="@layout/calc_zero_digit_button"/>
-			<include layout="@layout/calc_dot_button"/>
-			<include layout="@layout/calc_history_button"/>
+        <include layout="@layout/calc_operators_button"/>
+        <include layout="@layout/calc_donate_button"/>
+        <include layout="@layout/calc_seven_digit_button"/>
+        <include layout="@layout/calc_eight_digit_button"/>
+        <include layout="@layout/calc_nine_digit_button"/>
+        <include layout="@layout/calc_zero_digit_button"/>
+        <include layout="@layout/calc_dot_button"/>
+        <include layout="@layout/calc_history_button"/>
 
-		</LinearLayout>
+    </LinearLayout>
 
-	</LinearLayout>
 </LinearLayout>
diff --git a/calculatorpp/res/layout-port/main_calculator.xml b/calculatorpp/res/layout-port/main_calculator.xml
index 5883edcf..909f5c5e 100644
--- a/calculatorpp/res/layout-port/main_calculator.xml
+++ b/calculatorpp/res/layout-port/main_calculator.xml
@@ -6,84 +6,79 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:background="#ff000000">
+<LinearLayout
+        xmlns:a="http://schemas.android.com/apk/res/android"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
+        a:id="@+id/ad_parent_view"
+        a:orientation="vertical"
+        a:layout_gravity="center"
+        a:background="#ff000000">
 
-	<LinearLayout
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
-			a:id="@+id/ad_parent_view"
-			a:orientation="vertical"
-			a:layout_gravity="center">
+    <include layout="@layout/calc_editor"/>
 
-		<include layout="@layout/calc_editor"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_equals_button"
+                 a:layout_weight="1"
+                 a:layout_width="0dp"
+                 a:layout_height="fill_parent"/>
 
-			<include layout="@layout/calc_equals_button"
-					 a:layout_weight="1"
-					 a:layout_width="0dp"
-					 a:layout_height="fill_parent"/>
+        <include layout="@layout/calc_display"
+                 a:layout_weight="4"
+                 a:layout_width="0dp"
+                 a:layout_height="fill_parent"/>
 
-			<include layout="@layout/calc_display"
-					 a:layout_weight="4"
-					 a:layout_width="0dp"
-					 a:layout_height="fill_parent"/>
+    </LinearLayout>
 
-		</LinearLayout>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_seven_digit_button"/>
+        <include layout="@layout/calc_eight_digit_button"/>
+        <include layout="@layout/calc_nine_digit_button"/>
+        <include layout="@layout/calc_multiplication_button"/>
+        <include layout="@layout/calc_clear_button"/>
 
-			<include layout="@layout/calc_seven_digit_button"/>
-			<include layout="@layout/calc_eight_digit_button"/>
-			<include layout="@layout/calc_nine_digit_button"/>
-			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_clear_button"/>
+    </LinearLayout>
 
-		</LinearLayout>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_four_digit_button"/>
+        <include layout="@layout/calc_five_digit_button"/>
+        <include layout="@layout/calc_six_digit_button"/>
+        <include layout="@layout/calc_division_button"/>
+        <include layout="@layout/calc_erase_button"/>
 
-			<include layout="@layout/calc_four_digit_button"/>
-			<include layout="@layout/calc_five_digit_button"/>
-			<include layout="@layout/calc_six_digit_button"/>
-			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_erase_button"/>
+    </LinearLayout>
 
-		</LinearLayout>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_one_digit_button"/>
+        <include layout="@layout/calc_two_digit_button"/>
+        <include layout="@layout/calc_three_digit_button"/>
+        <include layout="@layout/calc_plus_button"/>
+        <include layout="@layout/calc_copy_button"/>
 
-			<include layout="@layout/calc_one_digit_button"/>
-			<include layout="@layout/calc_two_digit_button"/>
-			<include layout="@layout/calc_three_digit_button"/>
-			<include layout="@layout/calc_plus_button"/>
-			<include layout="@layout/calc_copy_button"/>
+    </LinearLayout>
 
-		</LinearLayout>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_round_brackets_button"/>
+        <include layout="@layout/calc_zero_digit_button"/>
+        <include layout="@layout/calc_dot_button"/>
+        <include layout="@layout/calc_subtraction_button"/>
+        <include layout="@layout/calc_paste_button"/>
 
-			<include layout="@layout/calc_round_brackets_button"/>
-			<include layout="@layout/calc_zero_digit_button"/>
-			<include layout="@layout/calc_dot_button"/>
-			<include layout="@layout/calc_subtraction_button"/>
-			<include layout="@layout/calc_paste_button"/>
-
-		</LinearLayout>
+    </LinearLayout>
 
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_left_button"/>
-			<include layout="@layout/calc_right_button"/>
-			<include layout="@layout/calc_vars_button"/>
-			<include layout="@layout/calc_functions_button"/>
-			<include layout="@layout/calc_history_button"/>
+        <include layout="@layout/calc_left_button"/>
+        <include layout="@layout/calc_right_button"/>
+        <include layout="@layout/calc_vars_button"/>
+        <include layout="@layout/calc_functions_button"/>
+        <include layout="@layout/calc_history_button"/>
 
-		</LinearLayout>
-	</LinearLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/calculatorpp/res/layout-port/main_cellphone.xml b/calculatorpp/res/layout-port/main_cellphone.xml
index cdea70f1..5235254a 100644
--- a/calculatorpp/res/layout-port/main_cellphone.xml
+++ b/calculatorpp/res/layout-port/main_cellphone.xml
@@ -1,83 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:a="http://schemas.android.com/apk/res/android"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
+        a:id="@+id/ad_parent_view"
+        a:orientation="vertical"
+        a:layout_gravity="center"
+        a:background="#ff000000">
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:background="#ff000000">
+    <include layout="@layout/calc_editor"/>
 
-	<LinearLayout
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
-			a:id="@+id/ad_parent_view"
-			a:orientation="vertical"
-			a:layout_gravity="center">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		<include layout="@layout/calc_editor"/>
+        <include layout="@layout/calc_equals_button"
+                 a:layout_weight="4"
+                 a:layout_width="fill_parent"
+                 a:layout_height="fill_parent"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+        <include layout="@layout/calc_display"
+                 a:layout_weight="1"
+                 a:layout_width="fill_parent"
+                 a:layout_height="fill_parent"/>
 
-			<include layout="@layout/calc_equals_button"
-					 a:layout_weight="4"
-					 a:layout_width="fill_parent"
-					 a:layout_height="fill_parent"/>
+    </LinearLayout>
 
-			<include layout="@layout/calc_display"
-					 a:layout_weight="1"
-					 a:layout_width="fill_parent"
-					 a:layout_height="fill_parent"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		</LinearLayout>
+        <include layout="@layout/calc_one_digit_button"/>
+        <include layout="@layout/calc_two_digit_button"/>
+        <include layout="@layout/calc_three_digit_button"/>
+        <include layout="@layout/calc_multiplication_button"/>
+        <include layout="@layout/calc_clear_button"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    </LinearLayout>
 
-			<include layout="@layout/calc_one_digit_button"/>
-			<include layout="@layout/calc_two_digit_button"/>
-			<include layout="@layout/calc_three_digit_button"/>
-			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_clear_button"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		</LinearLayout>
+        <include layout="@layout/calc_four_digit_button"/>
+        <include layout="@layout/calc_five_digit_button"/>
+        <include layout="@layout/calc_six_digit_button"/>
+        <include layout="@layout/calc_division_button"/>
+        <include layout="@layout/calc_erase_button"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    </LinearLayout>
 
-			<include layout="@layout/calc_four_digit_button"/>
-			<include layout="@layout/calc_five_digit_button"/>
-			<include layout="@layout/calc_six_digit_button"/>
-			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_erase_button"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		</LinearLayout>
+        <include layout="@layout/calc_seven_digit_button"/>
+        <include layout="@layout/calc_eight_digit_button"/>
+        <include layout="@layout/calc_nine_digit_button"/>
+        <include layout="@layout/calc_plus_button"/>
+        <include layout="@layout/calc_copy_button"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    </LinearLayout>
 
-			<include layout="@layout/calc_seven_digit_button"/>
-			<include layout="@layout/calc_eight_digit_button"/>
-			<include layout="@layout/calc_nine_digit_button"/>
-			<include layout="@layout/calc_plus_button"/>
-			<include layout="@layout/calc_copy_button"/>
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-		</LinearLayout>
+        <include layout="@layout/calc_round_brackets_button"/>
+        <include layout="@layout/calc_zero_digit_button"/>
+        <include layout="@layout/calc_dot_button"/>
+        <include layout="@layout/calc_subtraction_button"/>
+        <include layout="@layout/calc_paste_button"/>
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
-
-			<include layout="@layout/calc_round_brackets_button"/>
-			<include layout="@layout/calc_zero_digit_button"/>
-			<include layout="@layout/calc_dot_button"/>
-			<include layout="@layout/calc_subtraction_button"/>
-			<include layout="@layout/calc_paste_button"/>
-
-		</LinearLayout>
+    </LinearLayout>
 
 
-		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
+    <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<include layout="@layout/calc_left_button"/>
-			<include layout="@layout/calc_right_button"/>
-			<include layout="@layout/calc_vars_button"/>
-			<include layout="@layout/calc_functions_button"/>
-			<include layout="@layout/calc_history_button"/>
+        <include layout="@layout/calc_left_button"/>
+        <include layout="@layout/calc_right_button"/>
+        <include layout="@layout/calc_vars_button"/>
+        <include layout="@layout/calc_functions_button"/>
+        <include layout="@layout/calc_history_button"/>
 
-		</LinearLayout>
-	</LinearLayout>
+    </LinearLayout>
 </LinearLayout>