summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Wen <ianwen@chromium.org>2015-08-25 20:01:23 -0700
committerIan Wen <ianwen@chromium.org>2015-08-26 03:02:17 +0000
commit56ade2b615bf81e4513da17a86d04dcfc6de3e78 (patch)
tree939e5e9e673d21196b0fdfe2fea2c071e8698d22
parentac06b48747cb3ff669f042187d1f4844ea33c8d3 (diff)
downloadchromium_src-56ade2b615bf81e4513da17a86d04dcfc6de3e78.zip
chromium_src-56ade2b615bf81e4513da17a86d04dcfc6de3e78.tar.gz
chromium_src-56ade2b615bf81e4513da17a86d04dcfc6de3e78.tar.bz2
[Custom Tabs]Fix a bug that https is not shown properly
In android SDK M, android:maxLines no longer works with setSelection. If selection is set to the end, TextView will squeeze the first part to a previous line. This CL changes the urlbar in Custom Tab to use singleLine. BUG=524672 Review URL: https://codereview.chromium.org/1320493003 Cr-Commit-Position: refs/heads/master@{#345530} TBR=yusufo@chromium.org Review URL: https://codereview.chromium.org/1305353005 . Cr-Commit-Position: refs/branch-heads/2454@{#425} Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390}
-rw-r--r--chrome/android/java/res/layout/custom_tabs_toolbar.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
index e0abfc8..2aa08fb 100644
--- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml
+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
@@ -50,7 +50,7 @@
android:layout_gravity="bottom"
android:background="@null"
android:inputType="none"
- android:maxLines="1"
+ android:singleLine="true"
android:paddingEnd="@dimen/toolbar_edge_padding"
android:textSize="@dimen/location_bar_url_text_size" />
</FrameLayout>