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

Merge "Ignore the negative minWidth/minHeight populated from windowLayout" into rvc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-04-03 20:28:27 +00:00
committed by Android (Google) Code Review
parent 74153ee3e8 907fd630a6
commit 56889eb7ba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -37,7 +37,6 @@ import android.graphics.Rect;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import android.util.Size; import android.util.Size;
import android.view.SurfaceControl; import android.view.SurfaceControl;
@@ -541,7 +540,12 @@ public class PipTaskOrganizer extends TaskOrganizer {
return null; return null;
} }
final ActivityInfo.WindowLayout windowLayout = activityInfo.windowLayout; final ActivityInfo.WindowLayout windowLayout = activityInfo.windowLayout;
return new Size(windowLayout.minWidth, windowLayout.minHeight); // -1 will be populated if an activity specifies defaultWidth/defaultHeight in <layout>
// without minWidth/minHeight
if (windowLayout.minWidth > 0 && windowLayout.minHeight > 0) {
return new Size(windowLayout.minWidth, windowLayout.minHeight);
}
return null;
} }
private float getAspectRatioOrDefault(@Nullable PictureInPictureParams params) { private float getAspectRatioOrDefault(@Nullable PictureInPictureParams params) {