PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev

Browse Source 
* commit '7f2824b924775e78192fb12c342b38558cf304b5':
  Go back to top of list when Settings is relaunched
This commit is contained in:
Amith Yamasani
2012-10-10 10:33:41 -07:00
committed by Android Git Automerger
parent 196f1bd0d0 7f2824b924
commit fee5c228c7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/Settings.java
View File

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