Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev (7f2824b9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -271,10 +271,12 @@ 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()) {
		if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) {
		if (mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
		switchToHeaderLocal(mFirstHeader);
		}
		getListView().setSelectionFromTop(0, 0);
		}
		}

		private void highlightHeader(int id) {
		@@ -282,10 +284,12 @@ public class Settings extends PreferenceActivity
		Integer index = mHeaderIndexMap.get(id);
		if (index != null) {
		getListView().setItemChecked(index, true);
		if (isMultiPane()) {
		getListView().smoothScrollToPosition(index);
		}
		}
		}
		}

		@Override
		public Intent getIntent() {