merge to branch for publication

This commit is contained in:
warren powers
2010-10-01 22:28:28 +00:00
parent 8632c7ff7e
commit 86c59cf4bf
10 changed files with 355 additions and 485 deletions

View File

@@ -11,7 +11,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal">
<Button android:id="@+id/down"
<com.TwentyCode.android.ExaltedDice.NumberPickerButton android:id="@+id/down"
android:layout_width="60px"
android:layout_height="wrap_content"
android:text="-"
@@ -27,7 +27,7 @@
android:phoneNumber="true"
/>
<Button
<com.TwentyCode.android.ExaltedDice.NumberPickerButton
android:id="@+id/up"
android:layout_width="60px"
android:layout_height="wrap_content"

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="hello_msg"><item>Welcome to ExaltedDice!</item>
<item>Press the - button to lower your dice count by 1, or long press the - button to lower dice count by 10 </item><item>Press the + button to raise dice count by 1 of long press + to raise dice count by 10.</item><item>When you press Roll, Your Results Will Be Displayed Here</item>
<item>Press the - button to lower your dice count by 1, or long press to continuously lower the dice count.</item><item>Press the + button to raise your dice count by 1, or long press to continuously raise the dice count.</item><item>When you press Roll, Your Results Will Be Displayed Here</item>
</string-array>