diff options
| author | Pankaj Garg <pgarg@codeaurora.org> | 2015-03-20 14:11:01 -0700 |
|---|---|---|
| committer | WebTech Code Review <code-review@localhost> | 2015-03-25 07:57:06 -0700 |
| commit | e23050271f10e77f93581b2ffe0311a1aaaf4753 (patch) | |
| tree | 9c30ef57745ffb6992624f7ea8001c035bb5ef7c | |
| parent | 2fa0ba1975fb015818c7602789ad03988c84d479 (diff) | |
| download | android_packages_apps_Gello-e23050271f10e77f93581b2ffe0311a1aaaf4753.tar.gz android_packages_apps_Gello-e23050271f10e77f93581b2ffe0311a1aaaf4753.tar.bz2 android_packages_apps_Gello-e23050271f10e77f93581b2ffe0311a1aaaf4753.zip | |
Fix browser Privacy and Security settings for screen rotation
Fixed following issues
- Display reverts to browser's main settings panel from Privacy
and Security panel on screen rotation
- Crash when screen shows Clear Stored Data popup and device is
rotated
Change-Id: Iaf0c3aea2e8b8e77b449b540bc62f522040179ef
| -rw-r--r-- | res/xml/general_preferences.xml | 6 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserYesNoPreference.java | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 6cdd04c6..a1f2d256 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -51,8 +51,10 @@ <PreferenceCategory android:title="@string/pref_extras_title" android:key="advanced"> - <PreferenceScreen android:title="@string/pref_privacy_security_title"> - <PreferenceScreen android:title="@string/webstorage_clear_data_title"> + <PreferenceScreen android:title="@string/pref_privacy_security_title" + android:key="privacy_security"> + <PreferenceScreen android:title="@string/webstorage_clear_data_title" + android:key="clear_data"> <com.android.browser.BrowserYesNoPreference android:dialogIcon="@android:drawable/ic_dialog_alert" android:dialogMessage="@string/pref_privacy_clear_selected_dlg" diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java index 966d968f..6fdde2cf 100644 --- a/src/com/android/browser/BrowserYesNoPreference.java +++ b/src/com/android/browser/BrowserYesNoPreference.java @@ -89,9 +89,10 @@ class BrowserYesNoPreference extends DialogPreference { protected void onDialogClosed(boolean positiveResult) { super.onDialogClosed(positiveResult); + if (!positiveResult) + return; + if (callChangeListener(positiveResult)) { - if (!positiveResult) - return; setEnabled(false); BrowserSettings settings = BrowserSettings.getInstance(); if (PreferenceKeys.PREF_CLEAR_SELECTED_DATA.equals(getKey())) { |