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

Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: Idc8047b94dfdd52bd719a2a4b711b2d654fd1a56
This commit is contained in:
Issei Suzuki
2020-06-23 11:59:08 +00:00
committed by Automerger Merge Worker
parent ba2cfaafe5 16868fbef0
commit 99722aad6d
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/ActivityView.java
View File

@@ -33,7 +33,10 @@ import android.hardware.display.VirtualDisplay;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.DisplayInfo;
import android.view.IWindow; import android.view.IWindow;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -407,6 +410,9 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
} }
private class SurfaceCallback implements SurfaceHolder.Callback { private class SurfaceCallback implements SurfaceHolder.Callback {
private final DisplayInfo mTempDisplayInfo = new DisplayInfo();
private final DisplayMetrics mTempMetrics = new DisplayMetrics();
@Override @Override
public void surfaceCreated(SurfaceHolder surfaceHolder) { public void surfaceCreated(SurfaceHolder surfaceHolder) {
if (!mTaskEmbedder.isInitialized()) { if (!mTaskEmbedder.isInitialized()) {
@@ -415,14 +421,22 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
mTmpTransaction.reparent(mTaskEmbedder.getSurfaceControl(), mTmpTransaction.reparent(mTaskEmbedder.getSurfaceControl(),
mSurfaceView.getSurfaceControl()).apply(); mSurfaceView.getSurfaceControl()).apply();
} }
mTaskEmbedder.resizeTask(getWidth(), getHeight());
mTaskEmbedder.start(); mTaskEmbedder.start();
} }
@Override @Override
public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) {
final Display display = getVirtualDisplay().getDisplay();
if (!display.getDisplayInfo(mTempDisplayInfo)) {
return;
}
mTempDisplayInfo.getAppMetrics(mTempMetrics);
if (width != mTempMetrics.widthPixels || height != mTempMetrics.heightPixels) {
mTaskEmbedder.resizeTask(width, height); mTaskEmbedder.resizeTask(width, height);
mTaskEmbedder.notifyBoundsChanged(); mTaskEmbedder.notifyBoundsChanged();
} }
}
@Override @Override
public void surfaceDestroyed(SurfaceHolder surfaceHolder) { public void surfaceDestroyed(SurfaceHolder surfaceHolder) {