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

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

Issue 1170843002: [Andorid] Migrate to ClipDrawable progress bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ChromeShell test fix 2 Created 5 years, 5 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"
11 xmlns:chrome="http://schemas.android.com/apk/res-auto"
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 14
14 <org.chromium.chrome.browser.widget.newtab.NewTabButton 15 <org.chromium.chrome.browser.widget.newtab.NewTabButton
15 android:id="@+id/new_tab_button" 16 android:id="@+id/new_tab_button"
16 style="@style/ToolbarButton" 17 style="@style/ToolbarButton"
17 android:layout_width="wrap_content" 18 android:layout_width="wrap_content"
18 android:layout_gravity="start|top" 19 android:layout_gravity="start|top"
19 android:paddingStart="16dp" 20 android:paddingStart="16dp"
20 android:paddingEnd="16dp" 21 android:paddingEnd="16dp"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 style="@style/ToolbarButton" 53 style="@style/ToolbarButton"
53 android:layout_gravity="top" 54 android:layout_gravity="top"
54 android:layout_width="42dp" 55 android:layout_width="42dp"
55 android:paddingEnd="4dp" 56 android:paddingEnd="4dp"
56 android:src="@drawable/btn_menu" 57 android:src="@drawable/btn_menu"
57 android:contentDescription="@string/accessibility_toolbar_btn_menu" 58 android:contentDescription="@string/accessibility_toolbar_btn_menu"
58 android:background="@null" /> 59 android:background="@null" />
59 </LinearLayout> 60 </LinearLayout>
60 <org.chromium.chrome.browser.widget.ToolbarProgressBar 61 <org.chromium.chrome.browser.widget.ToolbarProgressBar
61 android:id="@+id/progress" 62 android:id="@+id/progress"
62 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
63 android:progressDrawable="@drawable/progress_bar"
64 android:layout_width="match_parent" 63 android:layout_width="match_parent"
65 android:layout_height="2dp" 64 android:layout_height="2dp"
66 android:progress="0" /> 65 chrome:progressBarColor="@color/progress_bar_foreground"
66 chrome:backgroundColor="@color/progress_bar_background" />
67 </org.chromium.chrome.browser.toolbar.ToolbarPhone> 67 </org.chromium.chrome.browser.toolbar.ToolbarPhone>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/custom_tabs_toolbar.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698