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

Side by Side Diff: blimp/client/app/android/java/res/layout/blimp_main.xml

Issue 1841653005: Added menu button to blimp toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 4 years, 8 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 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> 6 <merge xmlns:android="http://schemas.android.com/apk/res/android">
7 <RelativeLayout 7 <RelativeLayout
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="match_parent" 9 android:layout_height="match_parent"
10 android:orientation="vertical"> 10 android:orientation="vertical">
(...skipping 27 matching lines...) Expand all
38 android:layout_width="wrap_content" 38 android:layout_width="wrap_content"
39 android:layout_height="wrap_content" 39 android:layout_height="wrap_content"
40 style="@android:style/Widget.ProgressBar.Small" /> 40 style="@android:style/Widget.ProgressBar.Small" />
41 <ImageButton 41 <ImageButton
42 android:id="@+id/toolbar_reload_btn" 42 android:id="@+id/toolbar_reload_btn"
43 android:layout_width="48dp" 43 android:layout_width="48dp"
44 android:layout_height="56dp" 44 android:layout_height="56dp"
45 android:background="?android:attr/selectableItemBackground" 45 android:background="?android:attr/selectableItemBackground"
46 android:scaleType="center" 46 android:scaleType="center"
47 android:src="@drawable/btn_reload" /> 47 android:src="@drawable/btn_reload" />
48 <ImageButton
49 android:id="@+id/menu_button"
50 android:layout_width="wrap_content"
51 android:layout_height="48dp"
52 android:paddingEnd="4dp"
53 android:layout_gravity="center"
54 android:background="@null"
55 android:src="@drawable/btn_menu" />
48 </org.chromium.blimp.toolbar.Toolbar> 56 </org.chromium.blimp.toolbar.Toolbar>
49 57
50 <!-- Content Area --> 58 <!-- Content Area -->
51 <org.chromium.blimp.BlimpView 59 <org.chromium.blimp.BlimpView
52 android:id="@+id/renderer" 60 android:id="@+id/renderer"
53 android:layout_width="match_parent" 61 android:layout_width="match_parent"
54 android:layout_height="match_parent" 62 android:layout_height="match_parent"
55 android:layout_below="@+id/toolbar"/> 63 android:layout_below="@+id/toolbar"/>
56 <org.chromium.blimp.input.WebInputBox 64 <org.chromium.blimp.input.WebInputBox
57 android:id="@+id/editText" 65 android:id="@+id/editText"
58 android:layout_width="match_parent" 66 android:layout_width="match_parent"
59 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
60 android:background="@drawable/web_input_background" 68 android:background="@drawable/web_input_background"
61 android:layout_alignParentBottom="true" 69 android:layout_alignParentBottom="true"
62 android:layout_marginTop="45dp" 70 android:layout_marginTop="45dp"
63 android:padding="10dp" 71 android:padding="10dp"
64 android:paddingTop="16dp" 72 android:paddingTop="16dp"
65 android:inputType="text|textWebEditText" 73 android:inputType="text|textWebEditText"
66 android:visibility="gone"/> 74 android:visibility="gone"/>
67 75
68 </RelativeLayout> 76 </RelativeLayout>
69 </merge> 77 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698