diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2014-05-15 20:18:48 +1000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2014-05-15 20:18:48 +1000 |
commit | cb205c8b560b78526dcb75b4c3ceb0fbfac75fe4 (patch) | |
tree | 071d23647ad3e791aca71e7a6f07d937f029f813 /android | |
parent | 01cbb795e9a059238f0e39d44d279c1d52874e06 (diff) | |
download | rockbox-cb205c8b560b78526dcb75b4c3ceb0fbfac75fe4.tar.gz rockbox-cb205c8b560b78526dcb75b4c3ceb0fbfac75fe4.zip |
Fix android SDK version and the yes/no screen title
Change-Id: I84a067adcc83291de5131c88483f400d38bea15b
Diffstat (limited to 'android')
-rw-r--r-- | android/android.make | 2 | ||||
-rw-r--r-- | android/res/values/strings.xml | 1 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxYesno.java | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/android/android.make b/android/android.make index 4c93aa72cc..0b6a32a9df 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -32,7 +32,7 @@ ANDROID_PLATFORM_VERSION=19 | |||
32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) | 32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) |
33 | 33 | ||
34 | # android tools | 34 | # android tools |
35 | BUILD_TOOLS_VERSION=19.0.3 | 35 | BUILD_TOOLS_VERSION=19.1.0 |
36 | AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt | 36 | AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt |
37 | DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx | 37 | DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx |
38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign | 38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign |
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 615e3d1ebf..d81fab859e 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml | |||
@@ -6,6 +6,7 @@ | |||
6 | <string name="OK">OK</string> | 6 | <string name="OK">OK</string> |
7 | <string name="Cancel">Cancel</string> | 7 | <string name="Cancel">Cancel</string> |
8 | <string name="KbdInputTitle">Rockbox Keyboard Input</string> | 8 | <string name="KbdInputTitle">Rockbox Keyboard Input</string> |
9 | <string name="YesNoTitle">Rockbox</string> | ||
9 | <string name="Yes">Yes</string> | 10 | <string name="Yes">Yes</string> |
10 | <string name="No">No</string> | 11 | <string name="No">No</string> |
11 | <string name="error_extraction">Error occured during extraction!</string> | 12 | <string name="error_extraction">Error occured during extraction!</string> |
diff --git a/android/src/org/rockbox/RockboxYesno.java b/android/src/org/rockbox/RockboxYesno.java index c7ab729cfc..818174ddfd 100644 --- a/android/src/org/rockbox/RockboxYesno.java +++ b/android/src/org/rockbox/RockboxYesno.java | |||
@@ -59,7 +59,7 @@ public class RockboxYesno | |||
59 | { | 59 | { |
60 | Listener l = new Listener(); | 60 | Listener l = new Listener(); |
61 | new AlertDialog.Builder(c) | 61 | new AlertDialog.Builder(c) |
62 | .setTitle(R.string.KbdInputTitle) | 62 | .setTitle(R.string.YesNoTitle) |
63 | .setIcon(R.drawable.icon) | 63 | .setIcon(R.drawable.icon) |
64 | .setMessage(text) | 64 | .setMessage(text) |
65 | .setPositiveButton(yes, l) | 65 | .setPositiveButton(yes, l) |