Im and Re

calculatorpp/res/layout/calc_functions_button.xml

@@ -7,9 +7,11 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/functionsButton"
-													   a:text="ƒ(x)"
-													   a:textStyle="italic"
-													   a:onClick="functionsButtonClickHandler"
-													   style="?controlButtonStyle"/>
+    xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+    a:id="@+id/functions_button"
+    c:directionTextScale="0.5"
+    c:textUp="+ƒ"
+    a:text="ƒ(x)"
+    a:textStyle="italic"
+    a:onClick="functionsButtonClickHandler"
+    style="?controlButtonStyle" />

calculatorpp/res/layout/calc_operators_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   a:id="@+id/functionsButton"
+													   a:id="@+id/functions_button"
 													   a:text="∂,…"
 													   a:onClick="operatorsButtonClickHandler"
 													   style="?controlButtonStyle"/>

calculatorpp/res/layout/calc_vars_button.xml

@@ -8,7 +8,7 @@
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/varsButton"
+													   a:id="@+id/vars_button"
 													   c:directionTextScale="0.5"
 													   c:textUp="+π"
 													   a:text="π,…"

calculatorpp/res/layout/var_edit.xml

@@ -37,7 +37,7 @@
                   a:layout_height="wrap_content"
                   a:layout_width="match_parent"
                   style="@style/default_text_size"
-                  a:inputType="text"/>
+                  a:inputType="numberDecimal"/>
 
         <TextView a:layout_height="wrap_content"
                   a:layout_width="match_parent"

calculatorpp/res/layout/widget_functions_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/functionsButton"
+        a:id="@+id/functions_button"
         a:text="ƒ(x)"
         a:textStyle="italic"
         style="@style/widget_metro_control_button_style"/>

calculatorpp/res/layout/widget_vars_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/varsButton"
+        a:id="@+id/vars_button"
         a:text="π,…"
         a:textStyle="italic"
         style="@style/widget_metro_control_button_style"/>