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

Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-20 01:32:33 +00:00
committed by Android (Google) Code Review
parent ad426ee3f8 6212e2a6d0
commit dd5f3cd7fb
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/Task.java
View File

@@ -2382,8 +2382,16 @@ class Task extends WindowContainer<WindowContainer> {
// 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 never go away in Honeycomb.
final int compatScreenWidthDp = (int) (mTmpNonDecorBounds.width() / density);
final int compatScreenHeightDp = (int) (mTmpNonDecorBounds.height() / density);
int compatScreenWidthDp = (int) (mTmpNonDecorBounds.width() / density);
int compatScreenHeightDp = (int) (mTmpNonDecorBounds.height() / density);
// Use overrides if provided. If both overrides are provided, mTmpNonDecorBounds is
// undefined so it can't be used.
if (inOutConfig.screenWidthDp != Configuration.SCREEN_WIDTH_DP_UNDEFINED) {
compatScreenWidthDp = inOutConfig.screenWidthDp;
}
if (inOutConfig.screenHeightDp != Configuration.SCREEN_HEIGHT_DP_UNDEFINED) {
compatScreenHeightDp = inOutConfig.screenHeightDp;
}
// Reducing the screen layout starting from its parent config.
inOutConfig.screenLayout = computeScreenLayoutOverride(parentConfig.screenLayout,
compatScreenWidthDp, compatScreenHeightDp);

2
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -541,7 +541,7 @@ public class ActivityRecordTests extends ActivityTestsBase {
mActivity = new ActivityBuilder(mService)
.setTask(mTask)
.setLaunchTaskBehind(true)
.setConfigChanges(CONFIG_ORIENTATION)
.setConfigChanges(CONFIG_ORIENTATION | CONFIG_SCREEN_LAYOUT)
.build();
mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing");

25
services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java
View File

@@ -402,6 +402,31 @@ public class TaskRecordTests extends ActivityTestsBase {
assertEquals(Configuration.ORIENTATION_LANDSCAPE, inOutConfig.orientation);
}
@Test
public void testComputeConfigResourceLayoutOverrides() {
final Rect fullScreenBounds = new Rect(0, 0, 1000, 2500);
TestDisplayContent display = new TestDisplayContent.Builder(
mService, fullScreenBounds.width(), fullScreenBounds.height()).build();
final Task task = new TaskBuilder(mSupervisor).setDisplay(display).build();
final Configuration inOutConfig = new Configuration();
final Configuration parentConfig = new Configuration();
final Rect nonLongBounds = new Rect(0, 0, 1000, 1250);
parentConfig.windowConfiguration.setBounds(fullScreenBounds);
parentConfig.windowConfiguration.setAppBounds(fullScreenBounds);
parentConfig.densityDpi = 400;
parentConfig.screenHeightDp = (fullScreenBounds.bottom * 160) / parentConfig.densityDpi;
parentConfig.screenWidthDp = (fullScreenBounds.right * 160) / parentConfig.densityDpi;
parentConfig.windowConfiguration.setRotation(ROTATION_0);
// Set BOTH screenW/H to an override value
inOutConfig.screenWidthDp = nonLongBounds.width() * 160 / parentConfig.densityDpi;
inOutConfig.screenHeightDp = nonLongBounds.height() * 160 / parentConfig.densityDpi;
task.computeConfigResourceOverrides(inOutConfig, parentConfig);
// screenLayout should honor override when both screenW/H are set.
assertTrue((inOutConfig.screenLayout & Configuration.SCREENLAYOUT_LONG_NO) != 0);
}
@Test
public void testComputeNestedConfigResourceOverrides() {
final Task task = new TaskBuilder(mSupervisor).build();