Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c619d827 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Fixing font scale in WindowManagerService. There was a bug that causes... 

Merge "Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting."
parents e618c893 0920ba5e

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

+4 −1
Original line number Diff line number Diff line
@@ -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;