This commit is contained in:
Sergey Solovyev
2011-12-08 03:36:11 +04:00
parent 10d55263d2
commit 174b3ca593
8 changed files with 100 additions and 10 deletions

View File

@@ -52,10 +52,12 @@
a:layout_height="fill_parent"
a:layout_weight="4"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
<org.solovyev.android.view.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="dec"
a:text="@string/c_clear"
calc:textDown="bin"
a:textStyle="bold"
style="?controlImageButtonStyle"
a:onClick="clearButtonClickHandler"

View File

@@ -46,10 +46,12 @@
a:layout_height="fill_parent"
a:layout_weight="4"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
<org.solovyev.android.view.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="dec"
a:text="@string/c_clear"
calc:textDown="bin"
a:textStyle="bold"
style="?controlImageButtonStyle"
a:onClick="clearButtonClickHandler"

View File

@@ -40,7 +40,7 @@
<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"/>
<include layout="@layout/calc_erase_button"/>
</LinearLayout>
@@ -50,7 +50,7 @@
<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"/>
<include layout="@layout/calc_clear_button"/>
</LinearLayout>

View File

@@ -34,7 +34,7 @@
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_clear_button"/>
<include layout="@layout/calc_erase_button"/>
</LinearLayout>
@@ -44,7 +44,7 @@
<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"/>
<include layout="@layout/calc_clear_button"/>
</LinearLayout>

View File

@@ -6,10 +6,12 @@
~ 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.widgets.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="dec"
a:text="@string/c_clear"
calc:textDown="bin"
a:textStyle="bold"
style="?controlImageButtonStyle"
a:onClick="clearButtonClickHandler"/>

View File

@@ -9,7 +9,8 @@
<org.solovyev.android.view.widgets.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
calc:textUp="deg"
a:id="@+id/sixDigitButton" a:text="6"
a:id="@+id/sixDigitButton"
a:text="6"
calc:textDown="rad"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>