Android omnibox: Force paragraph direction to LTR.

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.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.SystemClock;
 import android.text.Editable;
-import android.text.Layout;
 import android.text.Selection;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.ReplacementSpan;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ skipping 38 matching lines @@
     /** The contents of the URL that precede the path/query before formatting. */
     private String mOriginalUrlLocation;
 
     /** Overrides the text announced during accessibility events. */
     private String mAccessibilityTextOverride;
 
     private boolean mShowKeyboardOnWindowFocus;
 
     private boolean mFirstDrawComplete;
 
-    /**
-     * The text direction of the URL or query: LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR, or
-     * LAYOUT_DIRECTION_RTL.
-     * */
-    private int mUrlDirection;
-
     private UrlBarDelegate mUrlBarDelegate;
 
-    private UrlDirectionListener mUrlDirectionListener;
-
     private final AutocompleteSpan mAutocompleteSpan;
 
     /**
      * The gesture detector is used to detect long presses. Long presses require special treatment
      * because the URL bar has custom touch event handling. See: {@link #onTouchEvent}.
      */
     private final GestureDetector mGestureDetector;
     private boolean mFocused;
     private boolean mAllowFocus = true;
 
@@ skipping 32 matching lines @@
     // guarantee that the text does contain the span currently as newly set text may have cleared
     // this (and it the value will only be recalculated after the text has been changed).
     private boolean mDidEllipsizeTextHint;
 
     // Set to true when the URL bar text is modified programmatically. Initially set
     // to true until the old state has been loaded.
     private boolean mIgnoreAutocomplete = true;
     private boolean mLastUrlEditWasDelete;
 
     /**
-     * Implement this to get updates when the direction of the text in the URL bar changes.
-     * E.g. If the user is typing a URL, then erases it and starts typing a query in Arabic,
-     * the direction will change from left-to-right to right-to-left.
-     */
-    interface UrlDirectionListener {
-        /**
-         * Called whenever the layout direction of the UrlBar changes.
-         * @param layoutDirection the new direction: android.view.View.LAYOUT_DIRECTION_LTR or
-         *                        android.view.View.LAYOUT_DIRECTION_RTL
-         */
-        public void onUrlDirectionChanged(int layoutDirection);
-    }
-
-    /**
      * Delegate used to communicate with the content side and the parent layout.
      */
     public interface UrlBarDelegate {
         /**
          * @return The current active {@link Tab}.
          */
         Tab getCurrentTab();
 
         /**
          * Called when the text state has changed and the autocomplete suggestions should be
@@ skipping 26 matching lines @@
 
         mLightDefaultTextColor =
                 ApiCompatibilityUtils.getColor(resources, R.color.url_emphasis_light_default_text);
         mLightHintColor =
                 ApiCompatibilityUtils.getColor(resources, R.color.locationbar_light_hint_text);
         mLightHighlightColor = ApiCompatibilityUtils.getColor(resources,
                 R.color.locationbar_light_selection_color);
 
         setUseDarkTextColors(true);
 
-        mUrlDirection = LAYOUT_DIRECTION_LOCALE;
+        // Force left-to-right rendering at the paragraph level. Right-to-left runs are still
+        // rendered RTL, but will not flip the whole URL around. For example (if "ABC" is Hebrew),
+        // this will render "ABC.com" as "CBA.com", rather than "com.CBA". This is consistent with
+        // OmniboxViewViews on desktop.
+        setTextDirection(TEXT_DIRECTION_LTR);

[Ted C, 2016/05/18 17:01:01]

Only available in API 17+

https://developer.android.com/reference/android/view/View.html#setTextDirecti...

Our wrapper for this:
https://code.google.com/p/chromium/codesearch#chromium/src/base/android/java/...

[Matt Giuca, 2016/06/09 08:39:12]

Done.

+        setTextAlignment(TEXT_ALIGNMENT_VIEW_START);

[Ted C, 2016/05/18 17:01:01]

Same:

https://code.google.com/p/chromium/codesearch#chromium/src/base/android/java/...

[Matt Giuca, 2016/06/09 08:39:12]

Done.

+
         mAutocompleteSpan = new AutocompleteSpan();
 
         // The URL Bar is derived from an text edit class, and as such is focusable by
         // default. This means that if it is created before the first draw of the UI it
         // will (as the only focusable element of the UI) get focus on the first draw.
         // We react to this by greying out the tab area and bringing up the keyboard,
         // which we don't want to do at startup. Prevent this by disabling focus until
         // the first draw.
         setFocusable(false);
         setFocusableInTouchMode(false);
@@ skipping 351 matching lines @@
             // the constructor) so we want to make the URL bar focusable so that
             // touches etc. activate it.
             setFocusable(mAllowFocus);
             setFocusableInTouchMode(mAllowFocus);
 
             // The URL bar will now react correctly to a focus change event
             if (mOmniboxLivenessListener != null) {
                 mOmniboxLivenessListener.onOmniboxInteractive();
             }
         }
-
-        // Notify listeners if the URL's direction has changed.
-        updateUrlDirection();
-    }
-
-    /**
-     * If the direction of the URL has changed, update mUrlDirection and notify the
-     * UrlDirectionListeners.
-     */
-    private void updateUrlDirection() {
-        Layout layout = getLayout();
-        if (layout == null) return;
-
-        int urlDirection;
-        if (length() == 0) {
-            urlDirection = LAYOUT_DIRECTION_LOCALE;
-        } else if (layout.getParagraphDirection(0) == Layout.DIR_LEFT_TO_RIGHT) {
-            urlDirection = LAYOUT_DIRECTION_LTR;
-        } else {
-            urlDirection = LAYOUT_DIRECTION_RTL;
-        }
-
-        if (urlDirection != mUrlDirection) {
-            mUrlDirection = urlDirection;
-            if (mUrlDirectionListener != null) {
-                mUrlDirectionListener.onUrlDirectionChanged(urlDirection);
-            }
-        }
     }
 
     /**
-     * @return The text direction of the URL, e.g. LAYOUT_DIRECTION_LTR.
-     */
-    public int getUrlDirection() {
-        return mUrlDirection;
-    }
-
-    /**
-     * Sets the listener for changes in the url bar's layout direction. Also calls
-     * onUrlDirectionChanged() immediately on the listener.
-     *
-     * @param listener The UrlDirectionListener to receive callbacks when the url direction changes,
-     *     or null to unregister any previously registered listener.
-     */
-    public void setUrlDirectionListener(UrlDirectionListener listener) {
-        mUrlDirectionListener = listener;
-        if (mUrlDirectionListener != null) {
-            mUrlDirectionListener.onUrlDirectionChanged(mUrlDirection);
-        }
-    }
-
-    /**
      * Set the url delegate to handle communication from the {@link UrlBar} to the rest of the UI.
      * @param delegate The {@link UrlBarDelegate} to be used.
      */
     public void setDelegate(UrlBarDelegate delegate) {
         mUrlBarDelegate = delegate;
     }
 
     /**
      * Set {@link OmniboxLivenessListener} to be used for receiving interaction related messages
      * during startup.
@@ skipping 536 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);
         }
     }
 }