Android Omnibox: Do not force LTR text direction when empty.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omnibox;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.res.Resources;
@@ skipping 426 matching lines @@
         if (!focused) mAutocompleteSpan.clearSpan();
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
 
         if (focused && mFirstFocusTimeMs == 0) {
             mFirstFocusTimeMs = SystemClock.elapsedRealtime();
             if (mOmniboxLivenessListener != null) mOmniboxLivenessListener.onOmniboxFocused();
         }
 
         if (focused) StartupMetrics.getInstance().recordFocusedOmnibox();
 
-        // When unfocused, force left-to-right rendering at the paragraph level (which is desired
-        // for URLs). Right-to-left runs are still rendered RTL, but will not flip the whole URL
-        // around. This is consistent with OmniboxViewViews on desktop. When focused, render text
-        // normally (to allow users to make non-URL searches and to avoid showing Android's split
-        // insertion point when an RTL user enters RTL text).
-        if (focused) {
-            ApiCompatibilityUtils.setTextDirection(this, TEXT_DIRECTION_INHERIT);
-        } else {
-            ApiCompatibilityUtils.setTextDirection(this, TEXT_DIRECTION_LTR);
-        }
+        fixupTextDirection();
         // Always align to the same as the paragraph direction (LTR = left, RTL = right).
         ApiCompatibilityUtils.setTextAlignment(this, TEXT_ALIGNMENT_TEXT_START);
     }
 
     /**
      * @return The elapsed realtime timestamp in ms of the first time the url bar was focused,
      *         0 if never.
      */
     public long getFirstFocusTime() {
         return mFirstFocusTimeMs;
     }
 
     /**
      * Sets whether this {@link UrlBar} should be focusable.
      */
     public void setAllowFocus(boolean allowFocus) {
         mAllowFocus = allowFocus;
         if (mFirstDrawComplete) {
             setFocusable(allowFocus);
             setFocusableInTouchMode(allowFocus);
         }
     }
 
+    /**
+     * Sets the {@link UrlBar}'s text direction based on focus and contents.
+     *
+     * Should be called whenever focus or text contents change.
+     */
+    private void fixupTextDirection() {
+        // When unfocused, force left-to-right rendering at the paragraph level (which is desired
+        // for URLs). Right-to-left runs are still rendered RTL, but will not flip the whole URL
+        // around. This is consistent with OmniboxViewViews on desktop. When focused, render text
+        // normally (to allow users to make non-URL searches and to avoid showing Android's split
+        // insertion point when an RTL user enters RTL text). Also render text normally when the
+        // text field is empty (because then it displays an instruction that is not a URL).
+        if (mFocused || length() == 0) {
+            ApiCompatibilityUtils.setTextDirection(this, TEXT_DIRECTION_INHERIT);
+        } else {
+            ApiCompatibilityUtils.setTextDirection(this, TEXT_DIRECTION_LTR);
+        }
+    }
+
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
         if (visibility == View.GONE && isFocused()) mShowKeyboardOnWindowFocus = true;
     }
 
     @Override
     public void onWindowFocusChanged(boolean hasWindowFocus) {
         super.onWindowFocusChanged(hasWindowFocus);
         if (hasWindowFocus) {
@@ skipping 368 matching lines @@
         // Verify the autocomplete is still valid after the text change.
         if (mAutocompleteSpan != null
                 && mAutocompleteSpan.mUserText != null
                 && mAutocompleteSpan.mAutocompleteText != null) {
             if (getText().getSpanStart(mAutocompleteSpan) < 0) {
                 mAutocompleteSpan.clearSpan();
             } else {
                 clearAutocompleteSpanIfInvalid();
             }
         }
+
+        fixupTextDirection();
     }
 
     private void clearAutocompleteSpanIfInvalid() {
         Editable editableText = getEditableText();
         CharSequence previousUserText = mAutocompleteSpan.mUserText;
         CharSequence previousAutocompleteText = mAutocompleteSpan.mAutocompleteText;
         if (editableText.length()
                 != (previousUserText.length() + previousAutocompleteText.length())) {
             mAutocompleteSpan.clearSpan();
         } else if (TextUtils.indexOf(getText(), previousUserText) != 0
@@ skipping 290 matching lines @@
             return (int) paint.measureText(ELLIPSIS);
         }
 
         @Override
         public void draw(Canvas canvas, CharSequence text, int start, int end,
                 float x, int top, int y, int bottom, Paint paint) {
             canvas.drawText(ELLIPSIS, x, y, paint);
         }
     }
 }