Code drop from //branches/cupcake/...@124589
diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml
index b1da8f1..7e587c1 100644
--- a/res/layout/browser_find.xml
+++ b/res/layout/browser_find.xml
@@ -18,111 +18,68 @@
android:id="@+id/findControls"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/menu_full_frame"
+ android:background="@android:drawable/bottom_bar"
android:paddingTop="12dip"
>
-
- <LinearLayout
- android:layout_width="wrap_content"
+ <ImageButton
+ android:src="@drawable/ic_btn_find_prev"
+ android:id="@+id/previous"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ <ImageButton
+ android:src="@drawable/ic_btn_find_next"
+ android:id="@+id/next"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginRight="6dip"
+ >
+ <EditText android:id="@+id/edit"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:scrollHorizontally="true"
+ android:autoText="false"
+ android:capitalize="none"
+ android:hint="@string/find_dot"
+ />
+ <LinearLayout android:id="@+id/matches_view"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
+ android:layout_gravity="right"
+ android:visibility="invisible"
>
- <ImageButton android:id="@+id/done"
+ <TextView android:id="@+id/matches"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_browser_done"
+ android:layout_gravity="right"
+ android:text="@string/zero"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondaryInverse"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/done"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
+ android:layout_marginRight="3dip"
+ android:layout_gravity="right"
+ android:text="@string/matches_found"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondaryInverse"
/>
</LinearLayout>
-
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <EditText android:id="@+id/edit"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
- android:hint="@string/find_dot"
- />
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal"
- android:layout_gravity="center_horizontal"
- android:paddingTop="1dip"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dip"
- android:text="@string/matches_found"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- <TextView android:id="@+id/matches"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/zero"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <ImageButton
- android:src="@drawable/ic_browser_up"
- android:id="@+id/previous"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/prev"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <ImageButton
- android:src="@drawable/ic_browser_down"
- android:id="@+id/next"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/next"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
-
+ </LinearLayout>
+ <ImageButton android:id="@+id/done"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_btn_close_panel"
+ />
</LinearLayout>
diff --git a/res/layout/cache_cleared.xml b/res/layout/cache_cleared.xml
deleted file mode 100644
index a65183c..0000000
--- a/res/layout/cache_cleared.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
- * 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.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="50dip"
- android:layout_marginTop="50dip"
- android:layout_marginRight="50dip"
- android:layout_marginBottom="50dip"
- android:text="@string/cache_cleared"
- />
-</LinearLayout>
diff --git a/res/layout/gears_dialog.xml b/res/layout/gears_dialog.xml
new file mode 100644
index 0000000..b1a43cd
--- /dev/null
+++ b/res/layout/gears_dialog.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawingCacheQuality="auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="10dip"
+ android:background="@color/white">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="10dip">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:paddingRight="10dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true" />
+
+ <TextView
+ android:id="@+id/dialog_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ android:textSize="16dip"
+ android:textStyle="bold"
+ android:textColor="@color/black"/>
+
+ <TextView
+ android:id="@+id/dialog_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="center_vertical"
+ android:textSize="13dip"
+ android:textColor="@color/black"/>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/dialog_subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ android:textSize="13dip"
+ android:textColor="@color/black"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/panel_content"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <RelativeLayout
+ android:background="@color/white"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip">
+
+ <Button
+ android:id="@+id/button_alwaysdeny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ style="@style/gears_button"
+ android:textSize="13dip"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/button_allow"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="13dip"/>
+
+ <Button
+ android:id="@+id/button_deny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="13dip"/>
+
+ </LinearLayout>
+
+ </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/gears_dialog_filepicker.xml b/res/layout/gears_dialog_filepicker.xml
new file mode 100644
index 0000000..5f1c653
--- /dev/null
+++ b/res/layout/gears_dialog_filepicker.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/gray"
+ android:padding="1px">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/white">
+
+ <GridView android:id="@+id/files_list"
+ android:padding="4px"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:horizontalSpacing="2px"
+ android:verticalSpacing="2px"
+ android:numColumns="3"
+ style="@android:style/Widget.ListView.White" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/gears_dialog_filepicker_cell.xml b/res/layout/gears_dialog_filepicker_cell.xml
new file mode 100644
index 0000000..1db167f
--- /dev/null
+++ b/res/layout/gears_dialog_filepicker_cell.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:padding="2px" >
+
+ <ImageView
+ android:id="@+id/icon"
+ android:scaleType="fitCenter"
+ android:layout_width="64px"
+ android:layout_height="64px" />
+
+ <TextView
+ android:id="@+id/name"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/black"
+ android:singleLine="true"
+ android:ellipsize="middle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/layout/gears_dialog_permission.xml b/res/layout/gears_dialog_permission.xml
new file mode 100644
index 0000000..3852f83
--- /dev/null
+++ b/res/layout/gears_dialog_permission.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/content_border"
+ android:padding="1px">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/content_background"
+ android:padding="4dip">
+
+ <ImageView
+ android:id="@+id/origin_icon"
+ android:padding="10dip"
+ android:layout_centerHorizontal="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:adjustViewBounds="true"
+ android:src="@drawable/gears"/>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="4dip"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/origin_title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:textStyle="bold"
+ android:gravity="left"
+ android:textSize="13dip"
+ android:textColor="@color/black"/>
+
+ <TextView
+ android:id="@+id/origin_subtitle"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="left"
+ android:textSize="13dip"
+ android:textColor="@color/black"/>
+
+ <TextView
+ android:id="@+id/origin_message"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:paddingTop="10dip"
+ android:gravity="left"
+ android:textSize="13dip"
+ android:textColor="@color/black"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/privacy_policy_label"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center_horizontal"
+ android:textSize="13dip"
+ android:textStyle="italic"
+ android:textColor="@color/black"
+ android:visibility="gone"
+ android:text="@string/privacy_policy" />
+
+</LinearLayout>
diff --git a/res/layout/gears_dialog_settings.xml b/res/layout/gears_dialog_settings.xml
new file mode 100644
index 0000000..a9026db
--- /dev/null
+++ b/res/layout/gears_dialog_settings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/gray"
+ android:padding="1px">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/white">
+
+ <ListView android:id="@+id/sites_list"
+ android:padding="4dip"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/Widget.ListView.White" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/gears_version"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dip"
+ android:gravity="center_horizontal"
+ android:textSize="13dip"
+ android:textStyle="italic"
+ android:textColor="@color/black" />
+
+</LinearLayout>
diff --git a/res/layout/gears_dialog_settings_row.xml b/res/layout/gears_dialog_settings_row.xml
new file mode 100644
index 0000000..8a2cadf
--- /dev/null
+++ b/res/layout/gears_dialog_settings_row.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="13dip"
+ android:background="@color/white"
+ android:textColor="@color/black">
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="4dip">
+
+ <TextView
+ android:id="@+id/origin_name"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textColor="@color/black"
+ android:textStyle="bold"/>
+
+ <Button
+ android:id="@+id/origin_remove"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/gears_button"
+ android:text="@string/remove"/>
+
+ </LinearLayout>
+
+ <TableLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TableRow
+ android:id="@+id/local_storage_choice"
+ android:visibility="gone">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:textColor="@color/black"
+ android:gravity="center_vertical"
+ android:text="@string/local_storage"/>
+
+ <RadioGroup android:orientation="horizontal">
+ <RadioButton
+ android:id="@+id/local_storage_allowed"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="13dip"
+ android:text="@string/allowed"/>
+
+ <RadioButton
+ android:id="@+id/local_storage_denied"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="13dip"
+ android:text="@string/denied"/>
+ </RadioGroup>
+
+ </TableRow>
+
+ <TableRow
+ android:id="@+id/location_data_choice"
+ android:visibility="gone">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:textColor="@color/black"
+ android:gravity="center_vertical"
+ android:text="@string/location"/>
+
+ <RadioGroup android:orientation="horizontal">
+ <RadioButton
+ android:id="@+id/location_data_allowed"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="13dip"
+ android:text="@string/allowed"/>
+
+ <RadioButton
+ android:id="@+id/location_data_denied"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="13dip"
+ android:text="@string/denied"/>
+ </RadioGroup>
+
+ </TableRow>
+
+ </TableLayout>
+
+</LinearLayout>
diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml
index b10b72a..ee45082 100644
--- a/res/layout/page_info.xml
+++ b/res/layout/page_info.xml
@@ -14,54 +14,61 @@
limitations under the License.
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
-
- <!-- Title: -->
- <TextView
- android:id="@+id/title"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/white"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
- android:layout_marginTop="12dip"
- android:layout_marginBottom="12dip" />
-
- <!-- Address: -->
- <TableLayout
+
+ <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/address_header"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/page_info_address"
- android:textSize="14sp"
- android:textColor="@color/white"
- android:gravity="left"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
- android:layout_marginBottom="10dip" />
-
+ android:orientation="vertical" >
+
+ <!-- Title: -->
<TextView
- android:id="@+id/address"
+ android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
+ android:textStyle="bold"
android:textSize="14sp"
android:textColor="@color/white"
- android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
+ android:layout_marginTop="12dip"
android:layout_marginBottom="12dip" />
+
+ <!-- Address: -->
+ <TableLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- </TableLayout>
+ <TextView
+ android:id="@+id/address_header"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/page_info_address"
+ android:textSize="14sp"
+ android:textColor="@color/white"
+ android:gravity="left"
+ android:layout_marginLeft="20dip"
+ android:layout_marginRight="20dip"
+ android:layout_marginBottom="10dip" />
+
+ <TextView
+ android:id="@+id/address"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textSize="14sp"
+ android:textColor="@color/white"
+ android:gravity="left"
+ android:layout_marginLeft="20dip"
+ android:layout_marginRight="20dip"
+ android:layout_marginBottom="12dip" />
+
+ </TableLayout>
+
+ </LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/res/layout/tabitem.xml b/res/layout/tabitem.xml
index 9edd614..9c82972 100644
--- a/res/layout/tabitem.xml
+++ b/res/layout/tabitem.xml
@@ -16,15 +16,14 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="198dip"
android:orientation="vertical"
android:padding="4dip"
- android:background="@android:drawable/gallery_thumb">
+ android:background="@color/white">
<com.android.browser.FakeWebView android:id="@+id/icon"
android:background="@color/black"
- android:layout_width="145dip"
- android:layout_height="190dip" />
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" />
<TextView android:id="@+id/label"
android:layout_width="fill_parent"
@@ -45,10 +44,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
- android:paddingTop="12dip"
- android:paddingBottom="10dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
+ android:paddingTop="14dip"
+ android:paddingBottom="12dip"
+ android:paddingLeft="12dip"
+ android:paddingRight="12dip"
android:src="@android:drawable/btn_dialog" />
</FrameLayout>