Index: blimp/client/app/android/java/res/layout/blimp_main.xml |
diff --git a/blimp/client/app/android/java/res/layout/blimp_main.xml b/blimp/client/app/android/java/res/layout/blimp_main.xml |
deleted file mode 100644 |
index a5436c2f547e6f578053089f5f07bd0415ab6ef3..0000000000000000000000000000000000000000 |
--- a/blimp/client/app/android/java/res/layout/blimp_main.xml |
+++ /dev/null |
@@ -1,71 +0,0 @@ |
-<?xml version="1.0" encoding="utf-8"?> |
-<!-- Copyright 2015 The Chromium Authors. All rights reserved. |
- Use of this source code is governed by a BSD-style license that can be |
- found in the LICENSE file. --> |
- |
-<merge xmlns:android="http://schemas.android.com/apk/res/android"> |
- <RelativeLayout |
- android:id="@+id/container" |
- android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:orientation="vertical"> |
- <!-- Toolbar --> |
- <org.chromium.blimp.app.toolbar.Toolbar |
- android:id="@+id/toolbar" |
- android:layout_width="match_parent" |
- android:layout_height="56dp" |
- android:layout_alignParentTop="true" |
- android:layout_alignParentStart="true" |
- android:layout_alignParentEnd="true" |
- android:paddingStart="5dp" |
- android:orientation="horizontal" |
- android:gravity="center" |
- android:background="#f2f2f2"> |
- <org.chromium.blimp.app.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:selectAllOnFocus="true" |
- android:inputType="textUri" |
- android:background="@drawable/textbox" |
- android:textColor="#333" /> |
- <ProgressBar |
- android:id="@+id/page_load_progress" |
- android:visibility="invisible" |
- android:layout_marginStart="10dp" |
- android:layout_width="wrap_content" |
- android:layout_height="wrap_content" |
- style="@android:style/Widget.ProgressBar.Small" /> |
- <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" /> |
- <ImageButton |
- android:id="@+id/menu_button" |
- android:layout_width="wrap_content" |
- android:layout_height="48dp" |
- android:paddingEnd="4dp" |
- android:layout_gravity="center" |
- android:background="@null" |
- android:src="@drawable/btn_menu" /> |
- </org.chromium.blimp.app.toolbar.Toolbar> |
- |
- <!-- Content Area --> |
- <org.chromium.blimp.app.BlimpContentsDisplay |
- android:id="@+id/contents_display" |
- android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:layout_alignParentStart="true" |
- android:layout_alignParentEnd="true" |
- android:layout_alignParentBottom="true" |
- android:layout_below="@id/toolbar" /> |
- </RelativeLayout> |
-</merge> |