Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513' * commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513': Fix #1930767 : "Share with Google" not working on orientation change.
This commit is contained in:
committed by
The Android Open Source Project
commit
5541e98406
@@ -153,9 +153,10 @@ public class SecuritySettings extends PreferenceActivity implements
|
||||
null);
|
||||
mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
|
||||
mContentQueryMap.addObserver(new SettingsObserver());
|
||||
boolean doneUseLocation = savedInstanceState != null
|
||||
&& savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
|
||||
if (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false) && !doneUseLocation) {
|
||||
boolean doneUseLocation = savedInstanceState == null
|
||||
? false : savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
|
||||
if (!doneUseLocation && (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false)
|
||||
|| savedInstanceState != null)) {
|
||||
showUseLocationDialog(true);
|
||||
}
|
||||
|
||||
@@ -264,12 +265,12 @@ public class SecuritySettings extends PreferenceActivity implements
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
public void onStop() {
|
||||
if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) {
|
||||
mUseLocationDialog.dismiss();
|
||||
}
|
||||
mUseLocationDialog = null;
|
||||
super.onPause();
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user