summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/NavigationBarPhone.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-08-10 18:16:52 -0700
committerJohn Reck <jreck@google.com>2011-08-11 11:37:45 -0700
commit434e9f83e13c0758dcdefe214357fc9cc9f104d5 (patch)
tree71a6a98e0c677b8e6ce00a267cf449074b1fa746 /src/com/android/browser/NavigationBarPhone.java
parente3da7d615be4710da92a79e6ed70dc1982deda4c (diff)
downloadpackages_apps_Browser-434e9f83e13c0758dcdefe214357fc9cc9f104d5.tar.gz
packages_apps_Browser-434e9f83e13c0758dcdefe214357fc9cc9f104d5.tar.bz2
packages_apps_Browser-434e9f83e13c0758dcdefe214357fc9cc9f104d5.zip
Strip http://(www.)? from url input
Bug: 4982126 Change-Id: Ia8a9ade2ad4f578e40333f42e02edc161f7fa1c2
Diffstat (limited to 'src/com/android/browser/NavigationBarPhone.java')
-rw-r--r--src/com/android/browser/NavigationBarPhone.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 817337718..49228db72 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -128,11 +128,12 @@ public class NavigationBarPhone extends NavigationBarBase implements
*/
@Override
void setDisplayTitle(String title) {
+ mUrlInput.setTag(title);
if (!isEditingUrl()) {
if (title == null) {
mUrlInput.setText(R.string.new_tab);
} else {
- mUrlInput.setText(title);
+ mUrlInput.setText(UrlUtils.stripUrl(title), false);
}
mUrlInput.setSelection(0);
}
@@ -198,6 +199,18 @@ public class NavigationBarPhone extends NavigationBarBase implements
}
@Override
+ public void onFocusChange(View view, boolean hasFocus) {
+ if (view == mUrlInput) {
+ if (hasFocus) {
+ mUrlInput.setText((String) mUrlInput.getTag(), false);
+ } else {
+ setDisplayTitle(mUrlInput.getText().toString());
+ }
+ }
+ super.onFocusChange(view, hasFocus);
+ }
+
+ @Override
public void onStateChanged(int state) {
switch(state) {
case StateListener.STATE_NORMAL: