diff options
| author | Michael Kolb <kolby@google.com> | 2011-06-21 16:16:22 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-07-06 15:37:46 -0700 |
| commit | 305b1c51f5e0d48a59d0e7c646b6cd0bc777a5dc (patch) | |
| tree | aadc66cbc57b8e99bc19fc4fd3507debcaab4fb9 /res/layout | |
| parent | 76292ece64152959525f7f090af7b50cbb63bb88 (diff) | |
| download | packages_apps_browser-305b1c51f5e0d48a59d0e7c646b6cd0bc777a5dc.zip packages_apps_browser-305b1c51f5e0d48a59d0e7c646b6cd0bc777a5dc.tar.gz packages_apps_browser-305b1c51f5e0d48a59d0e7c646b6cd0bc777a5dc.tar.bz2 | |
Titlebar on phone UI update
introduce new states for titlebar:
normal, highlighted, editing, loading
Change-Id: I8a6f88afc3457a07063aba40ef4d3e5f6c806b8f
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/title_bar.xml | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index 66ea1d4..9096418 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -24,11 +24,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" android:orientation="horizontal" - android:background="@drawable/bg_urlbar" - android:paddingLeft="4dip" - android:paddingRight="4dip" - android:paddingTop="2dip" - android:paddingBottom="2dip"> + android:background="@drawable/bg_urlbar"> <LinearLayout android:id="@+id/title_bg" android:layout_width="0dip" @@ -36,54 +32,58 @@ 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/favicon" - android:layout_width="20dip" - android:layout_height="20dip" /> - <ImageView - android:id="@+id/lock" + android:id="@+id/stop" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="2dip" - android:visibility="gone" /> + 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:layout_marginLeft="2dip" - android:paddingLeft="4dip" - android:paddingRight="4dip" - android:background="@*android:drawable/edit_text_holo_dark" + 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="textUri" + android:inputType="text" android:imeOptions="actionGo" - style="@style/Suggestions" /> + 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> - <ImageView - android:id="@+id/voice" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/ic_voice_search_holo_dark" - android:visibility="gone" /> - <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" /> - <ImageButton - android:id="@+id/forward" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/ic_forward_holo_dark" - style="@style/HoloButton" /> <ImageButton android:id="@+id/tab_switcher" android:layout_width="wrap_content" |