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

am cab9fe2d: Merge change I3c9f79ba into eclair-mr2

Browse Source 
Merge commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57' into eclair-mr2-plus-aosp

* commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57':
  Retain webview history when viewing Safety notices. Fixes #2160518
This commit is contained in:
Amith Yamasani
2009-10-06 15:18:15 -07:00
committed by Android Git Automerger
parent ec77e2b0fa cab9fe2d41
commit 33aa0fadf8
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);
}
}