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

Merge "Don't override activity display adjustments with app config" into rvc-dev

Browse Source
This commit is contained in:
Darryl Johnson
2020-05-01 23:05:10 +00:00
committed by Android (Google) Code Review
parent 5b94d36275 e810bc539e
commit ceb2befc1b
2 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/app/ResourcesManager.java
View File

@@ -1109,10 +1109,16 @@ public class ResourcesManager {
Slog.v(TAG, "Changing resources "
+ resourcesImpl + " config to: " + config);
}
int displayId = key.mDisplayId;
final boolean hasOverrideConfiguration = key.hasOverrideConfiguration();
tmpConfig.setTo(config);
// Apply the override configuration before setting the display adjustments to ensure that
// the process config does not override activity display adjustments.
final boolean hasOverrideConfiguration = key.hasOverrideConfiguration();
if (hasOverrideConfiguration) {
tmpConfig.updateFrom(key.mOverrideConfiguration);
}
// Get new DisplayMetrics based on the DisplayAdjustments given to the ResourcesImpl. Update
// a copy if the CompatibilityInfo changed, because the ResourcesImpl object will handle the
// update internally.
@@ -1121,17 +1127,23 @@ public class ResourcesManager {
daj = new DisplayAdjustments(daj);
daj.setCompatibilityInfo(compat);
}
final int displayId = key.mDisplayId;
if (displayId == Display.DEFAULT_DISPLAY) {
daj.setConfiguration(config);
daj.setConfiguration(tmpConfig);
}
DisplayMetrics dm = getDisplayMetrics(displayId, daj);
if (displayId != Display.DEFAULT_DISPLAY) {
applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
// Re-apply the override configuration to ensure that configuration contexts based on
// a display context (ex: createDisplayContext().createConfigurationContext()) have the
// correct override.
if (hasOverrideConfiguration) {
tmpConfig.updateFrom(key.mOverrideConfiguration);
}
}
if (hasOverrideConfiguration) {
tmpConfig.updateFrom(key.mOverrideConfiguration);
}
resourcesImpl.updateConfiguration(tmpConfig, dm, compat);
}