More TabWidget and padding tweaks to match spec.
Also fix NPE in UserDictionarySettings.
Bug: 5184822
Change-Id: I082981c3bcf9b1e6575dcf9f42495a17f0ec8672
diff --git a/res/layout-h720dp/tab_widget.xml b/res/layout-h720dp/tab_widget.xml
new file mode 100644
index 0000000..5a4e580
--- /dev/null
+++ b/res/layout-h720dp/tab_widget.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="none">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>
diff --git a/res/layout-w720dp/tab_widget.xml b/res/layout-w720dp/tab_widget.xml
new file mode 100644
index 0000000..5a4e580
--- /dev/null
+++ b/res/layout-w720dp/tab_widget.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="none">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 4dae248..7f63f3f 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,8 +20,8 @@
android:id="@+id/chart"
android:layout_width="match_parent"
android:layout_height="@dimen/data_usage_chart_height"
- android:paddingLeft="@*android:dimen/preference_item_padding_side"
- android:paddingRight="@*android:dimen/preference_item_padding_side"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
android:paddingTop="16dip"
android:paddingBottom="16dip"
settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index ba41c88..b27d88f 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -17,7 +17,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:clipChildren="false"
+ android:clipToPadding="false">
<FrameLayout
android:id="@+id/network_switches_container"
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
index d59e0d6..b754d0c 100644
--- a/res/layout/data_usage_summary.xml
+++ b/res/layout/data_usage_summary.xml
@@ -25,20 +25,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <HorizontalScrollView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:scrollbars="none">
-
- <TabWidget
- android:id="@android:id/tabs"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?android:attr/tabWidgetStyle" />
-
- </HorizontalScrollView>
+ <include layout="@layout/tab_widget" />
<!-- give an empty content area to make tabhost happy -->
<FrameLayout
@@ -51,6 +38,9 @@
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
+ android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
+ android:clipChildren="false"
+ android:clipToPadding="false"
android:smoothScrollbar="false" />
</LinearLayout>
diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications.xml
index 95d4847..7df2f54 100755
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications.xml
@@ -29,7 +29,8 @@
<ListView android:id="@android:id/list"
android:drawSelectorOnTop="false"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/manage_apps_tab_content.xml
index b8cee87..3898227 100644
--- a/res/layout/manage_apps_tab_content.xml
+++ b/res/layout/manage_apps_tab_content.xml
@@ -28,21 +28,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
- <HorizontalScrollView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:scrollbars="none">
-
- <TabWidget
- android:id="@android:id/tabs"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?android:attr/tabWidgetStyle" />
-
- </HorizontalScrollView>
+
+ <include layout="@layout/tab_widget" />
<FrameLayout
android:id="@android:id/tabcontent"
@@ -52,4 +39,3 @@
</LinearLayout>
</TabHost>
-
diff --git a/res/layout/tab_widget.xml b/res/layout/tab_widget.xml
new file mode 100644
index 0000000..a6adc5d
--- /dev/null
+++ b/res/layout/tab_widget.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="none"
+ android:fillViewport="true">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>