changes

android-app-core/pom.xml

@@ -50,6 +50,17 @@
             <type>apklib</type>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>support-v4</artifactId>
+        </dependency>
+
 	</dependencies>
 
 	<build>

android-app-core/res/layout/cpp_simple_keyboard.xml

@@ -9,12 +9,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_seven_digit_button"/>
+        <include layout="@layout/cpp_simple_button_7"/>
-        <include layout="@layout/cpp_simple_eight_digit_button"/>
+        <include layout="@layout/cpp_simple_button_8"/>
-        <include layout="@layout/cpp_simple_nine_digit_button"/>
+        <include layout="@layout/cpp_simple_button_9"/>
-        <include layout="@layout/cpp_simple_multiplication_button"/>
+        <include layout="@layout/cpp_simple_button_multiplication"/>
-        <include layout="@layout/cpp_simple_percent_button"/>
+        <include layout="@layout/cpp_simple_button_percent"/>
-        <include layout="@layout/cpp_simple_clear_button"/>
+        <include layout="@layout/cpp_simple_button_clear"/>
 
     </LinearLayout>
 
@@ -22,12 +22,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_four_digit_button"/>
+        <include layout="@layout/cpp_simple_button_4"/>
-        <include layout="@layout/cpp_simple_five_digit_button"/>
+        <include layout="@layout/cpp_simple_button_5"/>
-        <include layout="@layout/cpp_simple_six_digit_button"/>
+        <include layout="@layout/cpp_simple_button_6"/>
-        <include layout="@layout/cpp_simple_division_button"/>
+        <include layout="@layout/cpp_simple_button_division"/>
-        <include layout="@layout/cpp_simple_power_button"/>
+        <include layout="@layout/cpp_simple_button_power"/>
-        <include layout="@layout/cpp_simple_erase_button"/>
+        <include layout="@layout/cpp_simple_button_erase"/>
 
     </LinearLayout>
 
@@ -35,12 +35,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_one_digit_button"/>
+        <include layout="@layout/cpp_simple_button_1"/>
-        <include layout="@layout/cpp_simple_two_digit_button"/>
+        <include layout="@layout/cpp_simple_button_2"/>
-        <include layout="@layout/cpp_simple_three_digit_button"/>
+        <include layout="@layout/cpp_simple_button_3"/>
-        <include layout="@layout/cpp_simple_plus_button"/>
+        <include layout="@layout/cpp_simple_button_plus"/>
-        <include layout="@layout/cpp_simple_like_button"/>
+        <include layout="@layout/cpp_simple_button_like"/>
-        <include layout="@layout/cpp_simple_copy_button"/>
+        <include layout="@layout/cpp_simple_button_copy"/>
 
     </LinearLayout>
 
@@ -48,12 +48,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_round_brackets_button"/>
+        <include layout="@layout/cpp_simple_button_round_brackets"/>
-        <include layout="@layout/cpp_simple_zero_digit_button"/>
+        <include layout="@layout/cpp_simple_button_0"/>
-        <include layout="@layout/cpp_simple_dot_button"/>
+        <include layout="@layout/cpp_simple_button_dot"/>
-        <include layout="@layout/cpp_simple_subtraction_button"/>
+        <include layout="@layout/cpp_simple_button_subtraction"/>
-        <include layout="@layout/cpp_simple_settings_button"/>
+        <include layout="@layout/cpp_simple_button_settings"/>
-        <include layout="@layout/cpp_simple_paste_button"/>
+        <include layout="@layout/cpp_simple_button_paste"/>
 
     </LinearLayout>
 
@@ -62,12 +62,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_left_button"/>
+        <include layout="@layout/cpp_simple_button_left"/>
-        <include layout="@layout/cpp_simple_right_button"/>
+        <include layout="@layout/cpp_simple_button_right"/>
-        <include layout="@layout/cpp_simple_vars_button"/>
+        <include layout="@layout/cpp_simple_button_vars"/>
-        <include layout="@layout/cpp_simple_functions_button"/>
+        <include layout="@layout/cpp_simple_button_functions"/>
-        <include layout="@layout/cpp_simple_app_button"/>
+        <include layout="@layout/cpp_simple_button_app"/>
-        <include layout="@layout/cpp_simple_history_button"/>
+        <include layout="@layout/cpp_simple_button_history"/>
 
     </LinearLayout>
 

android-app-core/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java

@@ -70,7 +70,7 @@ public class UnitConverterViewBuilder implements ViewBuilder<View> {
     @NotNull
     @Override
     public View build(@NotNull final Context context) {
-        final View main = ViewFromLayoutBuilder.newInstance(R.layout.unit_converter).build(context);
+        final View main = ViewFromLayoutBuilder.newInstance(R.layout.cpp_unit_converter).build(context);
 
         final Spinner fromSpinner = (Spinner) main.findViewById(R.id.unit_types_from);
         final EditText fromEditText = (EditText) main.findViewById(R.id.units_from);

android-app-onscreen/pom.xml

@@ -29,6 +29,17 @@
             <type>apklib</type>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>support-v4</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

android-app-onscreen/res/layout/onscreen_keyboard.xml

@@ -9,11 +9,11 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_seven_digit_button"/>
+        <include layout="@layout/cpp_simple_button_7"/>
-        <include layout="@layout/cpp_simple_eight_digit_button"/>
+        <include layout="@layout/cpp_simple_button_8"/>
-        <include layout="@layout/cpp_simple_nine_digit_button"/>
+        <include layout="@layout/cpp_simple_button_9"/>
-        <include layout="@layout/cpp_simple_multiplication_button"/>
+        <include layout="@layout/cpp_simple_button_multiplication"/>
-		<include layout="@layout/cpp_simple_erase_button"/>
+		<include layout="@layout/cpp_simple_button_erase"/>
 
     </LinearLayout>
 
@@ -21,11 +21,11 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_four_digit_button"/>
+        <include layout="@layout/cpp_simple_button_4"/>
-        <include layout="@layout/cpp_simple_five_digit_button"/>
+        <include layout="@layout/cpp_simple_button_5"/>
-        <include layout="@layout/cpp_simple_six_digit_button"/>
+        <include layout="@layout/cpp_simple_button_6"/>
-        <include layout="@layout/cpp_simple_division_button"/>
+        <include layout="@layout/cpp_simple_button_division"/>
-		<include layout="@layout/cpp_simple_percent_button"/>
+		<include layout="@layout/cpp_simple_button_percent"/>
 
 	</LinearLayout>
 
@@ -33,22 +33,22 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_one_digit_button"/>
+        <include layout="@layout/cpp_simple_button_1"/>
-        <include layout="@layout/cpp_simple_two_digit_button"/>
+        <include layout="@layout/cpp_simple_button_2"/>
-        <include layout="@layout/cpp_simple_three_digit_button"/>
+        <include layout="@layout/cpp_simple_button_3"/>
-        <include layout="@layout/cpp_simple_plus_button"/>
+        <include layout="@layout/cpp_simple_button_plus"/>
-		<include layout="@layout/cpp_simple_power_button"/>
+		<include layout="@layout/cpp_simple_button_power"/>
     </LinearLayout>
 
     <LinearLayout a:layout_weight="1"
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_round_brackets_button"/>
+        <include layout="@layout/cpp_simple_button_round_brackets"/>
-        <include layout="@layout/cpp_simple_zero_digit_button"/>
+        <include layout="@layout/cpp_simple_button_0"/>
-        <include layout="@layout/cpp_simple_dot_button"/>
+        <include layout="@layout/cpp_simple_button_dot"/>
-        <include layout="@layout/cpp_simple_subtraction_button"/>
+        <include layout="@layout/cpp_simple_button_subtraction"/>
-		<include layout="@layout/cpp_simple_app_button"/>
+		<include layout="@layout/cpp_simple_button_app"/>
 
 	</LinearLayout>
 

android-app-onscreen/res/layout/onscreen_layout.xml

@@ -19,7 +19,7 @@
 					  a:layout_width="match_parent"
 					  a:layout_height="0dp">
 
-			<include layout="@layout/cpp_simple_equals_button"
+			<include layout="@layout/cpp_simple_button_equals"
 					 a:layout_margin="@dimen/cpp_button_margin"
 					 a:layout_weight="1"
 					 a:layout_width="0dp"

android-app-widget/pom.xml

@@ -29,6 +29,17 @@
 			<type>apklib</type>
 		</dependency>
 
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>support-v4</artifactId>
+        </dependency>
+
 	</dependencies>
 
 	<build>

android-app-widget/res/layout/widget_layout.xml

@@ -15,7 +15,7 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_equals_button"
+        <include layout="@layout/cpp_simple_button_equals"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_weight="1"
                  a:layout_width="0dp"

android-app/res/layout-land/calc_keyboard.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout-land/calc_keyboard_mobile.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout-land/cpp_app_keyboard.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout-land/cpp_app_keyboard_mobile.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout-land/main_first_pane.xml

@@ -21,13 +21,13 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/calc_left_button"
+        <include layout="@layout/cpp_drag_button_left"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
                  a:layout_weight="1"/>
 
-        <include layout="@layout/calc_erase_button"
+        <include layout="@layout/cpp_app_button_erase"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
@@ -39,13 +39,13 @@
                       a:layout_weight="4"
                       a:layout_margin="@dimen/cpp_display_margin_land"/>
 
-        <include layout="@layout/calc_clear_button"
+        <include layout="@layout/cpp_drag_button_clear"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
                  a:layout_weight="1"/>
 
-        <include layout="@layout/calc_right_button"
+        <include layout="@layout/cpp_drag_button_right"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"

android-app/res/layout-land/main_first_pane_mobile.xml

@@ -21,13 +21,13 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/calc_left_button"
+        <include layout="@layout/cpp_drag_button_left"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
                  a:layout_weight="1"/>
 
-        <include layout="@layout/calc_erase_button"
+        <include layout="@layout/cpp_app_button_erase"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
@@ -39,13 +39,13 @@
                       a:layout_weight="4"
                       a:layout_margin="@dimen/cpp_display_margin_land"/>
 
-        <include layout="@layout/calc_clear_button"
+        <include layout="@layout/cpp_drag_button_clear"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"
                  a:layout_weight="1"/>
 
-        <include layout="@layout/calc_right_button"
+        <include layout="@layout/cpp_drag_button_right"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_width="0dp"
                  a:layout_height="match_parent"

android-app/res/layout-large-land/calc_keyboard.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_left_button"/>
-        <include layout="@layout/calc_erase_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_multiplication_button"/>
-        <include layout="@layout/calc_division_button"/>
-        <include layout="@layout/calc_clear_button"/>
-        <include layout="@layout/calc_right_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_vars_button"/>
-        <include layout="@layout/calc_functions_button"/>
-        <include layout="@layout/calc_empty_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_copy_button"/>
-        <include layout="@layout/calc_equals_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_empty_button"/>
-        <include layout="@layout/calc_operators_button"/>
-        <include layout="@layout/calc_dot_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_round_brackets_button"/>
-        <include layout="@layout/calc_paste_button"/>
-        <include layout="@layout/calc_history_button"/>
-
-    </LinearLayout>
-
-
-</LinearLayout>

android-app/res/layout-large-land/cpp_app_keyboard.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_app_button_erase"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+
+</LinearLayout>

android-app/res/layout-large/calc_keyboard.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_left_button"/>
-        <include layout="@layout/calc_erase_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_right_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_vars_button"/>
-        <include layout="@layout/calc_clear_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_copy_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_functions_button"/>
-        <include layout="@layout/calc_equals_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_paste_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_operators_button"/>
-        <include layout="@layout/calc_donate_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_history_button"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout-large/cpp_app_keyboard.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_app_button_erase"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout-xlarge-land/calc_keyboard.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_left_button"/>
-        <include layout="@layout/calc_vars_button"/>
-        <include layout="@layout/calc_copy_button"/>
-        <include layout="@layout/calc_six_digit_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_multiplication_button"/>
-        <include layout="@layout/calc_division_button"/>
-        <include layout="@layout/calc_equals_button"/>
-        <include layout="@layout/calc_operators_button"/>
-        <include layout="@layout/calc_donate_button"/>
-        <include layout="@layout/calc_right_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_erase_button"/>
-        <include layout="@layout/calc_functions_button"/>
-        <include layout="@layout/calc_paste_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_four_digit_button"/>
-        <include layout="@layout/calc_five_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_dot_button"/>
-        <include layout="@layout/calc_history_button"/>
-        <include layout="@layout/calc_clear_button"/>
-
-    </LinearLayout>
-
-
-</LinearLayout>

android-app/res/layout-xlarge-land/cpp_app_keyboard.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_app_button_erase"/>
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+
+    </LinearLayout>
+
+
+</LinearLayout>

android-app/res/layout-xlarge/calc_keyboard.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_left_button"/>
-        <include layout="@layout/calc_erase_button"/>
-        <include layout="@layout/calc_empty_button"/>
-        <include layout="@layout/calc_empty_button"/>
-        <include layout="@layout/calc_empty_button"/>
-        <include layout="@layout/calc_empty_button"/>
-        <include layout="@layout/calc_clear_button"/>
-        <include layout="@layout/calc_right_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout-xlarge/cpp_app_keyboard.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_app_button_erase"/>
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_empty"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_drag_button_equals"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_operators"/>
+        <include layout="@layout/cpp_app_button_donate"/>
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout/calc_keyboard.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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 a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout/calc_keyboard_mobile.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_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 a:layout_weight="1"
-                  a:layout_width="match_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"/>
-
-    </LinearLayout>
-
-</LinearLayout>

android-app/res/layout/calc_title.xml

@@ -1,30 +0,0 @@
-<?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
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="horizontal"
-			  a:gravity="center_vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent">
-
-	<TextView
-		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
-		a:layout_gravity="left"
-		style="@style/cpp_window_title"
-		a:text="@string/c_app_name"/>
-
-	<org.solovyev.android.calculator.view.CalculatorAdditionalTitle
-		a:id="@+id/additional_title_text"
-		a:layout_width="fill_parent"
-		a:layout_height="wrap_content"
-		style="@style/cpp_window_title"
-		a:gravity="center_vertical|right"
-		a:layout_gravity="right"/>
-
-</LinearLayout>

android-app/res/layout/cpp_app_keyboard.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_app_button_erase"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout/cpp_app_keyboard_mobile.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_7"/>
+        <include layout="@layout/cpp_drag_button_8"/>
+        <include layout="@layout/cpp_drag_button_9"/>
+        <include layout="@layout/cpp_drag_button_multiplication"/>
+        <include layout="@layout/cpp_drag_button_clear"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_4"/>
+        <include layout="@layout/cpp_drag_button_5"/>
+        <include layout="@layout/cpp_drag_button_6"/>
+        <include layout="@layout/cpp_drag_button_division"/>
+        <include layout="@layout/cpp_app_button_erase"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_1"/>
+        <include layout="@layout/cpp_drag_button_2"/>
+        <include layout="@layout/cpp_drag_button_3"/>
+        <include layout="@layout/cpp_drag_button_plus"/>
+        <include layout="@layout/cpp_app_button_copy"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_round_brackets"/>
+        <include layout="@layout/cpp_drag_button_0"/>
+        <include layout="@layout/cpp_drag_button_dot"/>
+        <include layout="@layout/cpp_drag_button_subtraction"/>
+        <include layout="@layout/cpp_app_button_paste"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_drag_button_left"/>
+        <include layout="@layout/cpp_drag_button_right"/>
+        <include layout="@layout/cpp_drag_button_vars"/>
+        <include layout="@layout/cpp_drag_button_functions"/>
+        <include layout="@layout/cpp_drag_button_history"/>
+
+    </LinearLayout>
+
+</LinearLayout>

android-app/res/layout/main_calculator.xml

@@ -23,7 +23,7 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/calc_equals_button"
+        <include layout="@layout/cpp_drag_button_equals"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_weight="1"
                  a:layout_width="0dp"

android-app/res/layout/main_calculator_mobile.xml

@@ -23,7 +23,7 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/calc_equals_button"
+        <include layout="@layout/cpp_drag_button_equals"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_weight="1"
                  a:layout_width="0dp"

android-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java

@@ -26,9 +26,9 @@ public class CalculatorDisplayFragment extends SherlockFragment {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
         final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
         if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
-            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display_mobile, R.string.result);
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display_mobile, R.string.result);
         } else {
-            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display, R.string.result);
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display, R.string.result);
         }
 
         fragmentHelper.onCreate(this);

android-app/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java

@@ -53,9 +53,9 @@ public class CalculatorEditorFragment extends SherlockFragment {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
         final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
         if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
-            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.editor);
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor_mobile, R.string.editor);
         } else {
-            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.editor);
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor, R.string.editor);
         }
 
         fragmentHelper.onCreate(this);