summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/Settings.java12
1 files changed, 8 insertions, 4 deletions
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 @@ public class Settings extends PreferenceActivity
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 @@ public class Settings extends PreferenceActivity
Integer index = mHeaderIndexMap.get(id);
if (index != null) {
getListView().setItemChecked(index, true);
- getListView().smoothScrollToPosition(index);
+ if (isMultiPane()) {
+ getListView().smoothScrollToPosition(index);
+ }
}
}
}