history changes

2011-12-18 22:38:34 +04:00
parent c4ecdbf8d3
commit dc40632cc0
48 changed files with 455 additions and 476 deletions
--- a/res/layout-land/main_calculator.xml
+++ b/res/layout-land/main_calculator.xml
@@ -7,7 +7,7 @@
  -->

 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			  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"
@@ -24,11 +24,11 @@
 		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">

 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/leftButton"
-																   calc:textUp="◀◀"
+																   c:textUp="◀◀"
 																   a:text="◀"
-																   calc:directionTextScale="0.5"
+																   c:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveLeftButtonClickHandler"
 																   a:layout_width="0dp"
@@ -37,7 +37,7 @@


 			<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 														   a:id="@+id/eraseButton"
 														   a:drawableTop="@drawable/sym_keyboard_delete"
 														   style="?controlImageButtonStyle"
@@ -53,11 +53,13 @@
 					 a:layout_weight="4"/>

 			<org.solovyev.android.view.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 														   a:id="@+id/clearButton"
-														   calc:textUp="dec"
+														   c:textUp="dec"
+														   c:textRight="oct"
 														   a:text="@string/c_clear"
-														   calc:textDown="bin"
+														   c:textDown="bin"
+														   c:textLeft="hex"
 														   a:textStyle="bold"
 														   style="?controlImageButtonStyle"
 														   a:onClick="clearButtonClickHandler"
@@ -66,11 +68,11 @@
 														   a:layout_weight="1"/>

 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/rightButton"
-																   calc:textUp="▶▶"
+																   c:textUp="▶▶"
 																   a:text="▶"
-																   calc:directionTextScale="0.5"
+																   c:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveRightButtonClickHandler"
 																   a:layout_width="0dp"
--- a/res/layout-land/main_cellphone.xml
+++ b/res/layout-land/main_cellphone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			  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"
@@ -18,11 +18,11 @@
 		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">

 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/leftButton"
-																   calc:textUp="◀◀"
+																   c:textUp="◀◀"
 																   a:text="◀"
-																   calc:directionTextScale="0.5"
+																   c:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveLeftButtonClickHandler"
 																   a:layout_width="0dp"
@@ -31,7 +31,7 @@


 			<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 														   a:id="@+id/eraseButton"
 														   a:drawableTop="@drawable/sym_keyboard_delete"
 														   style="?controlImageButtonStyle"
@@ -47,11 +47,13 @@
 					 a:layout_weight="4"/>

 			<org.solovyev.android.view.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+														   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 														   a:id="@+id/clearButton"
-														   calc:textUp="dec"
+														   c:textUp="dec"
+														   c:textRight="oct"
 														   a:text="@string/c_clear"
-														   calc:textDown="bin"
+														   c:textDown="bin"
+														   c:textLeft="hex"
 														   a:textStyle="bold"
 														   style="?controlImageButtonStyle"
 														   a:onClick="clearButtonClickHandler"
@@ -60,11 +62,11 @@
 														   a:layout_weight="1"/>

 			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-																   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/rightButton"
-																   calc:textUp="▶▶"
+																   c:textUp="▶▶"
 																   a:text="▶"
-																   calc:directionTextScale="0.5"
+																   c:directionTextScale="0.5"
 																   style="?controlButtonStyle"
 																   a:onClick="moveRightButtonClickHandler"
 																   a:layout_width="0dp"
--- a/res/layout/calc_clear_button.xml
+++ b/res/layout/calc_clear_button.xml
@@ -7,11 +7,13 @@
  -->

 <org.solovyev.android.view.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/clearButton"
-			 calc:textUp="dec"
+			 c:textUp="dec"
+			 c:textRight="oct"
 			 a:text="@string/c_clear"
-			 calc:textDown="bin"
+			 c:textDown="bin"
+			 c:textLeft="hex"
 			 a:textStyle="bold"
 			 style="?controlImageButtonStyle"
 			 a:onClick="clearButtonClickHandler"/>
--- a/res/layout/calc_copy_button.xml
+++ b/res/layout/calc_copy_button.xml
@@ -7,7 +7,7 @@
  -->

 <org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
 			 a:drawableTop="@drawable/copy"
 			 style="?controlImageButtonStyle"
--- a/res/layout/calc_division_button.xml
+++ b/res/layout/calc_division_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/divisionButton"
-													   calc:textUp="%"
+													   c:textUp="%"
 													   a:text="/"
-													   calc:textDown="√"
-													   calc:directionTextScale="0.5"
+													   c:textDown="√"
+													   c:directionTextScale="0.5"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_donate_button.xml
+++ b/res/layout/calc_donate_button.xml
@@ -7,7 +7,7 @@
  -->

 <org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
 			 a:drawableTop="@drawable/heart"
 			 style="?controlImageButtonStyle"
--- a/res/layout/calc_dot_button.xml
+++ b/res/layout/calc_dot_button.xml
@@ -7,10 +7,10 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/squareBracketsButton"
 													   a:text="."
-													   calc:textUp=","
-													   calc:directionTextScale="0.5"
+													   c:textUp=","
+													   c:directionTextScale="0.5"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_eight_digit_button.xml
+++ b/res/layout/calc_eight_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/eightDigitButton" a:text="8"
-													   calc:textUp="ln"
-													   calc:textLeft="0o:"
-													   calc:textDown="lg"
-													   calc:directionTextScale="0.5;0.5;0.5;0.33"
+													   c:textUp="ln"
+													   c:textLeft="0o:"
+													   c:textDown="lg"
+													   c:directionTextScale="0.5;0.5;0.5;0.33"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_empty_button.xml
+++ b/res/layout/calc_empty_button.xml
@@ -6,5 +6,5 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   style="?controlButtonStyle"/>
--- a/res/layout/calc_equals_button.xml
+++ b/res/layout/calc_equals_button.xml
@@ -7,11 +7,11 @@
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton
 		xmlns:a="http://schemas.android.com/apk/res/android"
-		xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+		xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 		a:id="@+id/equalsButton"
-		calc:textUp="≡"
+		c:textUp="≡"
 		a:text="="
-		calc:directionTextScale="0.5"
+		c:directionTextScale="0.5"
 		a:layout_width="fill_parent"
 		a:layout_height="fill_parent"
 		style="?controlButtonStyle"
--- a/res/layout/calc_erase_button.xml
+++ b/res/layout/calc_erase_button.xml
@@ -7,7 +7,7 @@
  -->

 <org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 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/res/layout/calc_five_digit_button.xml
+++ b/res/layout/calc_five_digit_button.xml
@@ -6,11 +6,11 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/fiveDigitButton"
 													   a:text="5"
-													   calc:textUp="t"
-													   calc:textLeft="E"
-													   calc:textDown="j"
+													   c:textUp="t"
+													   c:textLeft="E"
+													   c:textDown="j"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_four_digit_button.xml
+++ b/res/layout/calc_four_digit_button.xml
@@ -6,11 +6,11 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/fourDigitButton"
 													   a:text="4"
-													   calc:textUp="x"
-													   calc:textLeft="D"
-													   calc:textDown="y"
+													   c:textUp="x"
+													   c:textLeft="D"
+													   c:textDown="y"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_functions_button.xml
+++ b/res/layout/calc_functions_button.xml
@@ -7,7 +7,7 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/functionsButton"
 													   a:text="ƒ(x)"
 													   a:textStyle="italic"
--- a/res/layout/calc_history_button.xml
+++ b/res/layout/calc_history_button.xml
@@ -6,11 +6,11 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/historyButton"
 													   a:text="@string/c_history_button"
-													   calc:textUp="@string/c_undo"
-													   calc:textDown="@string/c_redo"
+													   c:textUp="@string/c_undo"
+													   c:textDown="@string/c_redo"
 													   style="?controlButtonStyle"
 													   a:textStyle="bold"
 													   a:onClick="historyButtonClickHandler"/>
--- a/res/layout/calc_left_button.xml
+++ b/res/layout/calc_left_button.xml
@@ -7,10 +7,10 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/leftButton"
-													   calc:textUp="◀◀"
+													   c:textUp="◀◀"
 													   a:text="◀"
-													   calc:directionTextScale="0.5"
+													   c:directionTextScale="0.5"
 													   style="?controlButtonStyle"
 													   a:onClick="moveLeftButtonClickHandler"/>
--- a/res/layout/calc_multiplication_button.xml
+++ b/res/layout/calc_multiplication_button.xml
@@ -7,12 +7,12 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/multiplicationButton"
 													   a:text="×"
-													   calc:textUp="^"
-													   calc:textDown="^2"
+													   c:textUp="^"
+													   c:textDown="^2"
 													   style="?digitButtonStyle"
-													   calc:directionTextScale="0.5"
+													   c:directionTextScale="0.5"

 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_nine_digit_button.xml
+++ b/res/layout/calc_nine_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/nineDigitButton" a:text="9"
-													   calc:textDown="e"
-													   calc:textLeft="0x:"
-													   calc:textUp="π"
-													   calc:directionTextScale="0.5;0.5;0.5;0.33"
+													   c:textDown="e"
+													   c:textLeft="0x:"
+													   c:textUp="π"
+													   c:directionTextScale="0.5;0.5;0.5;0.33"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_one_digit_button.xml
+++ b/res/layout/calc_one_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/oneDigitButton"
 													   a:text="1"
-													   calc:textUp="sin"
-													   calc:textLeft="A"
-													   calc:textDown="asin"
+													   c:textUp="sin"
+													   c:textLeft="A"
+													   c:textDown="asin"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_paste_button.xml
+++ b/res/layout/calc_paste_button.xml
@@ -7,7 +7,7 @@
  -->

 <org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
 			 a:drawableTop="@drawable/paste"
 			 style="?controlImageButtonStyle"
--- a/res/layout/calc_plus_button.xml
+++ b/res/layout/calc_plus_button.xml
@@ -6,11 +6,11 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/plusButton"
-													   calc:directionTextScale="0.5"
-													   calc:textUp="°"
-													   calc:textDown="E"
+													   c:directionTextScale="0.5"
+													   c:textUp="°"
+													   c:textDown="E"
 													   a:text="+"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_right_button.xml
+++ b/res/layout/calc_right_button.xml
@@ -7,10 +7,10 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/rightButton"
-													   calc:textUp="▶▶"
+													   c:textUp="▶▶"
 													   a:text="▶"
-													   calc:directionTextScale="0.5"
+													   c:directionTextScale="0.5"
 													   style="?controlButtonStyle"
 													   a:onClick="moveRightButtonClickHandler"/>
--- a/res/layout/calc_round_brackets_button.xml
+++ b/res/layout/calc_round_brackets_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/roundBracketsButton" a:text="()"
-													   calc:textUp="("
-													   calc:textDown=")"
-													   calc:directionTextScale="0.5"
+													   c:textUp="("
+													   c:textDown=")"
+													   c:directionTextScale="0.5"

 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_seven_digit_button.xml
+++ b/res/layout/calc_seven_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/sevenDigitButton" a:text="7"
-													   calc:textUp="i"
-													   calc:textLeft="0b:"
-													   calc:textDown="!"
-													   calc:directionTextScale="0.5;0.5;0.5;0.33"
+													   c:textUp="i"
+													   c:textLeft="0b:"
+													   c:textDown="!"
+													   c:directionTextScale="0.5;0.5;0.5;0.33"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_six_digit_button.xml
+++ b/res/layout/calc_six_digit_button.xml
@@ -7,11 +7,12 @@
  -->

 <org.solovyev.android.view.widgets.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   calc:textUp="deg"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   c:textUp="deg"
 													   a:id="@+id/sixDigitButton"
 													   a:text="6"
-													   calc:textLeft="F"
-													   calc:textDown="rad"
+													   c:textLeft="F"
+													   c:textRight="grad"
+													   c:textDown="rad"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_subtraction_button.xml
+++ b/res/layout/calc_subtraction_button.xml
@@ -6,10 +6,10 @@
  ~ or visit http://se.solovyev.org
  -->
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/subtractionButton"
-													   calc:textDown="∂,…"
+													   c:textDown="∂,…"
 													   a:text="-"
-													   calc:directionTextScale="0.5"
+													   c:directionTextScale="0.5"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_three_digit_button.xml
+++ b/res/layout/calc_three_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/threeDigitButton"
 													   a:text="3"
-													   calc:textUp="tan"
-													   calc:textLeft="C"
-													   calc:textDown="atan"
+													   c:textUp="tan"
+													   c:textLeft="C"
+													   c:textDown="atan"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_two_digit_button.xml
+++ b/res/layout/calc_two_digit_button.xml
@@ -7,11 +7,11 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/twoDigitButton"
 													   a:text="2"
-													   calc:textUp="cos"
-													   calc:textLeft="B"
-													   calc:textDown="acos"
+													   c:textUp="cos"
+													   c:textLeft="B"
+													   c:textDown="acos"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/calc_vars_button.xml
+++ b/res/layout/calc_vars_button.xml
@@ -7,10 +7,10 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/varsButton"
-													   calc:directionTextScale="0.5"
-													   calc:textUp="+π"
+													   c:directionTextScale="0.5"
+													   c:textUp="+π"
 													   a:text="π,…"
 													   a:textStyle="italic"
 													   a:onClick="varsButtonClickHandler"
--- a/res/layout/calc_zero_digit_button.xml
+++ b/res/layout/calc_zero_digit_button.xml
@@ -7,10 +7,10 @@
  -->

 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/zeroDigitButton"
 													   a:text="0"
-													   calc:textDown="000"
-													   calc:directionTextScale="0.5"
+													   c:textDown="000"
+													   c:directionTextScale="0.5"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
--- a/res/layout/drag_button_calibration.xml
+++ b/res/layout/drag_button_calibration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			  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"
@@ -23,16 +23,16 @@

 			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
 														   a:text=""
-														   calc:textUp="@string/c_up"
-														   calc:textDown="@string/c_down"
+														   c:textUp="@string/c_up"
+														   c:textDown="@string/c_down"
 														   a:layout_width="80dp"
 														   a:layout_height="80dp"
 														   style="?digitButtonStyle"/>

 			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
-														   calc:textUp="@string/c_up"
-														   calc:textDown="@string/c_down"
+														   c:textUp="@string/c_up"
+														   c:textDown="@string/c_down"
 														   a:layout_width="80dp"
 														   a:layout_height="80dp"
 														   style="?digitButtonStyle"/>
--- a/res/layout/history_tabs.xml
+++ b/res/layout/history_tabs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<TabHost xmlns:a="http://schemas.android.com/apk/res/android"
+		 a:id="@android:id/tabhost"
+		 a:layout_width="fill_parent"
+		 a:layout_height="fill_parent">
+
+	<LinearLayout
+			a:orientation="vertical"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent">
+
+		<TabWidget
+				a:id="@android:id/tabs"
+				a:layout_width="fill_parent"
+				a:layout_height="wrap_content"/>
+
+		<FrameLayout
+				a:id="@android:id/tabcontent"
+				a:layout_width="fill_parent"
+				a:layout_height="fill_parent"/>
+
+	</LinearLayout>
+</TabHost>
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,6 +3,7 @@
 	<declare-styleable name="DragButton">
 		<attr name="textUp" format="string"/>
 		<attr name="textDown" format="string"/>
+		<attr name="textRight" format="string"/>
 		<attr name="textLeft" format="string"/>
 		<attr name="directionTextScale" format="string"/>
 		<attr name="hTextPosition" format="float"/>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,5 +314,6 @@ Check the \'Round result\' preference in application settings - it should be tur
 	<string name="c_save_history">Save history</string>
 	<string name="c_edit_history">Modify history</string>
 	<string name="c_edit">Modify</string>
+	<string name="c_saved_history">Saved history</string>

 </resources>