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

Merge "Make sure fontScale in configuration sent to app is equal to global" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-06-20 18:02:48 +00:00
committed by Android (Google) Code Review
parent e416a4200a 6be533ef6c
commit 7c6692646c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -444,10 +444,17 @@ final class ActivityRecord {
return; return;
} }
try { try {
// Make sure fontScale is always equal to global. For fullscreen apps, config is
// the shared EMPTY config, which has default fontScale of 1.0. We don't want it
// to be applied as an override config.
Configuration overrideConfig = new Configuration(config);
overrideConfig.fontScale = service.mConfiguration.fontScale;
if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " + if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " +
"reportToActivity=" + reportToActivity + " and config: " + config); "reportToActivity=" + reportToActivity + " and config: " + overrideConfig);
app.thread.scheduleActivityConfigurationChanged( app.thread.scheduleActivityConfigurationChanged(
appToken, new Configuration(config), reportToActivity); appToken, overrideConfig, reportToActivity);
} catch (RemoteException e) { } catch (RemoteException e) {
// If process died, whatever. // If process died, whatever.
} }