This commit is contained in:
serso
2011-12-15 03:19:10 +04:00
parent 85b3dc7e52
commit 9ab192abaa
21 changed files with 224 additions and 63 deletions

View File

@@ -12,7 +12,6 @@
calc:textUp="ln"
calc:textLeft="0b:"
calc:textDown="lg"
calc:directionTextScale="0.5"
calc:directionTextScale="0.5;0.5;0.5;0.33"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -10,7 +10,7 @@
a:id="@+id/fiveDigitButton"
a:text="5"
calc:textUp="t"
calc:textLeft="e"
calc:textLeft="E"
calc:textDown="j"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -10,7 +10,7 @@
a:id="@+id/fourDigitButton"
a:text="4"
calc:textUp="x"
calc:textLeft="d"
calc:textLeft="D"
calc:textDown="y"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,6 +12,6 @@
calc:textDown="e"
calc:textLeft="0o:"
calc:textUp="π"
calc:directionTextScale="0.5"
calc:directionTextScale="0.5;0.5;0.5;0.33"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,7 +11,7 @@
a:id="@+id/oneDigitButton"
a:text="1"
calc:textUp="sin"
calc:textLeft="a"
calc:textLeft="A"
calc:textDown="asin"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,7 +12,6 @@
calc:textUp="i"
calc:textLeft="0x:"
calc:textDown="!"
calc:directionTextScale="0.5"
calc:directionTextScale="0.5;0.5;0.5;0.33"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,7 +11,7 @@
calc:textUp="deg"
a:id="@+id/sixDigitButton"
a:text="6"
calc:textLeft="f"
calc:textLeft="F"
calc:textDown="rad"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,7 +11,7 @@
a:id="@+id/threeDigitButton"
a:text="3"
calc:textUp="tan"
calc:textLeft="c"
calc:textLeft="C"
calc:textDown="atan"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,7 +11,7 @@
a:id="@+id/twoDigitButton"
a:text="2"
calc:textUp="cos"
calc:textLeft="b"
calc:textLeft="B"
calc:textDown="acos"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -4,7 +4,7 @@
<attr name="textUp" format="string"/>
<attr name="textDown" format="string"/>
<attr name="textLeft" format="string"/>
<attr name="directionTextScale" format="float"/>
<attr name="directionTextScale" format="string"/>
<attr name="hTextPosition" format="float"/>
</declare-styleable>

View File

@@ -7,7 +7,7 @@
<resources>
<string name="p_drag_distance_key">org.solovyev.android.calculator.DragButtonCalibrationActivity_distance</string>
<string name="p_drag_distance">15;350</string>
<string name="p_drag_distance">35;350</string>
<string name="p_drag_angle_key">org.solovyev.android.calculator.DragButtonCalibrationActivity_angle</string>
<string name="p_drag_angle">0;45</string>

View File

@@ -76,7 +76,7 @@
a:title="@string/c_swipe_distance"
a:summary="@string/c_swipe_distance_summary"
a:text=" pxs"
a:defaultValue="15;350"
a:defaultValue="35;350"
range:steps="10"
range:boundaries="10;500"/>