commit 79da62dce8f7b27f727e2dac35fda7ec003d1ec8
author Dianne Hackborn <hackbod@google.com> Tue Jul 19 18:07:51 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 18:07:51 2011 -0700
tree 34d18816dbdae60b9dced2e13977a3246adcbdbd
parent 6ba9e021d40b0232c5d46afb366cf986b3fa9ce4
parent 92c8ebacc118f23df94431f531075a8837394829

Merge "Fix issue #4976176: Font size setting does not persist"

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index a2d7d8c..578268d 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -295,7 +295,7 @@
             try {
                 mCurConfig.fontScale = mToggleLargeTextCheckBox.isChecked()
                         ? LARGE_FONT_SCALE : 1;
-                ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+                ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
             } catch (RemoteException e) {
             }
         } else if (POWER_BUTTON_ENDS_CALL_CHECKBOX.equals(key)) {

src/com/android/settings/Display.java

diff --git a/src/com/android/settings/Display.java b/src/com/android/settings/Display.java
index f90e0f0..fa29318 100644
--- a/src/com/android/settings/Display.java
+++ b/src/com/android/settings/Display.java
@@ -105,7 +105,7 @@
 
     public void onClick(View v) {
         try {
-            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
         } catch (RemoteException e) {
         }
         finish();

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 6ab88d0..ae7a4ef 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -203,7 +203,7 @@
     public void writeFontSizePreference(Object objValue) {
         try {
             mCurConfig.fontScale = Float.parseFloat(objValue.toString());
-            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
         } catch (RemoteException e) {
             Log.w(TAG, "Unable to save font size");
         }