Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3535)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

Issue 2211433002: Making Android Url bar behavior to ESCAPE key same as in Desktop Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed redundant hideSuggestions() and hideKeyboard() calls. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 02f38f944f4f98f59f88c33d46ca57e27e45eb46..ababf32751cc701eb4ff0323fe4739825a54c5b4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -333,6 +333,11 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
return true;
}
}
+ } else if (keyCode == KeyEvent.KEYCODE_ESCAPE) {
+ if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
+ revertChanges();
+ return true;
+ }
}
return false;
}
@@ -899,11 +904,14 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
} else {
Tab tab = mToolbarDataProvider.getTab();
if (NativePageFactory.isNativePageUrl(tab.getUrl(), tab.isIncognito())) {
- mUrlBar.setUrl("", null);
+ setUrlBarText("", null);
} else {
- mUrlBar.setUrl(
+ setUrlBarText(
mToolbarDataProvider.getText(), getCurrentTabUrl());
+ selectAll();
}
+ hideSuggestions();
+ UiUtils.hideKeyboard(mUrlBar);
}
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698