auto import from //branches/cupcake/...@130745
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index c8eb220..0335574 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -17,14 +17,19 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingTop="0dip"
- android:paddingBottom="0dip"
+ android:paddingRight="6dip"
+ android:paddingLeft="6dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:gravity="center_vertical"
>
<ImageView android:id="@+id/favicon"
android:layout_width="48dip"
android:layout_height="48dip"
- android:layout_marginRight="6dip"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="11dip"
android:focusable="false"
android:src="@android:drawable/ic_menu_add"
android:scaleType="fitCenter"
@@ -33,20 +38,22 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:gravity="center_vertical"
>
<TextView android:id="@+id/title"
android:text="@string/add_new_bookmark"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginBottom="2dip"
/>
<TextView android:id="@+id/url"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="1"
- android:scrollHorizontally="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/bookmark_item.xml b/res/layout/bookmark_item.xml
deleted file mode 100644
index 7d54447..0000000
--- a/res/layout/bookmark_item.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10dip"
- android:paddingTop="5dip"
- android:paddingBottom="5dip"
- >
-
- <!-- note: to center icon vertically, replace the alignParentTop
- below with android:layout_centerVertical="true" -->
-
- <ImageView android:id="@+id/favicon"
- android:layout_width="20dip"
- android:layout_height="20dip"
- android:focusable="false"
- android:padding="2dip"
- android:layout_marginTop="4dip"
- android:layout_marginRight="6dip"
- android:layout_alignParentTop="true"
- android:background="@drawable/fav_icn_background"
- android:src="@drawable/app_web_browser_sm"
- android:layout_alignParentLeft="true"
- />
- <TextView android:id="@+id/title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:maxLines="1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/favicon"
- android:ellipsize="end"
- />
- <TextView android:id="@+id/url"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:maxLines="1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/title"
- android:layout_toRightOf="@+id/favicon"
- android:ellipsize="end"
- />
-</RelativeLayout>
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index 92ae627..ca84f30 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -42,10 +42,8 @@
android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="250dip"
- android:singleLine="true"
- android:autoText="false"
- android:capitalize="sentences"
android:gravity="fill_horizontal"
+ android:inputType="textCapSentences"
android:selectAllOnFocus="true"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -63,11 +61,9 @@
android:id="@+id/address"
android:layout_height="wrap_content"
android:layout_width="250dip"
- android:singleLine="true"
- android:autoText="false"
- android:capitalize="none"
android:hint="@string/http"
android:gravity="fill_horizontal"
+ android:inputType="textUri"
android:selectAllOnFocus="true"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml
index 7e587c1..000799f 100644
--- a/res/layout/browser_find.xml
+++ b/res/layout/browser_find.xml
@@ -18,9 +18,11 @@
android:id="@+id/findControls"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/bottom_bar"
- android:paddingTop="12dip"
- >
+ android:paddingTop="5dip"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
+ android:paddingBottom="1dip"
+ android:background="@android:drawable/bottom_bar">
<ImageButton
android:src="@drawable/ic_btn_find_prev"
android:id="@+id/previous"
@@ -46,8 +48,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
+ android:inputType="text"
android:hint="@string/find_dot"
/>
<LinearLayout android:id="@+id/matches_view"
diff --git a/res/layout/history_header.xml b/res/layout/history_header.xml
new file mode 100644
index 0000000..a390c37
--- /dev/null
+++ b/res/layout/history_header.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingLeft="35dip"
+ android:gravity="center_vertical"
+ />
\ No newline at end of file
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index 1d51ad1..50903a4 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -16,27 +16,50 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="64dip"
- android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:orientation="horizontal"
android:paddingRight="6dip"
- android:paddingTop="8dip"
- android:paddingLeft="4dip"
- android:background="@color/translucent_white"
+ android:paddingLeft="6dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:gravity="center_vertical"
>
- <TextView android:id="@+id/title"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:maxLines="1"
- android:layout_width="wrap_content"
+ <ImageView android:id="@+id/favicon"
+ android:layout_width="20dip"
+ android:layout_height="20dip"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="11dip"
+ android:padding="2dip"
+ android:background="@drawable/fav_icn_background"
+ android:src="@drawable/app_web_browser_sm"
+ />
+ <LinearLayout android:layout_width="0dip"
+ android:layout_weight="1"
android:layout_height="wrap_content"
- android:ellipsize="end"
- android:drawablePadding="4dip"
- />
- <TextView android:id="@+id/url"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:maxLines="1"
- android:layout_width="wrap_content"
+ android:orientation="vertical"
+ >
+ <TextView android:id="@+id/title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:maxLines="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ />
+ <TextView android:id="@+id/url"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:maxLines="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ />
+ </LinearLayout>
+ <CheckBox android:id="@+id/star"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="24dip"
- android:ellipsize="end"
+ android:focusable="false"
+ android:button="@android:drawable/btn_star"
/>
</LinearLayout>
diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml
index 125095e..01cd3af 100644
--- a/res/layout/http_authentication.xml
+++ b/res/layout/http_authentication.xml
@@ -37,8 +37,7 @@
android:textSize="18sp"
android:textColor="@color/username_edit"
android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
+ android:inputType="text"
android:gravity="fill_horizontal"
android:layout_weight="1"
android:layout_marginLeft="20dip"
@@ -61,12 +60,10 @@
android:textSize="18sp"
android:textColor="@color/password_edit"
android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
+ android:inputType="textPassword"
android:gravity="fill_horizontal"
android:layout_weight="1"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
- android:layout_marginBottom="12dip"
- android:password="true" />
+ android:layout_marginBottom="12dip" />
</TableLayout>
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
deleted file mode 100644
index fe5647e..0000000
--- a/res/layout/search_bar.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* apps/common/res/layout/SearchBar.xml
-**
-** Copyright 2007, 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.
-*/
--->
- <!-- Outer layout defines the entire search bar at the top of the screen -->
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/search_bar"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="15dip"
- android:paddingRight="15dip"
- android:paddingTop="10dip"
- android:paddingBottom="20dip"
- android:baselineAligned="false"
- android:background="@android:drawable/alert_dark_frame" >
-
- <!-- TextView or ImageView at top shows searched application -->
- <!-- Code will display one-or-the-other (or neither) -->
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="3dip">
-
- <TextView
- android:id="@+id/search_badge_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall" />
- </FrameLayout>
-
- <!-- Inner layout contains the button(s) and EditText -->
- <LinearLayout
- android:id="@+id/search_edit_frame"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:baselineAligned="false" >
-
- <EditText
- android:id="@+id/search_src_text"
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1.0"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
- android:singleLine="true"
- android:textSize="14sp" />
-
- <Button
- android:id="@+id/search_go_btn"
- android:text="@android:string/search_go"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- </LinearLayout>
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
new file mode 100644
index 0000000..7cf5b5d
--- /dev/null
+++ b/res/layout/tabs.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/tabhost"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TabWidget android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="68dip"
+ android:paddingLeft="1dip"
+ android:paddingRight="1dip"
+ android:paddingTop="4dip"
+ />
+
+ <FrameLayout android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ />
+ </LinearLayout>
+</TabHost>
\ No newline at end of file