Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(862)

Side by Side Diff: chrome/android/java/res/layout/custom_tabs_toolbar.xml

Issue 1263573011: Let client specify content description for custom action button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix corresponding test Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/android/support/customtabs/CustomTabsIntent.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar 6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" > 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" >
9 <ImageButton 9 <ImageButton
10 android:id="@+id/close_button" 10 android:id="@+id/close_button"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 style="@style/ToolbarButton" 61 style="@style/ToolbarButton"
62 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
63 android:maxWidth="@dimen/custom_tabs_toolbar_maxWidth" 63 android:maxWidth="@dimen/custom_tabs_toolbar_maxWidth"
64 android:paddingTop="@dimen/custom_tabs_toolbar_vertical_padding" 64 android:paddingTop="@dimen/custom_tabs_toolbar_vertical_padding"
65 android:paddingBottom="@dimen/custom_tabs_toolbar_vertical_padding" 65 android:paddingBottom="@dimen/custom_tabs_toolbar_vertical_padding"
66 android:adjustViewBounds="true" 66 android:adjustViewBounds="true"
67 android:scaleType="centerInside" 67 android:scaleType="centerInside"
68 android:layout_marginEnd="42dp" 68 android:layout_marginEnd="42dp"
69 android:layout_gravity="center_vertical|end" 69 android:layout_gravity="center_vertical|end"
70 android:visibility="gone" 70 android:visibility="gone"
71 android:contentDescription="@string/accessibility_toolbar_btn_custom" /> 71 android:contentDescription="@null" />
72 <org.chromium.chrome.browser.widget.TintedImageButton 72 <org.chromium.chrome.browser.widget.TintedImageButton
73 android:id="@+id/menu_button" 73 android:id="@+id/menu_button"
74 style="@style/ToolbarButton" 74 style="@style/ToolbarButton"
75 android:layout_gravity="center_vertical|end" 75 android:layout_gravity="center_vertical|end"
76 android:layout_width="42dp" 76 android:layout_width="42dp"
77 android:paddingEnd="4dp" 77 android:paddingEnd="4dp"
78 android:src="@drawable/btn_menu" 78 android:src="@drawable/btn_menu"
79 android:contentDescription="@string/accessibility_toolbar_btn_menu" 79 android:contentDescription="@string/accessibility_toolbar_btn_menu"
80 android:background="@null" /> 80 android:background="@null" />
81 <org.chromium.chrome.browser.widget.ToolbarProgressBar 81 <org.chromium.chrome.browser.widget.ToolbarProgressBar
82 android:id="@+id/progress" 82 android:id="@+id/progress"
83 android:layout_width="match_parent" 83 android:layout_width="match_parent"
84 android:layout_height="2dp" 84 android:layout_height="2dp"
85 chrome:progressBarColor="@color/progress_bar_foreground" 85 chrome:progressBarColor="@color/progress_bar_foreground"
86 chrome:backgroundColor="@color/progress_bar_background" /> 86 chrome:backgroundColor="@color/progress_bar_background" />
87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> 87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/android/support/customtabs/CustomTabsIntent.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698