You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/05/10 23:03:32 UTC
[07/13] android commit: CB-3022: Add default text to Android Prompt
CB-3022: Add default text to Android Prompt
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4b38ccef
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4b38ccef
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4b38ccef
Branch: refs/heads/3.0.0
Commit: 4b38ccef80c8a98f0f99605cb81f21c0f5c3c3aa
Parents: 2d4d18f
Author: mbillau <mi...@gmail.com>
Authored: Wed Apr 24 12:48:48 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri May 3 13:18:30 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/Notification.java | 20 ++++++++------
1 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4b38ccef/framework/src/org/apache/cordova/Notification.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Notification.java b/framework/src/org/apache/cordova/Notification.java
index 9d96062..061aebf 100755
--- a/framework/src/org/apache/cordova/Notification.java
+++ b/framework/src/org/apache/cordova/Notification.java
@@ -33,6 +33,7 @@ import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Vibrator;
+import android.util.Log;
import android.widget.EditText;
/**
@@ -74,7 +75,7 @@ public class Notification extends CordovaPlugin {
return true;
}
else if (action.equals("prompt")) {
- this.prompt(args.getString(0), args.getString(1), args.getJSONArray(2), callbackContext);
+ this.prompt(args.getString(0), args.getString(1), args.getJSONArray(2), args.getString(3), callbackContext);
return true;
}
else if (action.equals("activityStart")) {
@@ -271,11 +272,12 @@ public class Notification extends CordovaPlugin {
* @param buttonLabels A comma separated list of button labels (Up to 3 buttons)
* @param callbackContext The callback context.
*/
- public synchronized void prompt(final String message, final String title, final JSONArray buttonLabels, final CallbackContext callbackContext) {
+ public synchronized void prompt(final String message, final String title, final JSONArray buttonLabels, final String defaultText, final CallbackContext callbackContext) {
final CordovaInterface cordova = this.cordova;
final EditText promptInput = new EditText(cordova.getActivity());
-
+ promptInput.setHint(defaultText);
+
Runnable runnable = new Runnable() {
public void run() {
AlertDialog.Builder dlg = new AlertDialog.Builder(cordova.getActivity());
@@ -296,7 +298,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss();
try {
result.put("buttonIndex",1);
- result.put("input1", promptInput.getText());
+ result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
}
@@ -313,7 +315,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss();
try {
result.put("buttonIndex",2);
- result.put("input1", promptInput.getText());
+ result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
}
@@ -330,7 +332,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss();
try {
result.put("buttonIndex",3);
- result.put("input1", promptInput.getText());
+ result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
}
@@ -344,7 +346,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss();
try {
result.put("buttonIndex",0);
- result.put("input1", promptInput.getText());
+ result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
}
@@ -355,8 +357,9 @@ public class Notification extends CordovaPlugin {
};
};
- this.cordova.getActivity().runOnUiThread(runnable);
+ this.cordova.getActivity().runOnUiThread(runnable);
}
+
/**
* Show the spinner.
*
@@ -446,5 +449,4 @@ public class Notification extends CordovaPlugin {
this.progressDialog = null;
}
}
-
}