chrome/android/java/res/layout/custom_tabs_toolbar.xml - Issue 1170843002: [Andorid] Migrate to ClipDrawable progress bar.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/android/java/res/layout/custom_tabs_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

OLD	NEW
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 xmlns:android="http://sche mas.android.com/apk/res/android">	6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar

	7 xmlns:android="http://schemas.android.com/apk/res/android"

	8 xmlns:chrome="http://schemas.android.com/apk/res-auto" >

7 <org.chromium.chrome.browser.widget.TintedImageButton	9 <org.chromium.chrome.browser.widget.TintedImageButton

8 android:id="@+id/close_button"	10 android:id="@+id/close_button"

9 style="@style/ToolbarButton"	11 style="@style/ToolbarButton"

10 android:layout_gravity="start\|center_vertical"	12 android:layout_gravity="start\|center_vertical"

11 android:contentDescription="@string/close_tab" />	13 android:contentDescription="@string/close_tab" />

12 <FrameLayout	14 <FrameLayout

13 android:id="@+id/location_bar_frame_layout"	15 android:id="@+id/location_bar_frame_layout"

14 android:layout_width="match_parent"	16 android:layout_width="match_parent"

15 android:layout_height="wrap_content"	17 android:layout_height="wrap_content"

16 android:layout_gravity="center_vertical" >	18 android:layout_gravity="center_vertical" >

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 android:id="@+id/menu_button"	74 android:id="@+id/menu_button"

73 style="@style/ToolbarButton"	75 style="@style/ToolbarButton"

74 android:layout_gravity="center_vertical\|end"	76 android:layout_gravity="center_vertical\|end"

75 android:layout_width="42dp"	77 android:layout_width="42dp"

76 android:paddingEnd="4dp"	78 android:paddingEnd="4dp"

77 android:src="@drawable/btn_menu"	79 android:src="@drawable/btn_menu"

78 android:contentDescription="@string/accessibility_toolbar_btn_menu"	80 android:contentDescription="@string/accessibility_toolbar_btn_menu"

79 android:background="@null" />	81 android:background="@null" />

80 <org.chromium.chrome.browser.widget.ToolbarProgressBar	82 <org.chromium.chrome.browser.widget.ToolbarProgressBar

81 android:id="@+id/progress"	83 android:id="@+id/progress"

82 style="@style/Widget.AppCompat.ProgressBar.Horizontal"

83 android:progressDrawable="@drawable/progress_bar"

84 android:layout_width="match_parent"	84 android:layout_width="match_parent"

85 android:layout_height="2dp"	85 android:layout_height="2dp"

86 android:progress="0" />	86 chrome:progressBarColor="@color/progress_bar_foreground"

	87 chrome:backgroundColor="@color/progress_bar_background" />

87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>	88 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>

OLD	NEW

« no previous file with comments | « chrome/android/java/res/drawable/progress_bar_white.xml ('k') | chrome/android/java/res/layout/toolbar.xml » ('j') | no next file with comments »