Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 944a7a61 authored by Alex Chau's avatar Alex Chau
Browse files

Use BaseContainerInterface.getTaskDimension for windowSize in DesktopTaskView 

- Instead of using widthPx/heightPx, use BaseContainerInterface.getTaskDimension that takes into account of whether Taskbar is persistent or pinned

Fix: 336788597
Test: Swipe up from Desktop; press recents button from Desktop
Flag: ACONFIG com.android.window.flags.enable_desktop_windowing_mode DEVELOPMENT
Change-Id: I04d3b5bbc577ea650f8a9dc45cc6d01bca3f6466
parent de68b73d

quickstep/src/com/android/quickstep/views/DesktopTaskView.java

+8 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO 
import android.content.Context;

import android.content.pm.PackageManager;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;
@@ -45,6 +46,7 @@ import com.android.launcher3.desktop.DesktopRecentsTransitionController; 
import com.android.launcher3.icons.IconProvider;

import com.android.launcher3.util.CancellableTask;

import com.android.launcher3.util.RunnableList;

import com.android.quickstep.BaseContainerInterface;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.TaskThumbnailCache;

import com.android.quickstep.util.RecentsOrientedState;
@@ -87,6 +89,8 @@ public class DesktopTaskView extends TaskView { 


    private int mChildCountAtInflation;



    private final PointF mTempPointF = new PointF();



    public DesktopTaskView(Context context) {

        this(context, null);

    }
@@ -431,8 +435,10 @@ public class DesktopTaskView extends TaskView { 
            return;

        }



        int windowWidth = mContainer.getDeviceProfile().widthPx;

        int windowHeight = mContainer.getDeviceProfile().heightPx;

        BaseContainerInterface.getTaskDimension(mContext, mContainer.getDeviceProfile(),

                mTempPointF);

        int windowWidth = (int) mTempPointF.x;

        int windowHeight = (int) mTempPointF.y;



        float scaleWidth = containerWidth / (float) windowWidth;

        float scaleHeight = containerHeight / (float) windowHeight;