Android omnibox: Force paragraph direction to LTR.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionView.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.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
@@ skipping 309 matching lines @@
             } else if ((suggestionType == OmniboxSuggestionType.SEARCH_SUGGEST_PERSONALIZED)
                     || (suggestionType == OmniboxSuggestionType.SEARCH_HISTORY)) {
                 // Show history icon for suggestions based on user queries.
                 suggestionIcon = SUGGESTION_ICON_HISTORY;
             }
             mContentsView.setSuggestionIcon(suggestionIcon, colorsChanged);
             setRefinable(!sameAsTyped);
             setSuggestedQuery(suggestionItem, false, false, false);
             if ((suggestionType == OmniboxSuggestionType.SEARCH_SUGGEST_ENTITY)
                     || (suggestionType == OmniboxSuggestionType.SEARCH_SUGGEST_PROFILE)) {
-                showDescriptionLine(
-                        SpannableString.valueOf(mSuggestion.getDescription()),
-                        getStandardFontColor());
+                showDescriptionLine(SpannableString.valueOf(mSuggestion.getDescription()), false);
             } else {
                 mContentsView.mTextLine2.setVisibility(INVISIBLE);
             }
         }
     }
 
     private void setRefinable(boolean refinable) {
         if (refinable) {
             mRefineView.setVisibility(VISIBLE);
             mRefineView.setOnClickListener(new OnClickListener() {
@@ skipping 43 matching lines @@
      * Sets (and highlights) the URL text of the second line of the omnibox suggestion.
      *
      * @param result The suggestion containing the URL.
      * @return Whether the URL was highlighted based on the user query.
      */
     private boolean setUrlText(OmniboxResultItem result) {
         OmniboxSuggestion suggestion = result.getSuggestion();
         Spannable str = SpannableString.valueOf(suggestion.getDisplayText());
         boolean hasMatch = applyHighlightToMatchRegions(
                 str, suggestion.getDisplayTextClassifications());
-        showDescriptionLine(str, URL_COLOR);
+        showDescriptionLine(str, true);
         return hasMatch;
     }
 
     private boolean applyHighlightToMatchRegions(
             Spannable str, List<MatchClassification> classifications) {
         boolean hasMatch = false;
         for (int i = 0; i < classifications.size(); i++) {
             MatchClassification classification = classifications.get(i);
             if ((classification.style & MatchClassificationStyle.MATCH)
                     == MatchClassificationStyle.MATCH) {
@@ skipping 13 matching lines @@
                         matchStartIndex, matchEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
         }
         return hasMatch;
     }
 
     /**
      * Sets a description line for the omnibox suggestion.
      *
      * @param str The description text.
+     * @param isUrl Whether this text is a URL (as opposed to a normal string).
      */
-    private void showDescriptionLine(Spannable str, int textColor) {
-        if (mContentsView.mTextLine2.getVisibility() != VISIBLE) {
-            mContentsView.mTextLine2.setVisibility(VISIBLE);
+    private void showDescriptionLine(Spannable str, boolean isUrl) {
+        TextView textLine = mContentsView.mTextLine2;
+        if (textLine.getVisibility() != VISIBLE) {
+            textLine.setVisibility(VISIBLE);
         }
-        mContentsView.mTextLine2.setTextColor(textColor);
-        mContentsView.mTextLine2.setText(str, BufferType.SPANNABLE);
+        textLine.setText(str, BufferType.SPANNABLE);
+
+        // Force left-to-right rendering for URLs. See UrlBar constructor for details.
+        if (isUrl) {
+            textLine.setTextColor(URL_COLOR);
+            textLine.setTextDirection(TEXT_DIRECTION_LTR);
+            textLine.setTextAlignment(TEXT_ALIGNMENT_VIEW_START);
+        } else {
+            textLine.setTextColor(getStandardFontColor());
+            textLine.setTextDirection(TEXT_DIRECTION_INHERIT);
+            textLine.setTextAlignment(TEXT_ALIGNMENT_INHERIT);
+        }
     }
 
     /**
      * Sets the text of the first line of the omnibox suggestion.
      *
      * @param suggestionItem The item containing the suggestion data.
      * @param showDescriptionIfPresent Whether to show the description text of the suggestion if
      *                                 the item contains valid data.
      * @param isUrlQuery Whether this suggestion is showing an URL.
      * @param isUrlHighlighted Whether the URL contains any highlighted matching sections.
@@ skipping 538 matching lines @@
             if (mUrlBar != null) mUrlBar.removeOnLayoutChangeListener(this);
             if (mLocationBar != null) {
                 mLocationBar.getContainerView().removeOnLayoutChangeListener(this);
             }
             getRootView().removeOnLayoutChangeListener(this);
 
             super.onDetachedFromWindow();
         }
     }
 }