commit 6ea3a429d4c043ec760b1802421cde2e257ae507
author Panos Thomas <panos@codeaurora.org> Thu Oct 09 23:42:59 2014 -0700
committer WebTech Code Review <code-review@localhost> Tue Oct 14 09:09:30 2014 -0700
tree d588191915c150448c29a5711f247573288c185d
parent 4799bdbd4b385ac1ffb9b78b8cf25a17b89000bc

Fix for ActionBarContextView not shown in landscape mode

- Revert commit 244dc4635f1a43673d3a5a716639db7b2ba6e6b3
  "Fix Url text not getting deleted on pressing delete key."
- Set UrlInputView text to full URL in HIGHLIGHTED state as
  opposed to NORMAL state to address issue with delete key.

Change-Id: I0d92937413d6c7c33e96f2134930179a64421316

src/com/android/browser/NavigationBarPhone.java

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 1bd9cad..796320a 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -210,14 +210,8 @@
 
     @Override
     public void onFocusChange(View view, boolean hasFocus) {
-        if (view == mUrlInput) {
-            if (hasFocus && !mUrlInput.getText().toString().equals(mUrlInput.getTag())) {
-                // only change text if different
-                mUrlInput.setText((String) mUrlInput.getTag(), false);
-                mUrlInput.selectAll();
-            } else {
-                setDisplayTitle(mUrlInput.getText().toString());
-            }
+        if (view == mUrlInput && !hasFocus) {
+            setDisplayTitle(mUrlInput.getText().toString());
         }
         super.onFocusChange(view, hasFocus);
     }
@@ -246,6 +240,11 @@
             mTabSwitcher.setVisibility(View.GONE);
             mMore.setVisibility(View.GONE);
             mTitleContainer.setBackgroundDrawable(mTextfieldBgDrawable);
+            if (!mUrlInput.getText().toString().equals(mUrlInput.getTag())) {
+                // only change text if different
+                mUrlInput.setText((String) mUrlInput.getTag(), false);
+                mUrlInput.selectAll();
+            }
             break;
         case StateListener.STATE_EDITED:
             mComboIcon.setVisibility(View.GONE);