commit 1ccd78cd6877116a81a37046a101af01e53fb8f3
author Satoshi Kataoka <satok@google.com> Tue Jul 30 03:52:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 03:52:42 2013 +0000
tree be1bbba31c5d19a7a9cb531bca63685554b962c7
parent 7e9d6a8e558ad9208499bc4b6b83fc8f1649ad17
parent 4b6603cb7981d99a6609a7de610d1f2c35f47074

Merge "Fix the displayed name of the personal dictionary"

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index db68a14..8ed9a7e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1107,16 +1107,14 @@
 
     private void writeExperimentalWebViewOptions() {
         if (mExperimentalWebView != null) {
-            SystemProperties.set(WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY,
-                    mExperimentalWebView.isChecked() ? "true" : null);
+            WebViewFactory.setUseExperimentalWebView(mExperimentalWebView.isChecked());
             pokeSystemProperties();
         }
     }
 
     private void updateExperimentalWebViewOptions() {
         if (mExperimentalWebView != null) {
-            updateCheckBox(mExperimentalWebView, SystemProperties.getBoolean(
-                    WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, false));
+            updateCheckBox(mExperimentalWebView, WebViewFactory.useExperimentalWebView());
         }
     }
 

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cb35e10..24f56c1 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -646,6 +646,8 @@
                         ap = new AccessPoint(getActivity(), mAccessPointSavedState);
                         // For repeated orientation changes
                         mDlgAccessPoint = ap;
+                        // Reset the saved access point data
+                        mAccessPointSavedState = null;
                     }
                 }
                 // If it's still null, fine, it's for Add Network