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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 898483006: Upstream SmoothProgressBar and ToolbarProgressBar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 10 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"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="match_parent" 12 android:layout_height="match_parent"
13 android:orientation="vertical"> 13 android:orientation="vertical">
14 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" 14 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar"
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
17 android:orientation="horizontal" 17 android:orientation="vertical">
18 android:background="@drawable/progress"> 18 <LinearLayout
19 <org.chromium.chrome.browser.widget.TintedImageButton 19 android:layout_width="match_parent"
20 android:id="@+id/add_button"
21 android:layout_width="38dp"
22 android:layout_height="38dp"
23 android:src="@android:drawable/ic_menu_add"
24 android:visibility="gone"
25 android:scaleType="center"/>
26 <org.chromium.chrome.browser.widget.TintedImageButton
27 android:id="@+id/stop_reload_button"
28 android:layout_width="38dp"
29 android:layout_height="38dp"
30 android:src="@drawable/btn_close"
31 android:background="?attr/selectableItemBackground"
32 android:scaleType="center"/>
33 <EditText android:id="@+id/url"
34 android:layout_width="0dp"
35 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
36 android:layout_weight="1" 21 android:orientation="horizontal">
37 android:gravity="bottom" 22 <org.chromium.chrome.browser.widget.TintedImageButton
38 android:textSize="18sp" 23 android:id="@+id/add_button"
39 android:autoText="true" 24 android:layout_width="38dp"
40 android:capitalize="sentences" 25 android:layout_height="38dp"
41 android:singleLine="true" 26 android:src="@android:drawable/ic_menu_add"
42 android:selectAllOnFocus="true" 27 android:visibility="gone"
43 android:hint="@string/url_hint" 28 android:scaleType="center"/>
44 android:inputType="textUri" 29 <org.chromium.chrome.browser.widget.TintedImageButton
45 android:imeOptions="actionGo|flagNoExtractUi" /> 30 android:id="@+id/stop_reload_button"
46 <org.chromium.chrome.browser.widget.TintedImageButton 31 android:layout_width="38dp"
47 android:id="@+id/tab_switcher" 32 android:layout_height="38dp"
48 android:layout_width="38dp" 33 android:src="@drawable/btn_close"
49 android:layout_height="38dp" 34 android:background="?attr/selectableItemBackground"
50 android:src="@drawable/btn_tabswitcher" 35 android:scaleType="center"/>
51 android:background="?attr/selectableItemBackground" 36 <EditText android:id="@+id/url"
52 android:scaleType="center" 37 android:layout_width="0dp"
53 android:contentDescription="@null"/> 38 android:layout_height="wrap_content"
54 <org.chromium.chrome.browser.widget.TintedImageButton 39 android:layout_weight="1"
55 android:id="@+id/menu_button" 40 android:gravity="bottom"
56 android:layout_width="38dp" 41 android:textSize="18sp"
57 android:layout_height="38dp" 42 android:autoText="true"
58 android:src="@drawable/btn_menu" 43 android:capitalize="sentences"
59 android:background="?attr/selectableItemBackground" 44 android:singleLine="true"
60 android:scaleType="center"/> 45 android:selectAllOnFocus="true"
46 android:hint="@string/url_hint"
47 android:inputType="textUri"
48 android:imeOptions="actionGo|flagNoExtractUi" />
49 <org.chromium.chrome.browser.widget.TintedImageButton
50 android:id="@+id/tab_switcher"
51 android:layout_width="38dp"
52 android:layout_height="38dp"
53 android:src="@drawable/btn_tabswitcher"
54 android:background="?attr/selectableItemBackground"
55 android:scaleType="center"
56 android:contentDescription="@null"/>
57 <org.chromium.chrome.browser.widget.TintedImageButton
58 android:id="@+id/menu_button"
59 android:layout_width="38dp"
60 android:layout_height="38dp"
61 android:src="@drawable/btn_menu"
62 android:background="?attr/selectableItemBackground"
63 android:scaleType="center"/>
64 </LinearLayout>
65 <org.chromium.chrome.browser.widget.ToolbarProgressBar
66 android:id="@+id/progress"
67 style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
68 android:progressDrawable="@drawable/progress_bar"
69 android:layout_width="match_parent"
70 android:layout_height="2dp"
71 android:progress="0" />
61 </org.chromium.chrome.shell.ChromeShellToolbar> 72 </org.chromium.chrome.shell.ChromeShellToolbar>
62 <FrameLayout android:id="@+id/content_container" 73 <FrameLayout android:id="@+id/content_container"
63 android:layout_width="match_parent" 74 android:layout_width="match_parent"
64 android:layout_height="0dp" 75 android:layout_height="0dp"
65 android:layout_weight="1"> 76 android:layout_weight="1">
66 </FrameLayout> 77 </FrameLayout>
67 78
68 </org.chromium.chrome.shell.TabManager> 79 </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