Combine source & prebuilt to single project

Todo: Makefile logic

1 files changed, 137 insertions, 0 deletions

diff --git a/src/res/layout/title_bar_nav.xml b/src/res/layout/title_bar_nav.xml
new file mode 100644
index 00000000..b5f865b9
--- /dev/null
+++ b/src/res/layout/title_bar_nav.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright 2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<com.android.browser.NavigationBarPhone xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/primary"
+    android:orientation="horizontal"
+    android:elevation="8dp">
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0"
+        android:gravity="center_vertical"
+        android:paddingStart="4dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/incognito_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginStart="8dp"
+            android:src="@drawable/ic_deco_incognito_normal"
+            android:visibility="gone" />
+
+        <com.android.browser.SiteTileView
+            android:id="@+id/favicon_view"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:contentDescription="@string/page_info"/>
+
+        <!-- Cosmetic separator -->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="42dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:paddingEnd="2dp"
+            android:background="#55FAFAFA" />
+
+
+        <ImageView
+            android:id="@+id/stop"
+            style="@style/NavButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/accessibility_button_stop"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:visibility="gone"
+            android:src="@drawable/ic_action_stop_normal_inverted" />
+
+        <com.android.browser.UrlInputView
+            android:id="@+id/url"
+            style="@style/Suggestions"
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0"
+            android:background="@null"
+            android:ellipsize="end"
+            android:fadingEdge="horizontal"
+            android:fadingEdgeLength="24dip"
+            android:focusable="true"
+            android:hint="@string/search_hint"
+            android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+            android:theme="@style/Widget.UrlInputView"
+            android:inputType="textUri"
+            android:lines="1"
+            android:paddingStart="4dp"
+            android:paddingEnd="6dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:fontFamily="sans-serif-condensed"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <ImageView
+            android:id="@+id/voice"
+            style="@style/NavButton"
+            android:layout_width="wrap_content"
+            android:contentDescription="@string/accessibility_button_voice"
+            android:src="@drawable/ic_action_microphone_normal"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/clear"
+            style="@style/NavButton"
+            android:layout_width="wrap_content"
+            android:contentDescription="@string/accessibility_button_clear"
+            android:src="@drawable/ic_action_stop"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_height="match_parent"
+        android:layout_width="wrap_content">
+
+        <ImageButton
+            android:id="@+id/tab_switcher"
+            style="@style/NavButton"
+            android:layout_width="wrap_content"
+            android:contentDescription="@string/accessibility_button_navscreen"
+            android:src="@drawable/ic_action_tabswitcher" />
+
+        <TextView
+            android:id="@+id/tab_switcher_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:clickable="false"
+            android:paddingBottom="1dp"
+            android:paddingEnd="1dp"
+            android:textColor="@color/white"
+            android:textSize="13dp"
+            android:textStyle="bold" />
+    </FrameLayout>
+
+    <ImageButton
+        android:id="@+id/more_browser_settings"
+        style="@style/OverflowButtonInverted" />
+</com.android.browser.NavigationBarPhone>