diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-07-13 16:59:36 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-13 16:59:36 -0700 |
| commit | 5541e9840649785bbc188f20a727fe7307eb74af (patch) | |
| tree | c2036a9ab45d2212239fd88c8f07dfcd05da1fc0 /src/com/android/settings/SecuritySettings.java | |
| parent | 50cde8b1f32526eb6eebdfa6d1d64c2f8142b6ea (diff) | |
| parent | 5c30845cf310a5d8c2de3e9ac809c97f736a9513 (diff) | |
| download | packages_apps_Settings-5541e9840649785bbc188f20a727fe7307eb74af.tar.gz packages_apps_Settings-5541e9840649785bbc188f20a727fe7307eb74af.tar.bz2 packages_apps_Settings-5541e9840649785bbc188f20a727fe7307eb74af.zip | |
am 5c30845c: Fix #1930767 : "Share with Google" not working on orientation change.
Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513'
* commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513':
Fix #1930767 : "Share with Google" not working on orientation change.
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 831da7263..e2e098a08 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -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 |