diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/src/org/rockbox/RockboxKeyboardInput.java | 7 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxYesno.java | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/android/src/org/rockbox/RockboxKeyboardInput.java b/android/src/org/rockbox/RockboxKeyboardInput.java index b7dd812f35..9cb5683a57 100644 --- a/android/src/org/rockbox/RockboxKeyboardInput.java +++ b/android/src/org/rockbox/RockboxKeyboardInput.java | |||
@@ -33,12 +33,11 @@ import android.widget.EditText; | |||
33 | 33 | ||
34 | public class RockboxKeyboardInput | 34 | public class RockboxKeyboardInput |
35 | { | 35 | { |
36 | public void kbd_input(final String text) | 36 | public void kbd_input(final String text, final String ok, final String cancel) |
37 | { | 37 | { |
38 | final Activity c = RockboxService.get_instance().get_activity(); | 38 | final Activity c = RockboxService.get_instance().get_activity(); |
39 | 39 | ||
40 | c.runOnUiThread(new Runnable() { | 40 | c.runOnUiThread(new Runnable() { |
41 | @Override | ||
42 | public void run() | 41 | public void run() |
43 | { | 42 | { |
44 | LayoutInflater inflater = LayoutInflater.from(c); | 43 | LayoutInflater inflater = LayoutInflater.from(c); |
@@ -50,7 +49,7 @@ public class RockboxKeyboardInput | |||
50 | .setView(addView) | 49 | .setView(addView) |
51 | .setIcon(R.drawable.icon) | 50 | .setIcon(R.drawable.icon) |
52 | .setCancelable(false) | 51 | .setCancelable(false) |
53 | .setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() | 52 | .setPositiveButton(ok, new DialogInterface.OnClickListener() |
54 | { | 53 | { |
55 | public void onClick(DialogInterface dialog, int whichButton) { | 54 | public void onClick(DialogInterface dialog, int whichButton) { |
56 | EditText input = (EditText)((Dialog)dialog) | 55 | EditText input = (EditText)((Dialog)dialog) |
@@ -59,7 +58,7 @@ public class RockboxKeyboardInput | |||
59 | put_result(true, s.toString()); | 58 | put_result(true, s.toString()); |
60 | } | 59 | } |
61 | }) | 60 | }) |
62 | .setNegativeButton(R.string.Cancel, new DialogInterface.OnClickListener() | 61 | .setNegativeButton(cancel, new DialogInterface.OnClickListener() |
63 | { | 62 | { |
64 | public void onClick(DialogInterface dialog, int whichButton) | 63 | public void onClick(DialogInterface dialog, int whichButton) |
65 | { | 64 | { |
diff --git a/android/src/org/rockbox/RockboxYesno.java b/android/src/org/rockbox/RockboxYesno.java index 9481d69d01..df8c54b7d9 100644 --- a/android/src/org/rockbox/RockboxYesno.java +++ b/android/src/org/rockbox/RockboxYesno.java | |||
@@ -28,12 +28,11 @@ import android.content.DialogInterface; | |||
28 | public class RockboxYesno | 28 | public class RockboxYesno |
29 | { | 29 | { |
30 | @SuppressWarnings("unused") | 30 | @SuppressWarnings("unused") |
31 | private void yesno_display(final String text) | 31 | private void yesno_display(final String text, final String yes, final String no) |
32 | { | 32 | { |
33 | final Activity c = RockboxService.get_instance().get_activity(); | 33 | final Activity c = RockboxService.get_instance().get_activity(); |
34 | 34 | ||
35 | c.runOnUiThread(new Runnable() { | 35 | c.runOnUiThread(new Runnable() { |
36 | @Override | ||
37 | public void run() | 36 | public void run() |
38 | { | 37 | { |
39 | new AlertDialog.Builder(c) | 38 | new AlertDialog.Builder(c) |
@@ -41,14 +40,14 @@ public class RockboxYesno | |||
41 | .setIcon(R.drawable.icon) | 40 | .setIcon(R.drawable.icon) |
42 | .setCancelable(false) | 41 | .setCancelable(false) |
43 | .setMessage(text) | 42 | .setMessage(text) |
44 | .setPositiveButton(R.string.Yes, new DialogInterface.OnClickListener() | 43 | .setPositiveButton(yes, new DialogInterface.OnClickListener() |
45 | { | 44 | { |
46 | public void onClick(DialogInterface dialog, int whichButton) | 45 | public void onClick(DialogInterface dialog, int whichButton) |
47 | { | 46 | { |
48 | put_result(true); | 47 | put_result(true); |
49 | } | 48 | } |
50 | }) | 49 | }) |
51 | .setNegativeButton(R.string.No, new DialogInterface.OnClickListener() | 50 | .setNegativeButton(no, new DialogInterface.OnClickListener() |
52 | { | 51 | { |
53 | public void onClick(DialogInterface dialog, int whichButton) | 52 | public void onClick(DialogInterface dialog, int whichButton) |
54 | { | 53 | { |