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

Unified Diff: blimp/client/android/java/res/layout/blimp_main.xml

Issue 1422363008: Add a basic UI to the Android Blimp client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made sure to clear old control data Created 5 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 side-by-side diff with in-line comments
Download patch
Index: blimp/client/android/java/res/layout/blimp_main.xml
diff --git a/blimp/client/android/java/res/layout/blimp_main.xml b/blimp/client/android/java/res/layout/blimp_main.xml
index bf5083cce195422be6ed1e2f5fd03a8d61b09d88..a019db258b7d390ab042f84afa901cd84147baba 100644
--- a/blimp/client/android/java/res/layout/blimp_main.xml
+++ b/blimp/client/android/java/res/layout/blimp_main.xml
@@ -4,8 +4,43 @@
found in the LICENSE file. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <org.chromium.blimp.BlimpView
- android:id="@+id/renderer"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <!-- Toolbar -->
+ <org.chromium.blimp.toolbar.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:paddingStart="5dp"
+ android:orientation="horizontal"
+ android:gravity="center"
+ android:background="#f2f2f2">
+ <org.chromium.blimp.toolbar.UrlBar
+ android:id="@+id/toolbar_url_bar"
+ android:layout_width="0dp"
+ android:layout_height="48dp"
+ android:layout_weight="1"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:singleLine="true"
+ android:maxLines="1"
+ android:background="@drawable/textbox"
+ android:textColor="#333" />
+ <ImageButton
+ android:id="@+id/toolbar_reload_btn"
+ android:layout_width="48dp"
+ android:layout_height="56dp"
+ android:background="?android:attr/selectableItemBackground"
+ android:scaleType="center"
+ android:src="@drawable/btn_reload" />
+ </org.chromium.blimp.toolbar.Toolbar>
+
+ <!-- Content Area -->
+ <org.chromium.blimp.BlimpView
+ android:id="@+id/renderer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </LinearLayout>
</merge>

Powered by Google App Engine
This is Rietveld 408576698