summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/AddBookmarkPage.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:38 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:38 -0800
commitaec52de1c66b9ec52b126705ea1a63c2db6e12e5 (patch)
treef3b2d88f92ddbb5366a2817558bc63aa8c36353c /src/com/android/browser/AddBookmarkPage.java
parent1a16d15d91a3896065ceeb4972231eb5656a6f6c (diff)
downloadpackages_apps_Browser-aec52de1c66b9ec52b126705ea1a63c2db6e12e5.tar.gz
packages_apps_Browser-aec52de1c66b9ec52b126705ea1a63c2db6e12e5.tar.bz2
packages_apps_Browser-aec52de1c66b9ec52b126705ea1a63c2db6e12e5.zip
auto import from //depot/cupcake/@137055
Diffstat (limited to 'src/com/android/browser/AddBookmarkPage.java')
-rw-r--r--src/com/android/browser/AddBookmarkPage.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 23c0facb2..cf3fe709a 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -119,16 +119,13 @@ public class AddBookmarkPage extends Activity {
boolean emptyTitle = title.length() == 0;
boolean emptyUrl = unfilteredUrl.trim().length() == 0;
Resources r = getResources();
- if (emptyTitle) {
+ if (emptyTitle || emptyUrl) {
+ if (emptyTitle) {
+ mTitle.setError(r.getText(R.string.bookmark_needs_title));
+ }
if (emptyUrl) {
- setTitle(r.getText(R.string.empty_bookmark));
- return false;
- }
- setTitle(r.getText(R.string.bookmark_needs_title));
- return false;
- }
- if (emptyUrl) {
- setTitle(r.getText(R.string.bookmark_needs_url));
+ mAddress.setError(r.getText(R.string.bookmark_needs_url));
+ }
return false;
}
String url = unfilteredUrl;
@@ -138,11 +135,11 @@ public class AddBookmarkPage extends Activity {
try {
address = new WebAddress(unfilteredUrl);
} catch (ParseException e) {
- setTitle(r.getText(R.string.bookmark_url_not_valid));
+ mAddress.setError(r.getText(R.string.bookmark_url_not_valid));
return false;
}
if (address.mHost.length() == 0) {
- setTitle(r.getText(R.string.bookmark_url_not_valid));
+ mAddress.setError(r.getText(R.string.bookmark_url_not_valid));
return false;
}
url = address.toString();