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

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

Issue 2222013004: Handle both plural and singular tab switcher content descriptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + add bug reference to comments Created 4 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
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 <!-- The toolbar containing the URL bar, back button, and NTP button. 6 <!-- The toolbar containing the URL bar, back button, and NTP button.
7 --> 7 -->
8 8
9 <org.chromium.chrome.browser.toolbar.ToolbarPhone 9 <org.chromium.chrome.browser.toolbar.ToolbarPhone
10 xmlns:android="http://schemas.android.com/apk/res/android" 10 xmlns:android="http://schemas.android.com/apk/res/android"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
50 android:layout_gravity="top|end" > 50 android:layout_gravity="top|end" >
51 51
52 <Space 52 <Space
53 android:layout_width="4dp" 53 android:layout_width="4dp"
54 android:layout_height="match_parent" /> 54 android:layout_height="match_parent" />
55 55
56 <ImageButton android:id="@+id/tab_switcher_button" 56 <ImageButton android:id="@+id/tab_switcher_button"
57 style="@style/ToolbarButton" 57 style="@style/ToolbarButton"
58 android:layout_gravity="top" 58 android:layout_gravity="top"
59 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle" /> 59 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle_default" />
60 60
61 <FrameLayout 61 <FrameLayout
62 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
63 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
64 android:id="@+id/menu_button_wrapper" > 64 android:id="@+id/menu_button_wrapper" >
65 65
66 <org.chromium.chrome.browser.widget.TintedImageButton 66 <org.chromium.chrome.browser.widget.TintedImageButton
67 android:id="@+id/menu_button" 67 android:id="@+id/menu_button"
68 style="@style/ToolbarMenuButtonPhone" 68 style="@style/ToolbarMenuButtonPhone"
69 android:src="@drawable/btn_menu" 69 android:src="@drawable/btn_menu"
(...skipping 10 matching lines...) Expand all
80 </LinearLayout> 80 </LinearLayout>
81 81
82 <org.chromium.chrome.browser.widget.ToolbarProgressBar 82 <org.chromium.chrome.browser.widget.ToolbarProgressBar
83 android:id="@+id/progress" 83 android:id="@+id/progress"
84 android:layout_width="match_parent" 84 android:layout_width="match_parent"
85 android:layout_height="@dimen/toolbar_progress_bar_height" 85 android:layout_height="@dimen/toolbar_progress_bar_height"
86 chrome:progressBarColor="@color/progress_bar_foreground" 86 chrome:progressBarColor="@color/progress_bar_foreground"
87 chrome:backgroundColor="@color/progress_bar_background" /> 87 chrome:backgroundColor="@color/progress_bar_background" />
88 88
89 </org.chromium.chrome.browser.toolbar.ToolbarPhone> 89 </org.chromium.chrome.browser.toolbar.ToolbarPhone>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698