chrome/android/java/res/layout/custom_tabs_toolbar.xml - Issue 1226183002: Add RTL support to custom tabs toolbar

Unified Diff: chrome/android/java/res/layout/custom_tabs_toolbar.xml

Issue 1226183002: Add RTL support to custom tabs toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@toolbar_ui_fix

Patch Set: nits Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/res/layout/custom_tabs_toolbar.xml

diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml

index e8ccd1e34b418fdc529b24955741f0b98d073d1c..432497ea6a093ae4e915f03b42fb272460ab065d 100644

--- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml

+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml

@@ -7,48 +7,54 @@

<org.chromium.chrome.browser.widget.TintedImageButton

android:id="@+id/close_button"

style="@style/ToolbarButton"

- android:layout_gravity="center_vertical"

+ android:layout_gravity="start|center_vertical"

android:contentDescription="@string/close_tab" />

- <ImageButton android:id="@+id/security_button"

- style="@style/LocationBarButton"

- android:layout_width="@dimen/location_bar_icon_width"

- android:layout_height="match_parent"

- android:layout_marginStart="48dp"

- android:scaleType="center"

- android:layout_gravity="center_vertical"

- android:alpha="0"

- android:visibility="gone"

- android:contentDescription="@string/accessibility_toolbar_btn_site_info" />

- <FrameLayout

+ <view class="org.chromium.chrome.browser.toolbar.CustomTabToolbar$UrlInfoLayout"

android:id="@+id/url_info_container"

- android:background="@null"

- android:layout_width="wrap_content"

+ android:layout_width="match_parent"

Yusuf 2015/07/09 00:22:19 the need for this confuses me. What happens when y

Ian Wen 2015/07/09 01:19:32 With or without it does not seem to affect anythin

android:layout_height="wrap_content"

android:layout_gravity="center_vertical" >

- <TextView

- android:id="@+id/title_bar"

- android:background="@null"

- android:layout_width="wrap_content"

- android:layout_height="wrap_content"

- android:layout_marginBottom="16dp"

- android:layout_gravity="top"

- android:maxLines="1"

- android:ellipsize="end"

- android:paddingEnd="@dimen/toolbar_edge_padding"

- android:textSize="@dimen/custom_tabs_title_text_size"

- android:inputType="none"

+ <ImageButton

+ android:id="@+id/security_button"

+ style="@style/LocationBarButton"

+ android:layout_width="@dimen/location_bar_icon_width"

+ android:layout_height="match_parent"

+ android:layout_gravity="center_vertical"

+ android:alpha="0"

+ android:contentDescription="@string/accessibility_toolbar_btn_site_info"

+ android:scaleType="center"

android:visibility="gone" />

- <org.chromium.chrome.browser.omnibox.UrlBar

- android:id="@+id/url_bar"

- android:background="@null"

- android:layout_width="wrap_content"

+ <FrameLayout

+ android:id="@+id/title_url_container"

+ android:layout_width="match_parent"

android:layout_height="wrap_content"

- android:layout_gravity ="bottom"

- android:maxLines="1"

- android:paddingEnd="@dimen/toolbar_edge_padding"

- android:textSize="@dimen/location_bar_url_text_size"

- android:inputType="none" />

- </FrameLayout>

+ android:layout_gravity="center_vertical"

+ android:background="@null" >

+ <TextView

+ android:id="@+id/title_bar"

+ android:layout_width="wrap_content"

+ android:layout_height="wrap_content"

+ android:layout_gravity="top"

+ android:layout_marginBottom="16dp"

+ android:background="@null"

+ android:ellipsize="end"

+ android:inputType="none"

+ android:maxLines="1"

+ android:paddingEnd="@dimen/toolbar_edge_padding"

+ android:textSize="@dimen/custom_tabs_title_text_size"

+ android:visibility="gone" />

+ <org.chromium.chrome.browser.omnibox.UrlBar

+ android:id="@+id/url_bar"

+ android:layout_width="wrap_content"

+ android:layout_height="wrap_content"

+ android:layout_gravity="bottom"

+ android:background="@null"

+ android:inputType="none"

+ android:maxLines="1"

+ android:paddingEnd="@dimen/toolbar_edge_padding"

+ android:textSize="@dimen/location_bar_url_text_size" />

+ </FrameLayout>

+ </view>

<ImageButton

android:id="@+id/action_button"

style="@style/ToolbarButton"