diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 12:00:03 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 12:00:03 +0000 |
commit | 2d05d2f9daebd7559c9dd05f4784e5f677b6dbbe (patch) | |
tree | ebaaf5d90d0ed0914e279df369ff263f1bd90d18 /android | |
parent | cc758e42b9456c6093636647ae1dd8f64e639ff0 (diff) | |
download | rockbox-2d05d2f9daebd7559c9dd05f4784e5f677b6dbbe.tar.gz rockbox-2d05d2f9daebd7559c9dd05f4784e5f677b6dbbe.zip |
Clean up r28408 coding style a bit to follow our guidelines with regard to
brace placement, tabs and 80 char line width.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28410 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
-rw-r--r-- | android/src/org/rockbox/HostCallback.java | 5 | ||||
-rw-r--r-- | android/src/org/rockbox/KeyboardActivity.java | 49 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxActivity.java | 11 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxKeyboardInput.java | 51 |
4 files changed, 59 insertions, 57 deletions
diff --git a/android/src/org/rockbox/HostCallback.java b/android/src/org/rockbox/HostCallback.java index 0e69b3f283..8584fedd6a 100644 --- a/android/src/org/rockbox/HostCallback.java +++ b/android/src/org/rockbox/HostCallback.java | |||
@@ -2,6 +2,7 @@ package org.rockbox; | |||
2 | 2 | ||
3 | import android.content.Intent; | 3 | import android.content.Intent; |
4 | 4 | ||
5 | public interface HostCallback { | 5 | public interface HostCallback |
6 | public void onComplete(int resultCode, Intent data); | 6 | { |
7 | public void onComplete(int resultCode, Intent data); | ||
7 | } | 8 | } |
diff --git a/android/src/org/rockbox/KeyboardActivity.java b/android/src/org/rockbox/KeyboardActivity.java index f32aae28f8..c77f686780 100644 --- a/android/src/org/rockbox/KeyboardActivity.java +++ b/android/src/org/rockbox/KeyboardActivity.java | |||
@@ -10,32 +10,39 @@ import android.view.LayoutInflater; | |||
10 | import android.view.View; | 10 | import android.view.View; |
11 | import android.widget.EditText; | 11 | import android.widget.EditText; |
12 | 12 | ||
13 | public class KeyboardActivity extends Activity { | 13 | public class KeyboardActivity extends Activity |
14 | public void onCreate(Bundle savedInstanceState) { | 14 | { |
15 | public void onCreate(Bundle savedInstanceState) | ||
16 | { | ||
15 | super.onCreate(savedInstanceState); | 17 | super.onCreate(savedInstanceState); |
16 | LayoutInflater inflater=LayoutInflater.from(this); | 18 | LayoutInflater inflater=LayoutInflater.from(this); |
17 | View addView=inflater.inflate(R.layout.keyboardinput, null); | 19 | View addView=inflater.inflate(R.layout.keyboardinput, null); |
18 | EditText input = (EditText) addView.findViewById(R.id.KbdInput); | 20 | EditText input = (EditText) addView.findViewById(R.id.KbdInput); |
19 | input.setText(getIntent().getStringExtra("value")); | 21 | input.setText(getIntent().getStringExtra("value")); |
20 | new AlertDialog.Builder(this) | 22 | new AlertDialog.Builder(this) |
21 | .setTitle(R.string.KbdInputTitle) | 23 | .setTitle(R.string.KbdInputTitle) |
22 | .setView(addView) | 24 | .setView(addView) |
23 | .setIcon(R.drawable.icon) | 25 | .setIcon(R.drawable.icon) |
24 | .setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() { | 26 | .setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() |
25 | public void onClick(DialogInterface dialog, int whichButton) { | 27 | { |
26 | EditText input = (EditText)((Dialog)dialog).findViewById(R.id.KbdInput); | 28 | public void onClick(DialogInterface dialog, int whichButton) { |
27 | Editable s = input.getText(); | 29 | EditText input = (EditText)((Dialog)dialog) |
28 | getIntent().putExtra("value", s.toString()); | 30 | .findViewById(R.id.KbdInput); |
29 | setResult(RESULT_OK, getIntent()); | 31 | Editable s = input.getText(); |
30 | finish(); | 32 | getIntent().putExtra("value", s.toString()); |
31 | } | 33 | setResult(RESULT_OK, getIntent()); |
32 | }) | 34 | finish(); |
33 | .setNegativeButton(R.string.Cancel, new DialogInterface.OnClickListener() { | 35 | } |
34 | public void onClick(DialogInterface dialog, int whichButton) { | 36 | }) |
35 | setResult(RESULT_CANCELED, getIntent()); | 37 | |
36 | finish(); | 38 | .setNegativeButton(R.string.Cancel, new DialogInterface.OnClickListener() |
37 | } | 39 | { |
38 | }) | 40 | public void onClick(DialogInterface dialog, int whichButton) |
39 | .show(); | 41 | { |
42 | setResult(RESULT_CANCELED, getIntent()); | ||
43 | finish(); | ||
44 | } | ||
45 | }) | ||
46 | .show(); | ||
40 | } | 47 | } |
41 | } | 48 | } |
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java index 9eed3f48dc..fed17c67f9 100644 --- a/android/src/org/rockbox/RockboxActivity.java +++ b/android/src/org/rockbox/RockboxActivity.java | |||
@@ -24,7 +24,6 @@ package org.rockbox; | |||
24 | import android.app.Activity; | 24 | import android.app.Activity; |
25 | import android.app.ProgressDialog; | 25 | import android.app.ProgressDialog; |
26 | import android.content.Intent; | 26 | import android.content.Intent; |
27 | import android.content.IntentFilter; | ||
28 | import android.os.Bundle; | 27 | import android.os.Bundle; |
29 | import android.util.Log; | 28 | import android.util.Log; |
30 | import android.view.ViewGroup; | 29 | import android.view.ViewGroup; |
@@ -167,15 +166,15 @@ public class RockboxActivity extends Activity | |||
167 | if (hostcallback != null) | 166 | if (hostcallback != null) |
168 | { | 167 | { |
169 | LOG("Something has gone wrong"); | 168 | LOG("Something has gone wrong"); |
170 | } | 169 | } |
171 | hostcallback = callback; | 170 | hostcallback = callback; |
172 | startActivityForResult(i, 0); | 171 | startActivityForResult(i, 0); |
173 | } | 172 | } |
174 | 173 | ||
175 | public void onActivityResult(int requestCode, int resultCode, Intent data) | 174 | public void onActivityResult(int requestCode, int resultCode, Intent data) |
176 | { | 175 | { |
177 | hostcallback.onComplete(resultCode, data); | 176 | hostcallback.onComplete(resultCode, data); |
178 | hostcallback = null; | 177 | hostcallback = null; |
179 | } | 178 | } |
180 | 179 | ||
181 | private void LOG(CharSequence text) | 180 | private void LOG(CharSequence text) |
diff --git a/android/src/org/rockbox/RockboxKeyboardInput.java b/android/src/org/rockbox/RockboxKeyboardInput.java index b037f6c4bb..5601b16662 100644 --- a/android/src/org/rockbox/RockboxKeyboardInput.java +++ b/android/src/org/rockbox/RockboxKeyboardInput.java | |||
@@ -22,48 +22,43 @@ | |||
22 | package org.rockbox; | 22 | package org.rockbox; |
23 | 23 | ||
24 | import android.app.Activity; | 24 | import android.app.Activity; |
25 | import android.content.BroadcastReceiver; | ||
26 | import android.content.Intent; | 25 | import android.content.Intent; |
27 | import android.util.Log; | ||
28 | 26 | ||
29 | public class RockboxKeyboardInput | 27 | public class RockboxKeyboardInput |
30 | { | 28 | { |
31 | private BroadcastReceiver b; | ||
32 | private String result; | 29 | private String result; |
33 | 30 | ||
34 | public RockboxKeyboardInput() | 31 | public RockboxKeyboardInput() |
35 | { | 32 | { |
36 | result = null; | 33 | result = null; |
37 | } | 34 | } |
38 | 35 | ||
39 | public void kbd_input(String text) | 36 | public void kbd_input(String text) |
40 | { | 37 | { |
41 | RockboxActivity a = (RockboxActivity) RockboxService.get_instance().get_activity(); | 38 | RockboxActivity a = (RockboxActivity) RockboxService.get_instance().get_activity(); |
42 | Intent kbd = new Intent(a, KeyboardActivity.class); | 39 | Intent kbd = new Intent(a, KeyboardActivity.class); |
43 | kbd.putExtra("value", text); | 40 | kbd.putExtra("value", text); |
44 | a.waitForActivity(kbd, new HostCallback(){ | 41 | a.waitForActivity(kbd, new HostCallback() |
45 | 42 | { | |
46 | @Override | 43 | public void onComplete(int resultCode, Intent data) |
47 | public void onComplete(int resultCode, Intent data) { | 44 | { |
48 | if (resultCode == Activity.RESULT_OK) | 45 | if (resultCode == Activity.RESULT_OK) |
49 | { | 46 | { |
50 | result = data.getStringExtra("value"); | 47 | result = data.getStringExtra("value"); |
51 | } | 48 | } |
52 | else { | 49 | else { |
53 | result = ""; | 50 | result = ""; |
54 | } | 51 | } |
55 | } | 52 | } |
56 | }); | 53 | }); |
57 | } | 54 | } |
58 | public String get_result() | 55 | public String get_result() |
59 | { | 56 | { |
60 | return result; | 57 | return result; |
61 | } | 58 | } |
62 | |||
63 | public boolean is_usable() | ||
64 | { | ||
65 | return RockboxService.get_instance().get_activity() != null; | ||
66 | } | ||
67 | 59 | ||
68 | 60 | public boolean is_usable() | |
61 | { | ||
62 | return RockboxService.get_instance().get_activity() != null; | ||
63 | } | ||
69 | } | 64 | } |