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

Merge "Search - optimize when updating the Index is done"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 16:43:21 +00:00
committed by Android (Google) Code Review
parent fd78ec72c3 5ebabfcd35
commit d4d829ff9b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SettingsActivity.java
View File

@@ -416,7 +416,12 @@ public class SettingsActivity extends Activity
if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) { if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0)); getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
} }
final String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
if (initialFragmentName == null) {
Index.getInstance(this).update(); Index.getInstance(this).update();
}
mAuthenticatorHelper = new AuthenticatorHelper(); mAuthenticatorHelper = new AuthenticatorHelper();
mAuthenticatorHelper.updateAuthDescriptions(this); mAuthenticatorHelper.updateAuthDescriptions(this);
@@ -440,9 +445,6 @@ public class SettingsActivity extends Activity
mDisplayHomeAsUpEnabled = true; mDisplayHomeAsUpEnabled = true;
String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
if (savedState != null) { if (savedState != null) {
// We are restarting from a previous saved state; used that to initialize, instead // We are restarting from a previous saved state; used that to initialize, instead
// of starting fresh. // of starting fresh.
@@ -474,6 +476,8 @@ public class SettingsActivity extends Activity
mInitialTitle = (initialTitle != null) ? initialTitle : getTitle(); mInitialTitle = (initialTitle != null) ? initialTitle : getTitle();
setTitle(mInitialTitle); setTitle(mInitialTitle);
Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
switchToFragment( initialFragmentName, initialArguments, true, false, switchToFragment( initialFragmentName, initialArguments, true, false,
mInitialTitle, false); mInitialTitle, false);
} else { } else {