summaryrefslogtreecommitdiffstats
path: root/res/layout/data_usage_summary.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-18 11:59:19 -0700
committerJeff Sharkey <jsharkey@android.com>2011-08-18 15:30:17 -0700
commitb654cbb896a6e6db9ecec164476b0ac4a3e72774 (patch)
tree943ad7937bd4e6a391fcdc7f7c86299fecf9c6f1 /res/layout/data_usage_summary.xml
parenteee01c451051234e99ea612079ec533c8f9ad9c6 (diff)
downloadpackages_apps_Settings-b654cbb896a6e6db9ecec164476b0ac4a3e72774.zip
packages_apps_Settings-b654cbb896a6e6db9ecec164476b0ac4a3e72774.tar.gz
packages_apps_Settings-b654cbb896a6e6db9ecec164476b0ac4a3e72774.tar.bz2
More TabWidget and padding tweaks to match spec.
Also fix NPE in UserDictionarySettings. Bug: 5184822 Change-Id: I082981c3bcf9b1e6575dcf9f42495a17f0ec8672
Diffstat (limited to 'res/layout/data_usage_summary.xml')
-rw-r--r--res/layout/data_usage_summary.xml18
1 files changed, 4 insertions, 14 deletions
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>