Merge "Apps tabs align to title on 2-pane settings." into jb-dev

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);
         }
     }

src/com/android/settings/applications/ManageApplications.java

@@ -737,6 +737,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;