From 56f51a8927f53bee81145fe29e63af8a87e6fd1b Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 5 Aug 2013 10:07:23 -0700
Subject: [PATCH] Single pane for 10" Settings

Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
---
 AndroidManifest.xml                            |  2 +-
 res/layout-sw720dp/tab_widget.xml              |  8 +++---
 res/layout/account_sync_screen.xml             |  6 ++--
 res/layout/app_ops_details.xml                 |  2 +-
 res/layout/data_usage_summary.xml              |  3 +-
 res/layout/installed_app_details.xml           |  2 +-
 res/layout/manage_accounts_screen.xml          |  2 +-
 res/layout/manage_applications_apps.xml        | 12 +++-----
 res/layout/manage_applications_content.xml     |  3 +-
 res/layout/manage_applications_running.xml     |  2 --
 res/layout/power_usage_details.xml             |  2 +-
 res/layout/preference_empty_list.xml           |  1 -
 res/layout/running_processes_view.xml          |  9 +++---
 res/layout/running_service_details.xml         |  2 +-
 res/layout/title.xml                           |  4 +--
 res/layout/user_info_header.xml                |  4 +--
 res/values-sw600dp/styles.xml                  |  1 +
 res/values-sw720dp-land/dimens.xml             | 19 +++++++++++++
 res/values-sw720dp/dimens.xml                  |  3 +-
 res/values/dimens.xml                          |  1 +
 res/values/styles.xml                          | 38 ++++++++++++++++++++++++++
 res/values/themes.xml                          |  8 ++++++
 src/com/android/settings/DataUsageSummary.java |  9 ++----
 src/com/android/settings/Settings.java         |  5 ++++
 src/com/android/settings/Utils.java            |  3 +-
 25 files changed, 105 insertions(+), 46 deletions(-)
 create mode 100644 res/values-sw720dp-land/dimens.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 10c66d43ae..fb1fef8d7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,7 +70,7 @@
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.Holo"
+            android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"
             android:requiredForAllUsers="true"
             android:supportsRtl="true">
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index f591f38a85..80910c7be8 100644
--- a/res/layout-sw720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingStart="@*android:dimen/preference_fragment_padding_side"
-        android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
-        style="?android:attr/tabWidgetStyle" />
-
+        style="?android:attr/tabWidgetStyle"
+        android:paddingStart="@dimen/settings_side_margin"
+        android:paddingEnd="@dimen/settings_side_margin"
+    />
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 4c1bf7ef50..64697793e5 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 d28689dc4a..e3209ca91a 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 b754d0ca6c..1cad64837b 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 b7f8f15b14..347c12b838 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 3a2aa6a461..12158b9c13 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 8a8ba0b432..033208b7b8 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 9e415a9dbd..90b2cbab69 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 0bc69fbc88..352ce442e2 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 05036da525..ca65863786 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 1c721ac9c2..9faffe3224 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 b5fb8101e6..41ace43a64 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 92ce07be9f..f618bddb65 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 46b21150cc..63030affd0 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 c698eaf5e3..aeecc58eb9 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"
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 21f9ae3289..6862690ac5 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -68,4 +68,5 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
+
 </resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 0000000000..05914dfe0e
--- /dev/null
+++ b/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+    <dimen name="settings_side_margin">150dp</dimen>
+</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index d6d91840eb..9c6cc250b0 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -15,8 +15,9 @@
 -->
 
 <resources>
-    <dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+    <dimen name="pager_tabs_padding">0dp</dimen>
     <dimen name="appwidget_preview_height">80dip</dimen>
     <integer name="keyguard_appwidget_picker_cols">2</integer>
     <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
+    <dimen name="settings_side_margin">32dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cf4765733d..6529c6e6f9 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -71,4 +71,5 @@
 
     <dimen name="captioning_preview_height">200dp</dimen>
 
+    <dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ebd87221ed..aaaaddb8e7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -87,6 +87,41 @@
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
     </style>
 
+    <style name="PreferenceHeaderPanelSinglePane">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:paddingStart">0dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
          be consistent with ProgressBar -->
     <style name="TopDivider">
@@ -203,4 +238,7 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
+
+    <!-- Scrollbar style OUTSIDE_OVERLAY -->
+    <integer name="preference_scrollbar_style">33554432</integer>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b5f8f6404a..615988fa28 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,4 +19,12 @@
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
+
+    <style name="Theme.Settings" parent="@android:style/Theme.Holo">
+        <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
+        <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
+        <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
+        <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+        <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+    </style>
 </resources>
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 2b2cc989db..3d5678d2c6 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -312,15 +312,10 @@ public class DataUsageSummary extends Fragment {
         // on parent container for inset.
         final boolean shouldInset = mListView.getScrollBarStyle()
                 == View.SCROLLBARS_OUTSIDE_OVERLAY;
-        if (shouldInset) {
-            mInsetSide = view.getResources().getDimensionPixelOffset(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
-        } else {
-            mInsetSide = 0;
-        }
+        mInsetSide = 0;
 
         // adjust padding around tabwidget as needed
-        prepareCustomPreferencesList(container, view, mListView, true);
+        prepareCustomPreferencesList(container, view, mListView, false);
 
         mTabHost.setup();
         mTabHost.setOnTabChangedListener(mTabListener);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 4221059b6a..b05c62bcc7 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -286,6 +286,11 @@ public class Settings extends PreferenceActivity
         }
     }
 
+    @Override
+    public boolean onIsMultiPane() {
+        return false;
+    }
+
     private static final String[] ENTRY_FRAGMENTS = {
         WirelessSettings.class.getName(),
         WifiSettings.class.getName(),
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 58c0872da9..8614216919 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -448,8 +448,7 @@ public class Utils {
             ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
 
             final Resources res = list.getResources();
-            final int paddingSide = res.getDimensionPixelSize(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
+            final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
             final int paddingBottom = res.getDimensionPixelSize(
                     com.android.internal.R.dimen.preference_fragment_padding_bottom);
 
-- 
2.11.0