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

Merge "Set fontScale in override config to be equal to global." into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-06-08 00:59:43 +00:00
committed by Android (Google) Code Review
parent 96c3e5504b 92ab103cb6
commit c9adac6abb
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1537,6 +1537,11 @@ final class TaskRecord {
? Configuration.ORIENTATION_PORTRAIT ? Configuration.ORIENTATION_PORTRAIT
: Configuration.ORIENTATION_LANDSCAPE; : Configuration.ORIENTATION_LANDSCAPE;
// Always set fontScale to be euqal to global. Can't set to 0, as that makes the override
// config not equal to EMPTY. Also can't set to 1, as Configuration.updateFrom will use
// the override scale as long as it's non-zero, and we'll always use 1.
config.fontScale = serviceConfig.fontScale;
// For calculating screen layout, we need to use the non-decor inset screen area for the // For calculating screen layout, we need to use the non-decor inset screen area for the
// calculation for compatibility reasons, i.e. screen area without system bars that could // calculation for compatibility reasons, i.e. screen area without system bars that could
// never go away in Honeycomb. // never go away in Honeycomb.
@@ -1564,6 +1569,7 @@ final class TaskRecord {
extracted.smallestScreenWidthDp = config.smallestScreenWidthDp; extracted.smallestScreenWidthDp = config.smallestScreenWidthDp;
extracted.orientation = config.orientation; extracted.orientation = config.orientation;
extracted.screenLayout = config.screenLayout; extracted.screenLayout = config.screenLayout;
extracted.fontScale = config.fontScale;
return extracted; return extracted;
} }
@@ -1597,6 +1603,9 @@ final class TaskRecord {
newScreenLayout = (newScreenLayout & ~SCREENLAYOUT_SIZE_MASK) newScreenLayout = (newScreenLayout & ~SCREENLAYOUT_SIZE_MASK)
| (overrideScreenLayout & SCREENLAYOUT_SIZE_MASK); | (overrideScreenLayout & SCREENLAYOUT_SIZE_MASK);
mOverrideConfig.screenLayout = newScreenLayout; mOverrideConfig.screenLayout = newScreenLayout;
// we never override the fontScale, however we need to copy over the global value
// so that the default 1.0 doesn't get applied as an override.
mOverrideConfig.fontScale = globalConfig.fontScale;
} }
static Rect validateBounds(Rect bounds) { static Rect validateBounds(Rect bounds) {