Add RTL support to custom tabs toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index 3c6faf3308bf2353524a69d5e7c0a14fdab1b80f..402e2d15fb3c516082630270f9ff3ad55cce9c04 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -59,9 +59,11 @@ import org.chromium.ui.interpolators.BakedBezierInterpolator;
  */
 public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         View.OnLongClickListener {
+
     private static final int CUSTOM_TAB_TOOLBAR_SLIDE_DURATION_MS = 200;
     private static final int CUSTOM_TAB_TOOLBAR_FADE_DURATION_MS = 150;
-    private View mUrlInfoContainer;
+    private View mLocationBarFrameLayout;
+    private View mTitleUrlContainer;
     private UrlBar mUrlBar;
     private TextView mTitleBar;
     private ImageView mSecurityButton;
@@ -90,7 +92,8 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         mUrlBar.setEnabled(false);
         mUrlBar.setAllowFocus(false);
         mTitleBar = (TextView) findViewById(R.id.title_bar);
-        mUrlInfoContainer = findViewById(R.id.url_info_container);
+        mLocationBarFrameLayout = findViewById(R.id.url_info_container);

[Yusuf, 2015/07/09 17:30:42]

rename the id as well

[Ian Wen, 2015/07/09 18:09:48]

Done. Renamed other old names as well.

+        mTitleUrlContainer = findViewById(R.id.title_url_container);
         mSecurityButton = (ImageButton) findViewById(R.id.security_button);
         mSecurityIconType = ConnectionSecurityLevel.NONE;
         mCustomActionButton = (ImageButton) findViewById(R.id.action_button);
@@ -105,7 +108,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         int securityIconButtonWidth =
                 getResources().getDimensionPixelSize(R.dimen.location_bar_icon_width);
         Animator urlInfoContainerTranslateAnimator =
-                ObjectAnimator.ofFloat(mUrlInfoContainer, TRANSLATION_X, securityIconButtonWidth);
+                ObjectAnimator.ofFloat(mTitleUrlContainer, TRANSLATION_X, securityIconButtonWidth);
         urlInfoContainerTranslateAnimator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         urlInfoContainerTranslateAnimator.setDuration(CUSTOM_TAB_TOOLBAR_SLIDE_DURATION_MS);
 
@@ -116,7 +119,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
             @Override
             public void onAnimationStart(Animator animation) {
                 mSecurityButton.setVisibility(VISIBLE);
-                mUrlInfoContainer.setTranslationX(0);
+                mTitleUrlContainer.setTranslationX(0);
             }
         });
 
@@ -416,7 +419,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
                     ApiCompatibilityUtils.setMarginStart(childLayoutParams, startMargin);
                     childView.setLayoutParams(childLayoutParams);
                 }
-                if (childView == mUrlInfoContainer) {
+                if (childView == mLocationBarFrameLayout) {
                     urlInfoContainerChildIndex = i;
                     break;
                 }
@@ -455,12 +458,18 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
                 urlInfoContainerMarginEnd += childView.getMeasuredWidth();
             }
         }
-        LayoutParams urlLayoutParams = (LayoutParams) mUrlInfoContainer.getLayoutParams();
+        LayoutParams urlLayoutParams = (LayoutParams) mLocationBarFrameLayout.getLayoutParams();
 
         if (ApiCompatibilityUtils.getMarginEnd(urlLayoutParams) != urlInfoContainerMarginEnd) {
             ApiCompatibilityUtils.setMarginEnd(urlLayoutParams, urlInfoContainerMarginEnd);
-            mUrlInfoContainer.setLayoutParams(urlLayoutParams);
+            mLocationBarFrameLayout.setLayoutParams(urlLayoutParams);
         }
+
+        // Set left margin of mTitleUrlContainer here to make sure the security icon is always
+        // placed left of the urlbar.
+        LayoutParams lp = (LayoutParams) mTitleUrlContainer.getLayoutParams();
+        lp.leftMargin = mSecurityButton.getMeasuredWidth();
+        mTitleUrlContainer.setLayoutParams(lp);
     }
 
     @Override