commit 68dac84c4133b91db87642743f30657604a4fb77
author Adam Powell <adamp@google.com> Wed Oct 10 13:13:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 13:13:42 2012 -0700
tree 1f86ddb637bf6328e652a52dbe6f3d3449e58d99
parent 553074f0fc2aa46f44797b72f1457146697645b6
parent c5e436c18f3cb9caf731a9fb01bc9a3fa9cf01cc

Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 9c7f848..b52c2e2 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -271,9 +271,11 @@
         super.onNewIntent(intent);
 
         // If it is not launched from history, then reset to top-level
-        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
-                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
-            switchToHeaderLocal(mFirstHeader);
+        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) {
+            if (mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
+                switchToHeaderLocal(mFirstHeader);
+            }
+            getListView().setSelectionFromTop(0, 0);
         }
     }
 
@@ -282,7 +284,9 @@
             Integer index = mHeaderIndexMap.get(id);
             if (index != null) {
                 getListView().setItemChecked(index, true);
-                getListView().smoothScrollToPosition(index);
+                if (isMultiPane()) {
+                    getListView().smoothScrollToPosition(index);
+                }
             }
         }
     }

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 61093e6..9c3f07f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -332,6 +332,7 @@
                     activity.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivity != null
                     && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+                activity.setResult(Activity.RESULT_OK);
                 activity.finish();
                 return;
             }
@@ -837,6 +838,7 @@
             if (mAutoFinishOnConnection && info.isConnected()) {
                 Activity activity = getActivity();
                 if (activity != null) {
+                    activity.setResult(Activity.RESULT_OK);
                     activity.finish();
                 }
                 return;