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

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

Issue 546383002: Follow up CL for issue:541713002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 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" 19 <ImageButton android:id="@+id/stop_reload_button"
20 android:layout_width="38dp" 20 android:layout_width="38dp"
21 android:layout_height="38dp" 21 android:layout_height="38dp"
22 android:src="@android:drawable/ic_menu_close_clear_cancel" 22 android:src="@drawable/btn_stop_normal"
Bernhard Bauer 2014/09/08 07:58:42 I'd rather initialize this with the reload button,
ankit 2014/09/08 08:53:14 If initialized with reload button, on app launch t
Bernhard Bauer 2014/09/08 09:04:53 Okay... in that case, can we initialize |mLoading|
23 android:scaleType="center" /> 23 android:scaleType="center" />
24 <ImageButton android:id="@+id/reload"
25 android:layout_width="38dp"
26 android:layout_height="38dp"
27 android:src="@drawable/btn_reload_normal"
28 android:scaleType="center"
29 android:visibility="gone" />
30 <EditText android:id="@+id/url" 24 <EditText android:id="@+id/url"
31 android:layout_width="0dp" 25 android:layout_width="0dp"
32 android:layout_height="wrap_content" 26 android:layout_height="wrap_content"
33 android:layout_weight="1" 27 android:layout_weight="1"
34 android:gravity="bottom" 28 android:gravity="bottom"
35 android:textSize="18sp" 29 android:textSize="18sp"
36 android:autoText="true" 30 android:autoText="true"
37 android:capitalize="sentences" 31 android:capitalize="sentences"
38 android:singleLine="true" 32 android:singleLine="true"
39 android:selectAllOnFocus="true" 33 android:selectAllOnFocus="true"
40 android:hint="@string/url_hint" 34 android:hint="@string/url_hint"
41 android:inputType="textUri" 35 android:inputType="textUri"
42 android:imeOptions="actionGo|flagNoExtractUi" /> 36 android:imeOptions="actionGo|flagNoExtractUi" />
43 <ImageButton android:id="@+id/menu_button" 37 <ImageButton android:id="@+id/menu_button"
44 android:layout_width="38dp" 38 android:layout_width="38dp"
45 android:layout_height="38dp" 39 android:layout_height="38dp"
46 android:src="@drawable/btn_menu" 40 android:src="@drawable/btn_menu"
47 android:background="?android:attr/selectableItemBackground" 41 android:background="?android:attr/selectableItemBackground"
48 android:scaleType="center" /> 42 android:scaleType="center" />
49 </org.chromium.chrome.shell.ChromeShellToolbar> 43 </org.chromium.chrome.shell.ChromeShellToolbar>
50 <FrameLayout android:id="@+id/content_container" 44 <FrameLayout android:id="@+id/content_container"
51 android:layout_width="match_parent" 45 android:layout_width="match_parent"
52 android:layout_height="0dp" 46 android:layout_height="0dp"
53 android:layout_weight="1"> 47 android:layout_weight="1">
54 </FrameLayout> 48 </FrameLayout>
55 49
56 </org.chromium.chrome.shell.TabManager> 50 </org.chromium.chrome.shell.TabManager>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698