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

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

Issue 682883002: Introduce TintedImageButton class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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 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="horizontal"
18 android:background="@drawable/progress"> 18 android:background="@drawable/progress">
19 <ImageButton android:id="@+id/stop_reload_button" 19 <org.chromium.chrome.browser.widget.TintedImageButton
20 android:id="@+id/stop_reload_button"
20 android:layout_width="38dp" 21 android:layout_width="38dp"
21 android:layout_height="38dp" 22 android:layout_height="38dp"
22 android:src="@drawable/btn_stop_normal" 23 android:src="@drawable/btn_toolbar_stop_loading_white_normal"
23 android:scaleType="center" /> 24 android:background="?android:attr/selectableItemBackground"
25 android:scaleType="center"/>
24 <EditText android:id="@+id/url" 26 <EditText android:id="@+id/url"
25 android:layout_width="0dp" 27 android:layout_width="0dp"
26 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
27 android:layout_weight="1" 29 android:layout_weight="1"
28 android:gravity="bottom" 30 android:gravity="bottom"
29 android:textSize="18sp" 31 android:textSize="18sp"
30 android:autoText="true" 32 android:autoText="true"
31 android:capitalize="sentences" 33 android:capitalize="sentences"
32 android:singleLine="true" 34 android:singleLine="true"
33 android:selectAllOnFocus="true" 35 android:selectAllOnFocus="true"
34 android:hint="@string/url_hint" 36 android:hint="@string/url_hint"
35 android:inputType="textUri" 37 android:inputType="textUri"
36 android:imeOptions="actionGo|flagNoExtractUi" /> 38 android:imeOptions="actionGo|flagNoExtractUi" />
37 <ImageButton android:id="@+id/tab_switcher" 39 <org.chromium.chrome.browser.widget.TintedImageButton
40 android:id="@+id/tab_switcher"
38 android:layout_width="38dp" 41 android:layout_width="38dp"
39 android:layout_height="38dp" 42 android:layout_height="38dp"
40 android:src="@drawable/tab_switcher" 43 android:src="@drawable/btn_tabswitcher_white_normal"
41 android:background="?android:attr/selectableItemBackground" 44 android:background="?android:attr/selectableItemBackground"
42 android:scaleType="center" 45 android:scaleType="center"
43 android:contentDescription="@null" /> 46 android:contentDescription="@null"/>
44 <ImageButton android:id="@+id/menu_button" 47 <org.chromium.chrome.browser.widget.TintedImageButton
48 android:id="@+id/menu_button"
45 android:layout_width="38dp" 49 android:layout_width="38dp"
46 android:layout_height="38dp" 50 android:layout_height="38dp"
47 android:src="@drawable/btn_menu" 51 android:src="@drawable/btn_menu_white_normal"
48 android:background="?android:attr/selectableItemBackground" 52 android:background="?android:attr/selectableItemBackground"
49 android:scaleType="center" /> 53 android:scaleType="center"/>
50 </org.chromium.chrome.shell.ChromeShellToolbar> 54 </org.chromium.chrome.shell.ChromeShellToolbar>
51 <FrameLayout android:id="@+id/content_container" 55 <FrameLayout android:id="@+id/content_container"
52 android:layout_width="match_parent" 56 android:layout_width="match_parent"
53 android:layout_height="0dp" 57 android:layout_height="0dp"
54 android:layout_weight="1"> 58 android:layout_weight="1">
55 </FrameLayout> 59 </FrameLayout>
56 60
57 </org.chromium.chrome.shell.TabManager> 61 </org.chromium.chrome.shell.TabManager>
OLDNEW
« no previous file with comments | « chrome/android/shell/res/drawable/tab_switcher.png ('k') | chrome/android/shell/res/values-v17/styles.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698