OLD | NEW |
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" |
11 android:layout_width="match_parent" | 12 android:layout_width="match_parent" |
12 android:layout_height="match_parent" | 13 android:layout_height="match_parent" |
13 android:orientation="vertical"> | 14 android:orientation="vertical"> |
14 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" | 15 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" |
15 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
16 android:layout_height="wrap_content" | 17 android:layout_height="wrap_content" |
17 android:orientation="vertical"> | 18 android:orientation="vertical"> |
18 <LinearLayout | 19 <LinearLayout |
19 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
20 android:layout_height="wrap_content" | 21 android:layout_height="wrap_content" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 <org.chromium.chrome.browser.widget.TintedImageButton | 56 <org.chromium.chrome.browser.widget.TintedImageButton |
56 android:id="@+id/menu_button" | 57 android:id="@+id/menu_button" |
57 android:layout_width="38dp" | 58 android:layout_width="38dp" |
58 android:layout_height="38dp" | 59 android:layout_height="38dp" |
59 android:src="@drawable/btn_menu" | 60 android:src="@drawable/btn_menu" |
60 android:background="?attr/selectableItemBackground" | 61 android:background="?attr/selectableItemBackground" |
61 android:scaleType="center"/> | 62 android:scaleType="center"/> |
62 </LinearLayout> | 63 </LinearLayout> |
63 <org.chromium.chrome.browser.widget.ToolbarProgressBar | 64 <org.chromium.chrome.browser.widget.ToolbarProgressBar |
64 android:id="@+id/progress" | 65 android:id="@+id/progress" |
65 style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal" | |
66 android:progressDrawable="@drawable/shell_progress_bar" | |
67 android:layout_width="match_parent" | 66 android:layout_width="match_parent" |
68 android:layout_height="2dp" | 67 android:layout_height="2dp" |
69 android:progress="0" /> | 68 chrome:progressBarColor="@color/material_deep_teal_500" |
| 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> |
OLD | NEW |