From cb205c8b560b78526dcb75b4c3ceb0fbfac75fe4 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 15 May 2014 20:18:48 +1000 Subject: [PATCH] Fix android SDK version and the yes/no screen title Change-Id: I84a067adcc83291de5131c88483f400d38bea15b --- android/android.make | 2 +- android/res/values/strings.xml | 1 + 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 ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) # android tools -BUILD_TOOLS_VERSION=19.0.3 +BUILD_TOOLS_VERSION=19.1.0 AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx 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 @@ OK Cancel Rockbox Keyboard Input +Rockbox Yes No Error occured during extraction! 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 { Listener l = new Listener(); new AlertDialog.Builder(c) - .setTitle(R.string.KbdInputTitle) + .setTitle(R.string.YesNoTitle) .setIcon(R.drawable.icon) .setMessage(text) .setPositiveButton(yes, l)