Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE

Browse Source 
This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.

Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
This commit is contained in:
repo sync . build/envsetup.sh lunch passion-eng
2010-09-27 17:39:50 -07:00
parent 68ef7f3c3a
commit 4fc3d2f0b3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/WindowManagerService.java
View File

@@ -3102,8 +3102,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;