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

Side by Side Diff: chrome/android/shell/res/layout/chrome_shell_activity.xml

Issue 994753002: Revert of [Andorid] ClipDrawable progress bar experiment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add progress_bar.xml back which was removed in https://codereview.chromium.org/971223004 Created 5 years, 9 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
« no previous file with comments | « chrome/android/shell/res/drawable/progress_bar.xml ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 8
9 <org.chromium.chrome.shell.TabManager android:id="@+id/tab_manager" 9 <org.chromium.chrome.shell.TabManager android:id="@+id/tab_manager"
10 xmlns:android="http://schemas.android.com/apk/res/android" 10 xmlns:android="http://schemas.android.com/apk/res/android"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 android:scaleType="center" 53 android:scaleType="center"
54 android:contentDescription="@null"/> 54 android:contentDescription="@null"/>
55 <org.chromium.chrome.browser.widget.TintedImageButton 55 <org.chromium.chrome.browser.widget.TintedImageButton
56 android:id="@+id/menu_button" 56 android:id="@+id/menu_button"
57 android:layout_width="38dp" 57 android:layout_width="38dp"
58 android:layout_height="38dp" 58 android:layout_height="38dp"
59 android:src="@drawable/btn_menu" 59 android:src="@drawable/btn_menu"
60 android:background="?attr/selectableItemBackground" 60 android:background="?attr/selectableItemBackground"
61 android:scaleType="center"/> 61 android:scaleType="center"/>
62 </LinearLayout> 62 </LinearLayout>
63 <org.chromium.chrome.browser.widget.ClipDrawableProgressBar 63 <org.chromium.chrome.browser.widget.ToolbarProgressBar
64 android:id="@+id/progress" 64 android:id="@+id/progress"
65 style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
66 android:progressDrawable="@drawable/progress_bar"
65 android:layout_width="match_parent" 67 android:layout_width="match_parent"
66 android:layout_height="2dp" 68 android:layout_height="2dp"
67 android:src="@drawable/clip_drawable_progress_bar" /> 69 android:progress="0" />
68 </org.chromium.chrome.shell.ChromeShellToolbar> 70 </org.chromium.chrome.shell.ChromeShellToolbar>
69 <FrameLayout android:id="@+id/content_container" 71 <FrameLayout android:id="@+id/content_container"
70 android:layout_width="match_parent" 72 android:layout_width="match_parent"
71 android:layout_height="0dp" 73 android:layout_height="0dp"
72 android:layout_weight="1"> 74 android:layout_weight="1">
73 </FrameLayout> 75 </FrameLayout>
74 76
75 </org.chromium.chrome.shell.TabManager> 77 </org.chromium.chrome.shell.TabManager>
OLDNEW
« no previous file with comments | « chrome/android/shell/res/drawable/progress_bar.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698