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

am 33aa0fad: am cab9fe2d: Merge change I3c9f79ba into eclair-mr2

Browse Source 
Merge commit '33aa0fadf8cb0a7e4a4f23af17b30959927f083e'

* commit '33aa0fadf8cb0a7e4a4f23af17b30959927f083e':
  Retain webview history when viewing Safety notices. Fixes #2160518
This commit is contained in:
Amith Yamasani
2009-10-12 11:43:56 -07:00
committed by Android Git Automerger
parent 729aee7894 33aa0fadf8
commit a1dfb94679
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/SettingsSafetyLegalActivity.java
View File

@@ -58,7 +58,11 @@ public class SettingsSafetyLegalActivity extends AlertActivity
// Begin accessing
mWebView.getSettings().setJavaScriptEnabled(true);
mWebView.loadUrl(userSafetylegalUrl);
if (savedInstanceState == null) {
mWebView.loadUrl(userSafetylegalUrl);
} else {
mWebView.restoreState(savedInstanceState);
}
mWebView.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
@@ -110,4 +114,10 @@ public class SettingsSafetyLegalActivity extends AlertActivity
public void onCancel(DialogInterface dialog) {
finish();
}
@Override
public void onSaveInstanceState(Bundle icicle) {
mWebView.saveState(icicle);
super.onSaveInstanceState(icicle);
}
}