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

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

Issue 1249793003: Revert of [Andorid] Migrate to ClipDrawable progress bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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"
11 xmlns:chrome="http://schemas.android.com/apk/res-auto"
12 android:layout_width="match_parent" 11 android:layout_width="match_parent"
13 android:layout_height="match_parent" 12 android:layout_height="match_parent"
14 android:orientation="vertical"> 13 android:orientation="vertical">
15 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" 14 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar"
16 android:layout_width="match_parent" 15 android:layout_width="match_parent"
17 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
18 android:orientation="vertical"> 17 android:orientation="vertical">
19 <LinearLayout 18 <LinearLayout
20 android:layout_width="match_parent" 19 android:layout_width="match_parent"
21 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 <org.chromium.chrome.browser.widget.TintedImageButton 55 <org.chromium.chrome.browser.widget.TintedImageButton
57 android:id="@+id/menu_button" 56 android:id="@+id/menu_button"
58 android:layout_width="38dp" 57 android:layout_width="38dp"
59 android:layout_height="38dp" 58 android:layout_height="38dp"
60 android:src="@drawable/btn_menu" 59 android:src="@drawable/btn_menu"
61 android:background="?attr/selectableItemBackground" 60 android:background="?attr/selectableItemBackground"
62 android:scaleType="center"/> 61 android:scaleType="center"/>
63 </LinearLayout> 62 </LinearLayout>
64 <org.chromium.chrome.browser.widget.ToolbarProgressBar 63 <org.chromium.chrome.browser.widget.ToolbarProgressBar
65 android:id="@+id/progress" 64 android:id="@+id/progress"
65 style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
66 android:progressDrawable="@drawable/shell_progress_bar"
66 android:layout_width="match_parent" 67 android:layout_width="match_parent"
67 android:layout_height="2dp" 68 android:layout_height="2dp"
68 chrome:progressBarColor="@color/material_deep_teal_500" 69 android:progress="0" />
69 chrome:backgroundColor="@android:color/transparent" />
70 </org.chromium.chrome.shell.ChromeShellToolbar> 70 </org.chromium.chrome.shell.ChromeShellToolbar>
71 <FrameLayout android:id="@+id/content_container" 71 <FrameLayout android:id="@+id/content_container"
72 android:layout_width="match_parent" 72 android:layout_width="match_parent"
73 android:layout_height="0dp" 73 android:layout_height="0dp"
74 android:layout_weight="1"> 74 android:layout_weight="1">
75 </FrameLayout> 75 </FrameLayout>
76 76
77 </org.chromium.chrome.shell.TabManager> 77 </org.chromium.chrome.shell.TabManager>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698