TitleBar refactor
Change-Id: I0a2df041529143c8e0ff17af341376a3f827be04
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 7ac2ba0..589debc 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/ic_snapshot"
+ android:src="@drawable/ic_search_category_history"
android:visibility="gone" />
<ImageView
android:id="@+id/favicon"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 7789bfc..21b5b2e 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -19,156 +19,25 @@
android:id="@+id/titlebar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <LinearLayout
+ <include
+ layout="@layout/title_bar_nav"
android:id="@+id/taburlbar"
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
- <LinearLayout
- android:id="@+id/title_bg"
- android:layout_width="0dip"
- android:layout_weight="1.0"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
- <FrameLayout
- android:id="@+id/iconcombo"
- android:layout_width="52dip"
- android:layout_height="match_parent"
- style="@style/HoloButton">
- <ImageView
- android:id="@+id/favicon"
- android:layout_width="36dip"
- android:layout_height="36dip"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- android:layout_gravity="center_vertical" />
- <ImageView
- android:id="@+id/lock"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|right"
- android:visibility="gone" />
- </FrameLayout>
- <ImageView
- android:id="@+id/stop"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:src="@drawable/ic_stop_holo_dark"
- style="@style/HoloButton" />
- <com.android.browser.UrlInputView
- android:id="@+id/url"
- android:focusable="true"
- android:layout_width="0dip"
- android:layout_weight="1.0"
- android:layout_height="match_parent"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="24dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:hint="@string/search_hint"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
- android:scrollHorizontally="true"
- android:inputType="text"
- android:imeOptions="actionGo"
- style="@style/Suggestions"
- android:background="@null" />
- <ImageView
- android:id="@+id/voice"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_voice_search_holo_dark"
- style="@style/HoloButton"
- android:visibility="gone" />
- </LinearLayout>
- <ImageButton
- android:id="@+id/tab_switcher"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_windows_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
- </LinearLayout>
- <LinearLayout
+ android:layout_height="@dimen/toolbar_height" />
+ <include
+ layout="@layout/title_bar_autologin"
android:id="@+id/autologin"
- android:background="#FBF0A0"
- android:gravity="center_vertical"
android:paddingTop="3dip"
- android:visibility="gone"
- android:layout_below="@+id/taburlbar"
+ android:layout_below="@id/taburlbar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="8dip"
- android:paddingRight="8dip">
- <TextView
- android:text="@string/autologin_bar_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/primary_text_light"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- <Spinner
- android:id="@+id/autologin_account"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:paddingLeft="8dp"
- android:paddingRight="24dp"
- style="@android:style/Widget.Holo.Light.Spinner" />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="8dip"
- android:paddingRight="8dip">
- <Button
- android:id="@+id/autologin_close"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="@string/autologin_bar_hide_text"
- style="@android:style/Widget.Holo.Light.Button" />
- <ProgressBar
- android:id="@+id/autologin_progress"
- android:indeterminateOnly="true"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:visibility="invisible" />
- <Button
- android:id="@+id/autologin_login"
- android:text="@string/autologin_bar_login_text"
- style="@android:style/Widget.Holo.Light.Button"
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1" />
- </LinearLayout>
- <TextView
- android:id="@+id/autologin_error"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textColor="#dd6826"
- android:text="@string/autologin_bar_error"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:visibility="gone" />
- </LinearLayout>
+ android:layout_height="wrap_content" />
<com.android.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_below="@+id/taburlbar"
+ android:layout_below="@id/taburlbar"
android:src="@drawable/progress"
- android:layout_marginTop="-8dip"
+ android:layout_marginTop="@dimen/progress_bar_margin"
android:visibility="gone" />
</RelativeLayout>
diff --git a/res/layout/title_bar_autologin.xml b/res/layout/title_bar_autologin.xml
new file mode 100644
index 0000000..839f875
--- /dev/null
+++ b/res/layout/title_bar_autologin.xml
@@ -0,0 +1,76 @@
+<?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.AutologinBar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="#FBF0A0"
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ android:orientation="vertical">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip">
+ <TextView
+ android:text="@string/autologin_bar_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/primary_text_light"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ <Spinner
+ android:id="@+id/autologin_account"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:paddingLeft="8dp"
+ android:paddingRight="24dp"
+ style="@android:style/Widget.Holo.Light.Spinner" />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip">
+ <Button
+ android:id="@+id/autologin_close"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="@string/autologin_bar_hide_text"
+ style="@android:style/Widget.Holo.Light.Button" />
+ <ProgressBar
+ android:id="@+id/autologin_progress"
+ android:indeterminateOnly="true"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:visibility="invisible" />
+ <Button
+ android:id="@+id/autologin_login"
+ android:text="@string/autologin_bar_login_text"
+ style="@android:style/Widget.Holo.Light.Button"
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1" />
+ </LinearLayout>
+ <TextView
+ android:id="@+id/autologin_error"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="#dd6826"
+ android:text="@string/autologin_bar_error"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:visibility="gone" />
+</com.android.browser.AutologinBar>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
new file mode 100644
index 0000000..5a3c10e
--- /dev/null
+++ b/res/layout/title_bar_nav.xml
@@ -0,0 +1,93 @@
+<?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:orientation="horizontal"
+ android:background="@drawable/bg_urlbar">
+ <LinearLayout
+ android:id="@+id/title_bg"
+ android:layout_width="0dip"
+ android:layout_weight="1.0"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+ <FrameLayout
+ android:id="@+id/iconcombo"
+ android:layout_width="52dip"
+ android:layout_height="match_parent"
+ style="@style/HoloButton">
+ <ImageView
+ android:id="@+id/favicon"
+ android:layout_width="36dip"
+ android:layout_height="36dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:layout_gravity="center_vertical" />
+ <ImageView
+ android:id="@+id/lock"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:visibility="gone" />
+ </FrameLayout>
+ <ImageView
+ android:id="@+id/stop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_stop_holo_dark"
+ style="@style/HoloButton" />
+ <com.android.browser.UrlInputView
+ android:id="@+id/url"
+ android:focusable="true"
+ android:layout_width="0dip"
+ android:layout_weight="1.0"
+ android:layout_height="match_parent"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="24dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:hint="@string/search_hint"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:lines="1"
+ android:scrollHorizontally="true"
+ android:inputType="text"
+ android:imeOptions="actionGo"
+ style="@style/Suggestions"
+ android:background="@null" />
+ <ImageView
+ android:id="@+id/voice"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_voice_search_holo_dark"
+ style="@style/HoloButton"
+ android:visibility="gone" />
+ </LinearLayout>
+ <ImageButton
+ android:id="@+id/tab_switcher"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_windows_holo_dark"
+ style="@style/HoloButton" />
+ <ImageButton
+ android:id="@+id/more"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ style="@style/HoloButton"
+ android:gravity="center_vertical"
+ android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
+</com.android.browser.NavigationBarPhone>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
deleted file mode 100644
index 3864b7d..0000000
--- a/res/layout/url_bar.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <!--
- Copyright 2010, 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.
- -->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <LinearLayout
- android:id="@+id/autologin"
- android:background="#FBF0A0"
- android:gravity="center_vertical"
- android:paddingTop="3dip"
- android:visibility="gone"
- android:layout_below="@+id/taburlbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView
- android:text="@string/autologin_bar_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/primary_text_light"
- android:paddingLeft="15dip"
- android:paddingRight="15dip"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
- <Spinner
- android:id="@+id/autologin_account"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- style="@android:style/Widget.Holo.Light.Spinner" />
- <Button
- android:id="@+id/autologin_login"
- android:text="@string/autologin_bar_login_text"
- style="@android:style/Widget.Holo.Light.Button"
- android:layout_marginRight="15dip"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content" />
- <ProgressBar
- android:id="@+id/autologin_progress"
- android:indeterminateOnly="true"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:visibility="gone" />
- <TextView
- android:id="@+id/autologin_error"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textColor="#dd6826"
- android:text="@string/autologin_bar_error"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:visibility="gone" />
- <View
- android:layout_width="2dip"
- android:layout_height="match_parent"
- android:layout_weight="1"/>
- <ImageButton
- android:id="@+id/autologin_close"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="15dip"
- android:background="@null"
- android:src="@*android:drawable/btn_close"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/taburlbar"
- android:layout_width="match_parent"
- android:layout_height="48dip"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
- <ImageButton
- android:id="@+id/back"
- android:src="@drawable/ic_back_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="16dip"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/forward"
- android:src="@drawable/ic_forward_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/stop"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:src="@drawable/ic_stop_holo_dark" />
- <LinearLayout
- android:id="@+id/urlbar_focused"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1.0"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
- android:orientation="horizontal"
- android:background="@drawable/url_background">
- <ImageView
- android:id="@+id/url_icon"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_web_holo_dark"
- style="@style/HoloIcon" />
- <ImageView
- android:id="@+id/lock"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloIcon"
- android:visibility="gone" />
- <com.android.browser.UrlInputView
- android:id="@+id/url"
- android:layout_width="0dip"
- android:layout_weight="1.0"
- android:layout_height="match_parent"
- android:layout_marginLeft="16dip"
- android:paddingLeft="0dip"
- android:paddingRight="0dip"
- android:background="@null"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:hint="@string/search_hint"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
- android:scrollHorizontally="true"
- android:inputType="textUri"
- android:imeOptions="actionGo"
- style="@style/Suggestions" />
- <ImageButton
- android:id="@+id/star"
- android:src="@drawable/btn_imageview_star"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/clear"
- android:src="@drawable/ic_stop_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton" />
- </LinearLayout>
- <ImageButton
- android:id="@+id/go"
- android:src="@drawable/ic_go_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:visibility="gone"
- android:gravity="center_vertical"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/voicesearch"
- android:src="@drawable/ic_voice_search_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/search"
- android:src="@drawable/ic_search_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/all_btn"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:scaleType="center"
- android:paddingRight="16dip"
- style="@style/HoloButton"
- android:src="@drawable/ic_bookmarks_history_holo_dark" />
- </LinearLayout>
- <com.android.browser.PageProgressView
- android:id="@+id/progress"
- android:layout_width="match_parent"
- android:layout_height="22dip"
- android:background="@null"
- android:layout_below="@+id/taburlbar"
- android:src="@drawable/progress"
- android:layout_marginTop="-11dip"
- android:visibility="gone" />
-</RelativeLayout>