From 0920ba5ef14379c773cb3df54fd91b25de2e51ab Mon Sep 17 00:00:00 2001 From: Casey Burkhardt Date: Tue, 3 Aug 2010 12:04:19 -0700 Subject: [PATCH] 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 353dfcb672ad1..b50f0bac853a7 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -3093,8 +3093,11 @@ public class WindowManagerService extends IWindowManager.Stub } 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;