commit 0920ba5ef14379c773cb3df54fd91b25de2e51ab
author Casey Burkhardt <caseyburkhardt@google.com> Tue Aug 03 12:04:19 2010 -0700
committer Charles Chen <clchen@google.com> Tue Aug 03 12:22:47 2010 -0700
tree e3eb7c0918aa5b17440bce209c2bb2d8d8f9b9ae
parent 532abb65308725c649fe94ba485abc24ece05b2e

Fixing font scale in WindowManagerService.
There was a bug that causes WindowManagerService to lose
the fontScale setting.

This fix submitted on behalf of Casey Burkhardt.

Change-Id: I3a76de15adf13badc5efca8d620d14c972a96ec4

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 353dfcb..b50f0ba 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -3093,8 +3093,11 @@
                 
             } else if (currentConfig != null) {
                 // No obvious action we need to take, but if our current
-                // state mismatches the activity maanager's, update it
+                // state mismatches the activity manager's, update it,
+                // disregarding font scale, which should remain set to
+                // the value of the previous configuration.
                 mTempConfiguration.setToDefaults();
+                mTempConfiguration.fontScale = currentConfig.fontScale;
                 if (computeNewConfigurationLocked(mTempConfiguration)) {
                     if (currentConfig.diff(mTempConfiguration) != 0) {
                         mWaitingForConfig = true;