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 - part 2"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 17:15:51 +00:00
committed by Android (Google) Code Review
parent d4d829ff9b 5cda21b449
commit d33b04ff06
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,12 +417,6 @@ public class SettingsActivity extends Activity
getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
}
final String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
if (initialFragmentName == null) {
Index.getInstance(this).update();
}
mAuthenticatorHelper = new AuthenticatorHelper();
mAuthenticatorHelper.updateAuthDescriptions(this);
mAuthenticatorHelper.onAccountsUpdated(this, null);
@@ -445,6 +439,13 @@ public class SettingsActivity extends Activity
mDisplayHomeAsUpEnabled = true;
// Getting Intent properties can only be done after the super.onCreate(...)
final String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
if (initialFragmentName == null) {
Index.getInstance(this).update();
}
if (savedState != null) {
// We are restarting from a previous saved state; used that to initialize, instead
// of starting fresh.
@@ -477,7 +478,6 @@ public class SettingsActivity extends Activity
setTitle(mInitialTitle);
Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
switchToFragment( initialFragmentName, initialArguments, true, false,
mInitialTitle, false);
} else {