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

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

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)
Patch Set: fix ID Created 4 years, 2 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
(Empty)
1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. -->
5
6 <!-- The toolbar containing the URL bar, back button, and NTP button.
7 -->
8 <merge xmlns:android="http://schemas.android.com/apk/res/android"
9 xmlns:chrome="http://schemas.android.com/apk/res-auto">
10
11 <org.chromium.chrome.browser.widget.newtab.NewTabButton
12 android:id="@+id/new_tab_button"
13 style="@style/ToolbarButton"
14 android:layout_width="wrap_content"
15 android:layout_gravity="start|top"
16 android:paddingStart="16dp"
17 android:paddingEnd="16dp"
18 android:visibility="invisible"
19 android:background="?attr/selectableItemBackground"
20 android:contentDescription="@string/accessibility_toolbar_btn_new_tab" / >
21
22 <org.chromium.chrome.browser.toolbar.HomePageButton
23 android:id="@+id/home_button"
24 style="@style/ToolbarButton"
25 android:src="@drawable/btn_toolbar_home"
26 android:contentDescription="@string/accessibility_toolbar_btn_home"
27 android:visibility="gone" />
28
29 <org.chromium.chrome.browser.omnibox.LocationBarPhone
30 android:id="@+id/location_bar"
31 android:layout_width="match_parent"
32 android:layout_height="match_parent"
33 android:layout_gravity="top" />
34
35 <LinearLayout android:id="@+id/toolbar_buttons"
36 android:orientation="horizontal"
37 android:layout_width="wrap_content"
38 android:layout_height="wrap_content"
39 android:layout_gravity="top|end" >
40
41 <Space
42 android:layout_width="4dp"
43 android:layout_height="match_parent" />
44
45 <ImageButton android:id="@+id/tab_switcher_button"
46 style="@style/ToolbarButton"
47 android:layout_gravity="top"
48 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle_default" />
49
50 <FrameLayout
51 android:layout_width="wrap_content"
52 android:layout_height="wrap_content"
53 android:id="@+id/menu_button_wrapper" >
54
55 <org.chromium.chrome.browser.widget.TintedImageButton
56 android:id="@+id/menu_button"
57 style="@style/ToolbarMenuButtonPhone"
58 android:src="@drawable/btn_menu"
59 android:contentDescription="@string/accessibility_toolbar_btn_me nu" />
60
61 <ImageView
62 android:id="@+id/menu_badge"
63 style="@style/ToolbarMenuButtonPhone"
64 android:src="@drawable/badge_update_dark"
65 android:contentDescription="@null"
66 android:importantForAccessibility="no"
67 android:visibility="invisible" />
68 </FrameLayout>
69 </LinearLayout>
70
71 <org.chromium.chrome.browser.widget.ToolbarProgressBar
72 android:id="@+id/progress"
73 android:layout_width="match_parent"
74 android:layout_height="@dimen/toolbar_progress_bar_height"
75 chrome:progressBarColor="@color/progress_bar_foreground"
76 chrome:backgroundColor="@color/progress_bar_background" />
77
78 </merge>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/toolbar.xml ('k') | chrome/android/java/res/layout/toolbar_phone.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698