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

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

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)
Patch Set: fix custom tabs 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
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.ToolbarTablet 9 <org.chromium.chrome.browser.toolbar.ToolbarTablet
10 xmlns:android="http://schemas.android.com/apk/res/android" 10 xmlns:android="http://schemas.android.com/apk/res/android"
11 android:id="@+id/toolbar"
11 android:layout_width="match_parent" 12 android:layout_width="match_parent"
12 android:layout_height="@dimen/toolbar_height_no_shadow" 13 android:layout_height="@dimen/toolbar_height_no_shadow"
13 android:layout_marginTop="@dimen/tab_strip_height" 14 android:layout_marginTop="@dimen/tab_strip_height"
14 android:background="@color/default_primary_color" 15 android:background="@color/default_primary_color"
15 android:paddingStart="@dimen/tablet_toolbar_start_padding" > 16 android:paddingStart="@dimen/tablet_toolbar_start_padding" >
16 17
17 <LinearLayout 18 <LinearLayout
18 android:layout_width="match_parent" 19 android:layout_width="match_parent"
19 android:layout_height="match_parent" 20 android:layout_height="match_parent"
20 android:orientation="horizontal" > 21 android:orientation="horizontal" >
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 android:id="@+id/menu_badge" 78 android:id="@+id/menu_badge"
78 style="@style/ToolbarMenuButtonTablet" 79 style="@style/ToolbarMenuButtonTablet"
79 android:src="@drawable/badge_update_dark" 80 android:src="@drawable/badge_update_dark"
80 android:contentDescription="@null" 81 android:contentDescription="@null"
81 android:importantForAccessibility="no" 82 android:importantForAccessibility="no"
82 android:visibility="invisible" /> 83 android:visibility="invisible" />
83 84
84 </FrameLayout> 85 </FrameLayout>
85 </LinearLayout> 86 </LinearLayout>
86 </org.chromium.chrome.browser.toolbar.ToolbarTablet> 87 </org.chromium.chrome.browser.toolbar.ToolbarTablet>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698