commit c93a2a97d9f64f8ac32c1e4e9c863d3e16021126
author Narayan Kamath <narayan@google.com> Tue Mar 15 11:33:52 2011 +0000
committer John Reck <jreck@google.com> Tue Mar 15 09:38:20 2011 -0700
tree 68656ecfa4a6198f3dec9f9fa377643e8cd3f08a
parent ac7538e0a49911b926eeebb811f61c6996c68ae3

Set the url input to current page when cleared

 Bug: 4099000

Change-Id: I3a96b35a5234089fb76393273c250f3bfe0149eb

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index a786fd7..9fce511 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -267,6 +267,13 @@
             if (mUseQuickControls) {
                 mUi.hideTitleBar();
             }
+
+            if (mUrlInput.getText().length() == 0) {
+                Tab currentTab = mUiController.getTabControl().getCurrentTab();
+                if (currentTab != null) {
+                    mUrlInput.setText(currentTab.getUrl(), false);
+                }
+            }
         }
         mUrlInput.clearNeedsUpdate();
     }

src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java

diff --git a/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java b/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
index 07c88e8..e51a629 100644
--- a/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
+++ b/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
@@ -791,7 +791,21 @@
             setText(text);
         } else {
             mBlockCompletion = true;
+            // If cursor movement handling was suspended (the view is
+            // not in focus), resume it and apply the pending change.
+            // Since we don't want to perform any filtering, this change
+            // is safe.
+            boolean wasSuspended = false;
+            if (mController.isCursorHandlingSuspended()) {
+                mController.resumeCursorMovementHandlingAndApplyChanges();
+                wasSuspended = true;
+            }
+
             setText(text);
+
+            if (wasSuspended) {
+                mController.suspendCursorMovementHandling();
+            }
             mBlockCompletion = false;
         }
     }