From 71012586628598c6f051c3330f5d62805a9c345b Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 15 Jan 2012 02:35:06 +0400
Subject: [PATCH] refactor

---
 res/layout-land/main_calculator.xml                    |  6 +++---
 res/layout-land/main_cellphone.xml                     |  6 +++---
 res/layout/calc_copy_button.xml                        |  2 +-
 res/layout/calc_division_button.xml                    |  2 +-
 res/layout/calc_donate_button.xml                      |  2 +-
 res/layout/calc_dot_button.xml                         |  2 +-
 res/layout/calc_eight_digit_button.xml                 |  2 +-
 res/layout/calc_empty_button.xml                       |  2 +-
 res/layout/calc_equals_button.xml                      |  2 +-
 res/layout/calc_erase_button.xml                       |  2 +-
 res/layout/calc_five_digit_button.xml                  |  2 +-
 res/layout/calc_four_digit_button.xml                  |  2 +-
 res/layout/calc_functions_button.xml                   |  2 +-
 res/layout/calc_history_button.xml                     |  2 +-
 res/layout/calc_left_button.xml                        |  2 +-
 res/layout/calc_multiplication_button.xml              |  2 +-
 res/layout/calc_nine_digit_button.xml                  |  2 +-
 res/layout/calc_one_digit_button.xml                   |  2 +-
 res/layout/calc_operators_button.xml                   |  2 +-
 res/layout/calc_paste_button.xml                       |  2 +-
 res/layout/calc_plus_button.xml                        |  2 +-
 res/layout/calc_right_button.xml                       |  2 +-
 res/layout/calc_round_brackets_button.xml              |  2 +-
 res/layout/calc_seven_digit_button.xml                 |  2 +-
 res/layout/calc_subtraction_button.xml                 |  2 +-
 res/layout/calc_three_digit_button.xml                 |  2 +-
 res/layout/calc_two_digit_button.xml                   |  2 +-
 res/layout/calc_vars_button.xml                        |  2 +-
 res/layout/calc_zero_digit_button.xml                  |  2 +-
 res/layout/drag_button_calibration.xml                 |  4 ++--
 res/layout/number_picker.xml                           |  4 ++--
 .../android/calculator/CalculatorActivity.java         |  7 +++----
 .../solovyev/android/calculator/CalculatorDisplay.java |  2 +-
 .../solovyev/android/calculator/CalculatorModel.java   |  5 ++++-
 .../calculator/CalculatorPreferencesActivity.java      |  2 +-
 .../android/calculator/CursorDragProcessor.java        | 10 +++++-----
 .../android/calculator/DigitButtonDragProcessor.java   |  8 ++++----
 .../solovyev/android/calculator/EvalDragProcessor.java |  8 ++++----
 .../calculator/about/CalculatorAboutTabActivity.java   |  2 +-
 .../calculator/help/CalculatorHelpTabActivity.java     |  2 +-
 .../calculator/history/AbstractHistoryActivity.java    |  4 ++--
 .../history/CalculatorHistoryTabActivity.java          |  2 +-
 .../calculator/history/HistoryItemMenuItem.java        |  2 +-
 .../math/edit/AbstractMathEntityListActivity.java      |  6 +++---
 .../math/edit/CalculatorFunctionsActivity.java         |  2 +-
 .../math/edit/CalculatorFunctionsTabActivity.java      |  2 +-
 .../math/edit/CalculatorOperatorsActivity.java         |  2 +-
 .../calculator/math/edit/CalculatorVarsActivity.java   |  2 +-
 .../math/edit/CalculatorVarsTabActivity.java           |  2 +-
 .../android/calculator/view/AngleUnitsButton.java      |  2 +-
 .../android/calculator/view/NumeralBasesButton.java    |  2 +-
 51 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/res/layout-land/main_calculator.xml b/res/layout-land/main_calculator.xml
index 267b4d40..d56dee19 100644
--- a/res/layout-land/main_calculator.xml
+++ b/res/layout-land/main_calculator.xml
@@ -24,7 +24,7 @@
 
 		<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"
+			<org.solovyev.android.view.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="◀◀"
@@ -37,7 +37,7 @@
 																   a:layout_weight="1"/>
 
 
-			<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<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"
@@ -67,7 +67,7 @@
 														   a:layout_height="fill_parent"
 														   a:layout_weight="1"/>
 
-			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.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="▶▶"
diff --git a/res/layout-land/main_cellphone.xml b/res/layout-land/main_cellphone.xml
index 04f74940..af5a1409 100644
--- a/res/layout-land/main_cellphone.xml
+++ b/res/layout-land/main_cellphone.xml
@@ -18,7 +18,7 @@
 
 		<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"
+			<org.solovyev.android.view.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="◀◀"
@@ -31,7 +31,7 @@
 																   a:layout_weight="1"/>
 
 
-			<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<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"
@@ -61,7 +61,7 @@
 														   a:layout_height="fill_parent"
 														   a:layout_weight="1"/>
 
-			<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.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="▶▶"
diff --git a/res/layout/calc_copy_button.xml b/res/layout/calc_copy_button.xml
index 19d6023e..5a8974f9 100644
--- a/res/layout/calc_copy_button.xml
+++ b/res/layout/calc_copy_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+<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/pasteButton"
 			 a:drawableTop="@drawable/copy"
diff --git a/res/layout/calc_division_button.xml b/res/layout/calc_division_button.xml
index 5c36d59a..e19550aa 100644
--- a/res/layout/calc_division_button.xml
+++ b/res/layout/calc_division_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/divisionButton"
 													   c:textUp="%"
diff --git a/res/layout/calc_donate_button.xml b/res/layout/calc_donate_button.xml
index 9b4d0f23..f9b93555 100644
--- a/res/layout/calc_donate_button.xml
+++ b/res/layout/calc_donate_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+<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/pasteButton"
 			 a:drawableTop="@drawable/heart"
diff --git a/res/layout/calc_dot_button.xml b/res/layout/calc_dot_button.xml
index aab10bbe..741a3867 100644
--- a/res/layout/calc_dot_button.xml
+++ b/res/layout/calc_dot_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/squareBracketsButton"
 													   a:text="."
diff --git a/res/layout/calc_eight_digit_button.xml b/res/layout/calc_eight_digit_button.xml
index 5d462503..d3aca6b4 100644
--- a/res/layout/calc_eight_digit_button.xml
+++ b/res/layout/calc_eight_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/eightDigitButton" a:text="8"
 													   c:textUp="ln"
diff --git a/res/layout/calc_empty_button.xml b/res/layout/calc_empty_button.xml
index 54e32de1..651e2c56 100644
--- a/res/layout/calc_empty_button.xml
+++ b/res/layout/calc_empty_button.xml
@@ -5,6 +5,6 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   style="?controlButtonStyle"/>
\ No newline at end of file
diff --git a/res/layout/calc_equals_button.xml b/res/layout/calc_equals_button.xml
index 742bda6b..188d3ab8 100644
--- a/res/layout/calc_equals_button.xml
+++ b/res/layout/calc_equals_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton
+<org.solovyev.android.view.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/equalsButton"
diff --git a/res/layout/calc_erase_button.xml b/res/layout/calc_erase_button.xml
index 1592c39c..679efc70 100644
--- a/res/layout/calc_erase_button.xml
+++ b/res/layout/calc_erase_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+<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"
diff --git a/res/layout/calc_five_digit_button.xml b/res/layout/calc_five_digit_button.xml
index 07eddd4f..ee62bf25 100644
--- a/res/layout/calc_five_digit_button.xml
+++ b/res/layout/calc_five_digit_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/fiveDigitButton"
 													   a:text="5"
diff --git a/res/layout/calc_four_digit_button.xml b/res/layout/calc_four_digit_button.xml
index 58980726..6e250b0e 100644
--- a/res/layout/calc_four_digit_button.xml
+++ b/res/layout/calc_four_digit_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/fourDigitButton"
 													   a:text="4"
diff --git a/res/layout/calc_functions_button.xml b/res/layout/calc_functions_button.xml
index a86cb4fc..5ff6a061 100644
--- a/res/layout/calc_functions_button.xml
+++ b/res/layout/calc_functions_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/functionsButton"
 													   a:text="ƒ(x)"
diff --git a/res/layout/calc_history_button.xml b/res/layout/calc_history_button.xml
index d162759a..22cfa1d7 100644
--- a/res/layout/calc_history_button.xml
+++ b/res/layout/calc_history_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/historyButton"
 													   a:text="@string/c_history_button"
diff --git a/res/layout/calc_left_button.xml b/res/layout/calc_left_button.xml
index 596fa4de..43340b4b 100644
--- a/res/layout/calc_left_button.xml
+++ b/res/layout/calc_left_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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="◀◀"
diff --git a/res/layout/calc_multiplication_button.xml b/res/layout/calc_multiplication_button.xml
index a733692c..ef1eac0d 100644
--- a/res/layout/calc_multiplication_button.xml
+++ b/res/layout/calc_multiplication_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/multiplicationButton"
 													   a:text="×"
diff --git a/res/layout/calc_nine_digit_button.xml b/res/layout/calc_nine_digit_button.xml
index 69a1543c..5e339232 100644
--- a/res/layout/calc_nine_digit_button.xml
+++ b/res/layout/calc_nine_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/nineDigitButton" a:text="9"
 													   c:textDown="e"
diff --git a/res/layout/calc_one_digit_button.xml b/res/layout/calc_one_digit_button.xml
index decff8e3..a282586b 100644
--- a/res/layout/calc_one_digit_button.xml
+++ b/res/layout/calc_one_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/oneDigitButton"
 													   a:text="1"
diff --git a/res/layout/calc_operators_button.xml b/res/layout/calc_operators_button.xml
index 466fc8a8..8e6d298a 100644
--- a/res/layout/calc_operators_button.xml
+++ b/res/layout/calc_operators_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   a:id="@+id/functionsButton"
 													   a:text="∂,…"
 													   a:onClick="operatorsButtonClickHandler"
diff --git a/res/layout/calc_paste_button.xml b/res/layout/calc_paste_button.xml
index 6062b12b..b0b69e5c 100644
--- a/res/layout/calc_paste_button.xml
+++ b/res/layout/calc_paste_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+<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/pasteButton"
 			 a:drawableTop="@drawable/paste"
diff --git a/res/layout/calc_plus_button.xml b/res/layout/calc_plus_button.xml
index 3b99005b..3a9997f9 100644
--- a/res/layout/calc_plus_button.xml
+++ b/res/layout/calc_plus_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/plusButton"
 													   c:directionTextScale="0.5"
diff --git a/res/layout/calc_right_button.xml b/res/layout/calc_right_button.xml
index 9a926508..28394559 100644
--- a/res/layout/calc_right_button.xml
+++ b/res/layout/calc_right_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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="▶▶"
diff --git a/res/layout/calc_round_brackets_button.xml b/res/layout/calc_round_brackets_button.xml
index e8fe401b..9e16a1d5 100644
--- a/res/layout/calc_round_brackets_button.xml
+++ b/res/layout/calc_round_brackets_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/roundBracketsButton"
 													   c:textUp="("
diff --git a/res/layout/calc_seven_digit_button.xml b/res/layout/calc_seven_digit_button.xml
index e0cd3b24..07effc70 100644
--- a/res/layout/calc_seven_digit_button.xml
+++ b/res/layout/calc_seven_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/sevenDigitButton" a:text="7"
 													   c:textUp="i"
diff --git a/res/layout/calc_subtraction_button.xml b/res/layout/calc_subtraction_button.xml
index 26be95de..09c7c109 100644
--- a/res/layout/calc_subtraction_button.xml
+++ b/res/layout/calc_subtraction_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/subtractionButton"
 													   c:textDown="∂,…"
diff --git a/res/layout/calc_three_digit_button.xml b/res/layout/calc_three_digit_button.xml
index 48dbd072..c0516441 100644
--- a/res/layout/calc_three_digit_button.xml
+++ b/res/layout/calc_three_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/threeDigitButton"
 													   a:text="3"
diff --git a/res/layout/calc_two_digit_button.xml b/res/layout/calc_two_digit_button.xml
index 224f1970..09bf4f9e 100644
--- a/res/layout/calc_two_digit_button.xml
+++ b/res/layout/calc_two_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/twoDigitButton"
 													   a:text="2"
diff --git a/res/layout/calc_vars_button.xml b/res/layout/calc_vars_button.xml
index b292aab2..b2922747 100644
--- a/res/layout/calc_vars_button.xml
+++ b/res/layout/calc_vars_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/varsButton"
 													   c:directionTextScale="0.5"
diff --git a/res/layout/calc_zero_digit_button.xml b/res/layout/calc_zero_digit_button.xml
index 8d9450e7..08c863f3 100644
--- a/res/layout/calc_zero_digit_button.xml
+++ b/res/layout/calc_zero_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.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/zeroDigitButton"
 													   c:textUp="00"
diff --git a/res/layout/drag_button_calibration.xml b/res/layout/drag_button_calibration.xml
index 8dc2a923..c5753aa1 100644
--- a/res/layout/drag_button_calibration.xml
+++ b/res/layout/drag_button_calibration.xml
@@ -21,7 +21,7 @@
 					   a:layout_width="80dp"
 					   a:layout_height="80dp"/>
 
-			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
+			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
 														   a:text=""
 														   c:textUp="@string/c_up"
 														   c:textDown="@string/c_down"
@@ -29,7 +29,7 @@
 														   a:layout_height="80dp"
 														   style="?digitButtonStyle"/>
 
-			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
+			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
 														   c:textUp="@string/c_up"
 														   c:textDown="@string/c_down"
diff --git a/res/layout/number_picker.xml b/res/layout/number_picker.xml
index 093538af..e938f076 100644
--- a/res/layout/number_picker.xml
+++ b/res/layout/number_picker.xml
@@ -8,7 +8,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/increment"
+    <org.solovyev.android.view.NumberPickerButton android:id="@+id/increment"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_up_btn" />
@@ -23,7 +23,7 @@
         android:textSize="30sp"
         android:background="@drawable/timepicker_input" />
 
-    <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/decrement"
+    <org.solovyev.android.view.NumberPickerButton android:id="@+id/decrement"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_down_btn" />
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 19b97d82..f3998844 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -31,6 +31,7 @@ import net.robotmedia.billing.IBillingObserver;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.FontSizeAdjuster;
 import org.solovyev.android.ResourceCache;
 import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity;
 import org.solovyev.android.calculator.history.CalculatorHistory;
@@ -39,11 +40,9 @@ import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.view.AngleUnitsButton;
 import org.solovyev.android.calculator.view.NumeralBasesButton;
-import org.solovyev.android.view.FontSizeAdjuster;
 import org.solovyev.android.prefs.IntegerPreference;
 import org.solovyev.android.prefs.Preference;
-import org.solovyev.android.view.widgets.*;
-import org.solovyev.android.view.widgets.DragEvent;
+import org.solovyev.android.view.*;
 import org.solovyev.common.utils.Announcer;
 import org.solovyev.common.utils.Point2d;
 import org.solovyev.common.utils.StringUtils;
@@ -344,7 +343,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		}
 
 		@Override
-		public boolean onDrag(@NotNull DragButton dragButton, @NotNull DragEvent event) {
+		public boolean onDrag(@NotNull DragButton dragButton, @NotNull org.solovyev.android.view.DragEvent event) {
 			boolean result = super.onDrag(dragButton, event);
 
 			if (result) {
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
index b87c79dd..5ad577e3 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
@@ -20,7 +20,7 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.calculator.model.TextProcessor;
 import org.solovyev.android.calculator.view.TextHighlighter;
-import org.solovyev.android.view.AMenuItem;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.android.view.AutoResizeTextView;
 
 import java.util.HashSet;
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index e5c4f80b..cf261d69 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -22,6 +22,8 @@ import jscl.math.function.Constant;
 import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.CursorControl;
+import org.solovyev.android.HistoryControl;
 import org.solovyev.android.calculator.history.CalculatorHistory;
 import org.solovyev.android.calculator.history.CalculatorHistoryState;
 import org.solovyev.android.calculator.history.TextViewEditorAdapter;
@@ -30,7 +32,8 @@ import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorEvalException;
 import org.solovyev.android.calculator.model.CalculatorParseException;
-import org.solovyev.android.view.*;
+import org.solovyev.android.menu.AMenuBuilder;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.common.msg.Message;
 import org.solovyev.common.utils.CollectionsUtils;
 import org.solovyev.common.utils.MutableObject;
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
index 15567564..eb4e5c22 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
@@ -20,7 +20,7 @@ import net.robotmedia.billing.model.Transaction;
 import org.solovyev.android.AndroidUtils;
 import org.solovyev.android.ads.AdsController;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.widgets.VibratorContainer;
+import org.solovyev.android.view.VibratorContainer;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
index 76176793..d25e425b 100644
--- a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
@@ -7,11 +7,11 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.*;
-import org.solovyev.android.view.widgets.DirectionDragButton;
-import org.solovyev.android.view.widgets.DragButton;
-import org.solovyev.android.view.widgets.DragDirection;
-import org.solovyev.android.view.widgets.SimpleOnDragListener;
+import org.solovyev.android.CursorControl;
+import org.solovyev.android.view.DirectionDragButton;
+import org.solovyev.android.view.DragButton;
+import org.solovyev.android.view.DragDirection;
+import org.solovyev.android.view.SimpleOnDragListener;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
index 8b267f8d..82fc5b3a 100644
--- a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
@@ -7,10 +7,10 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.widgets.DirectionDragButton;
-import org.solovyev.android.view.widgets.DragButton;
-import org.solovyev.android.view.widgets.DragDirection;
-import org.solovyev.android.view.widgets.SimpleOnDragListener;
+import org.solovyev.android.view.DirectionDragButton;
+import org.solovyev.android.view.DragDirection;
+import org.solovyev.android.view.DragButton;
+import org.solovyev.android.view.SimpleOnDragListener;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
index 93ecff85..43c42b58 100644
--- a/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
@@ -8,10 +8,10 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.widgets.DirectionDragButton;
-import org.solovyev.android.view.widgets.DragButton;
-import org.solovyev.android.view.widgets.DragDirection;
-import org.solovyev.android.view.widgets.SimpleOnDragListener;
+import org.solovyev.android.view.DirectionDragButton;
+import org.solovyev.android.view.DragButton;
+import org.solovyev.android.view.DragDirection;
+import org.solovyev.android.view.SimpleOnDragListener;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java b/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
index 429b75ee..83762c9d 100644
--- a/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
@@ -10,8 +10,8 @@ import android.os.Bundle;
 import android.widget.TabHost;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.LastTabSaver;
 import org.solovyev.android.calculator.R;
-import org.solovyev.android.view.LastTabSaver;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java b/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
index e23cc57d..2a483261 100644
--- a/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
@@ -14,8 +14,8 @@ import android.widget.TabHost;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.LastTabSaver;
 import org.solovyev.android.calculator.R;
-import org.solovyev.android.view.LastTabSaver;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java b/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
index 2dbd9d3c..7acdee4c 100644
--- a/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
@@ -23,8 +23,8 @@ import org.solovyev.android.ads.AdsController;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.jscl.JsclOperation;
-import org.solovyev.android.view.AMenuBuilder;
-import org.solovyev.android.view.MenuImpl;
+import org.solovyev.android.menu.AMenuBuilder;
+import org.solovyev.android.menu.MenuImpl;
 import org.solovyev.common.utils.*;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java b/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
index 39e3c2d1..59c6be28 100644
--- a/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
@@ -11,8 +11,8 @@ import android.os.Bundle;
 import android.widget.TabHost;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.LastTabSaver;
 import org.solovyev.android.calculator.R;
-import org.solovyev.android.view.LastTabSaver;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java b/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
index cd9304c7..6708cbfd 100644
--- a/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
+++ b/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
@@ -19,7 +19,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
-import org.solovyev.android.view.AMenuItem;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.common.utils.StringUtils;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
index 4cfa2973..4fccd88d 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
@@ -22,9 +22,9 @@ import org.solovyev.android.ads.AdsController;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.AndroidMathRegistry;
-import org.solovyev.android.view.AMenuBuilder;
-import org.solovyev.android.view.AMenuItem;
-import org.solovyev.android.view.MenuImpl;
+import org.solovyev.android.menu.AMenuBuilder;
+import org.solovyev.android.menu.AMenuItem;
+import org.solovyev.android.menu.MenuImpl;
 import org.solovyev.common.math.MathEntity;
 import org.solovyev.common.utils.EqualsTool;
 import org.solovyev.common.utils.Filter;
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
index 24c0c14b..ad958c65 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.AMenuItem;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.common.utils.StringUtils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
index 05644f8f..94913055 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
@@ -11,9 +11,9 @@ import android.os.Bundle;
 import android.widget.TabHost;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.LastTabSaver;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.AndroidFunctionsMathRegistry;
-import org.solovyev.android.view.LastTabSaver;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
index c7539784..a684346e 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.AMenuItem;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.common.utils.StringUtils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
index 1832f96c..384f9ebc 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
@@ -26,7 +26,7 @@ import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.Var;
-import org.solovyev.android.view.AMenuItem;
+import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.common.utils.CollectionsUtils;
 import org.solovyev.common.utils.Finder;
 import org.solovyev.common.utils.StringUtils;
diff --git a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
index cc39d9ef..ce36fdc4 100644
--- a/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
@@ -11,9 +11,9 @@ import android.os.Bundle;
 import android.widget.TabHost;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.AndroidUtils;
+import org.solovyev.android.LastTabSaver;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.VarCategory;
-import org.solovyev.android.view.LastTabSaver;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
index 24852c4c..ed5f25e3 100644
--- a/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
+++ b/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.widgets.DirectionDragButton;
+import org.solovyev.android.view.DirectionDragButton;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
index 200bf4f1..8701cff1 100644
--- a/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
+++ b/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.widgets.DirectionDragButton;
+import org.solovyev.android.view.DirectionDragButton;
 
 /**
  * User: serso