From f0b05de3e06ad319a32fc1784d1b5cef48521f81 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 9 May 2012 09:43:33 -0700
Subject: [PATCH] Apps tabs align to title on 2-pane settings.

Pad the lists in Apps screen.
Pad the color bar to align with the list.

Bug: 6449489

Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
---
 .../tab_widget.xml                            |  9 ++++--
 res/layout-w720dp/tab_widget.xml              | 29 -------------------
 res/layout/manage_applications.xml            |  6 +++-
 res/layout/manage_apps_tab_content.xml        |  7 +++--
 res/layout/running_processes_view.xml         |  7 ++++-
 src/com/android/settings/Utils.java           |  2 +-
 .../applications/ManageApplications.java      |  3 ++
 7 files changed, 25 insertions(+), 38 deletions(-)
 rename res/{layout-h720dp => layout-sw720dp}/tab_widget.xml (75%)
 delete mode 100644 res/layout-w720dp/tab_widget.xml

diff --git a/res/layout-h720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
similarity index 75%
rename from res/layout-h720dp/tab_widget.xml
rename to res/layout-sw720dp/tab_widget.xml
index 5a4e5802038..4cd45473572 100644
--- a/res/layout-h720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -17,13 +17,16 @@
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:scrollbars="none">
+    android:scrollbars="none"
+    android:fillViewport="true">
 
     <TabWidget
         android:id="@android:id/tabs"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+        android:paddingRight="@*android:dimen/preference_fragment_padding_side"
         style="?android:attr/tabWidgetStyle" />
 
 </HorizontalScrollView>
diff --git a/res/layout-w720dp/tab_widget.xml b/res/layout-w720dp/tab_widget.xml
deleted file mode 100644
index 5a4e5802038..00000000000
--- a/res/layout-w720dp/tab_widget.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/manage_applications.xml b/res/layout/manage_applications.xml
index 7df2f549ce6..da56c99647e 100755
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications.xml
@@ -49,7 +49,9 @@
                 android:paddingTop="30dp"
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
-                android:paddingBottom="1dp">
+                android:paddingBottom="1dp"
+                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
@@ -91,6 +93,8 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/manage_apps_tab_content.xml
index 3898227d32b..b36501b65a4 100644
--- a/res/layout/manage_apps_tab_content.xml
+++ b/res/layout/manage_apps_tab_content.xml
@@ -27,9 +27,10 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        
-        <include layout="@layout/tab_widget" />
+        android:layout_height="match_parent"
+        >
+
+        <include layout="@layout/tab_widget"/>
 
         <FrameLayout
             android:id="@android:id/tabcontent"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 3558e92b233..e23de16c4fb 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,7 +26,10 @@
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
+                android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+                android:paddingRight="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
+                android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
         <TextView android:id="@android:id/empty"
                 android:layout_width="match_parent"
@@ -46,7 +49,9 @@
             android:paddingTop="30dp"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
-            android:paddingBottom="1dp">
+            android:paddingBottom="1dp"
+            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f28500e2411..460a182a495 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -407,7 +407,7 @@ public class Utils {
             final int paddingBottom = res.getDimensionPixelSize(
                     com.android.internal.R.dimen.preference_fragment_padding_bottom);
 
-            final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingBottom;
+            final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide;
             list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
         }
     }
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 8a64968f961..a28fa3387ef 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -738,6 +738,9 @@ public class ManageApplications extends Fragment implements
         } else if (menuId == SHOW_BACKGROUND_PROCESSES) {
             mShowBackground = true;
             mRunningProcessesView.mAdapter.setShowBackground(true);
+        } else {
+            // Handle the home button
+            return false;
         }
         updateOptionsMenu();
         return true;