Single pane for 10" Settings
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 4c1bf7e..6469779 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -27,8 +27,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:scaleType="fitXY"
android:src="?android:attr/listDivider" />
@@ -38,7 +38,7 @@
android:layout_height="0dip"
android:layout_weight="1"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="outsideOverlay" />
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
diff --git a/res/layout/app_ops_details.xml b/res/layout/app_ops_details.xml
index d28689d..e3209ca 100644
--- a/res/layout/app_ops_details.xml
+++ b/res/layout/app_ops_details.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
index b754d0c..1cad648 100644
--- a/res/layout/data_usage_summary.xml
+++ b/res/layout/data_usage_summary.xml
@@ -29,16 +29,17 @@
<!-- give an empty content area to make tabhost happy -->
<FrameLayout
+ style="@style/PreferenceFragmentListSinglePane"
android:id="@android:id/tabcontent"
android:layout_width="0dip"
android:layout_height="0dip" />
<ListView
android:id="@android:id/list"
+ style="@style/PreferenceFragmentListSinglePane"
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" />
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index b7f8f15..347c12b 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index 3a2aa6a..12158b9 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -28,7 +28,7 @@
android:layout_height="0dip"
android:layout_weight="1"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="@integer/preference_scrollbar_style" />
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 8a8ba0b..033208b 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="@integer/preference_scrollbar_style" />
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -41,6 +41,8 @@
</FrameLayout>
<view class="com.android.settings.applications.LinearColorBar"
android:id="@+id/storage_color_bar"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
@@ -48,11 +50,7 @@
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="30dp"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:paddingBottom="1dp"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+ android:paddingBottom="1dp">
<TextView android:id="@+id/usedStorageText"
android:layout_width="0px"
android:layout_height="wrap_content"
@@ -88,8 +86,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 9e415a9..90b2cba 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -35,8 +35,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:textAppearance="@style/TextAppearance.PagerTabs"
- android:paddingLeft="@dimen/pager_tabs_padding"
- android:paddingRight="@dimen/pager_tabs_padding">
+ android:padding="0dp">
</android.support.v4.view.PagerTabStrip>
</android.support.v4.view.ViewPager>
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 0bc69fb..352ce44 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 05036da..ca65863 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
index 1c721ac..9faffe3 100644
--- a/res/layout/preference_empty_list.xml
+++ b/res/layout/preference_empty_list.xml
@@ -24,7 +24,6 @@
android:id="@+android:id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="@*android:dimen/preference_fragment_padding_side"
android:gravity="center" />
</LinearLayout>
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index b5fb810..41ace43 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -24,10 +24,9 @@
android:layout_height="0px"
android:layout_weight="1">
<ListView android:id="@android:id/list"
+ style="@style/PreferenceFragmentListSinglePane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
android:drawSelectorOnTop="false"
android:scrollbarStyle="outsideOverlay"
android:fastScrollEnabled="true" />
@@ -40,6 +39,8 @@
</FrameLayout>
<view class="com.android.settings.applications.LinearColorBar"
android:id="@+id/color_bar"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
@@ -49,9 +50,7 @@
android:paddingTop="30dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
- android:paddingBottom="1dp"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+ android:paddingBottom="1dp">
<TextView android:id="@+id/foregroundText"
android:layout_width="0px"
android:layout_height="wrap_content"
diff --git a/res/layout/running_service_details.xml b/res/layout/running_service_details.xml
index 92ce07b..f618bdd 100644
--- a/res/layout/running_service_details.xml
+++ b/res/layout/running_service_details.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 46b2115..63030af 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -23,8 +23,8 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index c698eaf..aeecc58 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -22,8 +22,8 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side" >
+ android:paddingStart="@dimen/settings_side_margin"
+ android:paddingEnd="@dimen/settings_side_margin" >
<LinearLayout
android:layout_width="match_parent"