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

Commit 4a48a7f9 authored by Garfield Tan's avatar Garfield Tan
Browse files

Use correct density to calculcate min dimen. 

Bug: None
Test: Launch size is correct on secondary display with lower density
than the primary display.

Change-Id: Ie9efb041884a77f97358315285931a4a016a8afa
parent a3549830

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+11 −9
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.Display.INVALID_DISPLAY;

import static android.view.Display.TYPE_VIRTUAL;

import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;



import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FOCUS;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_IDLE;
@@ -97,7 +96,6 @@ import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_WHITELISTED; 
import static com.android.server.am.TaskRecord.REPARENT_KEEP_STACK_AT_FRONT;

import static com.android.server.am.TaskRecord.REPARENT_LEAVE_STACK_IN_PLACE;

import static com.android.server.am.TaskRecord.REPARENT_MOVE_STACK_TO_FRONT;



import static java.lang.Integer.MAX_VALUE;



import android.Manifest;
@@ -132,6 +130,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Rect;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager.DisplayListener;
@@ -156,6 +155,7 @@ import android.provider.MediaStore; 
import android.service.voice.IVoiceInteractionSession;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.IntArray;

import android.util.MergedConfiguration;
@@ -445,7 +445,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 


    // The default minimal size that will be used if the activity doesn't specify its minimal size.

    // It will be calculated when the default display gets added.

    int mDefaultMinSizeOfResizeableTask = -1;

    int mDefaultMinSizeOfResizeableTaskDp = -1;



    // Whether tasks have moved and we need to rank the tasks before next OOM scoring

    private boolean mTaskLayersChanged = true;
@@ -689,8 +689,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                mDefaultDisplay = activityDisplay;

            }

            addChild(activityDisplay, ActivityDisplay.POSITION_TOP);

            calculateDefaultMinimalSizeOfResizeableTasks(activityDisplay);

        }

        calculateDefaultMinimalSizeOfResizeableTasks();



        final ActivityDisplay defaultDisplay = getDefaultDisplay();

        mHomeStack = mLastFocusedStack = defaultDisplay.getOrCreateStack(
@@ -4319,7 +4319,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        // The display hasn't been added to ActivityManager yet, create a new record now.

        activityDisplay = new ActivityDisplay(this, display);

        addChild(activityDisplay, ActivityDisplay.POSITION_BOTTOM);

        calculateDefaultMinimalSizeOfResizeableTasks(activityDisplay);

        mWindowManager.onDisplayAdded(displayId);

        return activityDisplay;

    }
@@ -4337,10 +4336,13 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        mActivityDisplays.remove(activityDisplay);

    }



    private void calculateDefaultMinimalSizeOfResizeableTasks(ActivityDisplay display) {

        mDefaultMinSizeOfResizeableTask =

                mService.mContext.getResources().getDimensionPixelSize(

    private void calculateDefaultMinimalSizeOfResizeableTasks() {

        final Resources res = mService.mContext.getResources();

        final float minimalSize = res.getDimension(

                com.android.internal.R.dimen.default_minimal_size_resizable_task);

        final DisplayMetrics dm = res.getDisplayMetrics();



        mDefaultMinSizeOfResizeableTaskDp = (int) (minimalSize / dm.density);

    }



    private void handleDisplayRemoved(int displayId) {

services/core/java/com/android/server/am/TaskRecord.java

+10 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VER 
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS;
@@ -75,7 +74,6 @@ import static com.android.server.am.TaskRecordProto.ORIG_ACTIVITY; 
import static com.android.server.am.TaskRecordProto.REAL_ACTIVITY;

import static com.android.server.am.TaskRecordProto.RESIZE_MODE;

import static com.android.server.am.TaskRecordProto.STACK_ID;



import static java.lang.Integer.MAX_VALUE;



import android.annotation.IntDef;
@@ -1686,11 +1684,19 @@ public class TaskRecord extends ConfigurationContainer implements TaskWindowCont 
        // so that the user can not render the task too small to manipulate. We don't need

        // to do this for the pinned stack as the bounds are controlled by the system.

        if (!inPinnedWindowingMode()) {

            final int defaultMinSizeDp =

                    mService.mStackSupervisor.mDefaultMinSizeOfResizeableTaskDp;

            final ActivityDisplay display =

                    mService.mStackSupervisor.getActivityDisplay(mStack.mDisplayId);

            final float density =

                    (float) display.getConfiguration().densityDpi / DisplayMetrics.DENSITY_DEFAULT;

            final int defaultMinSize = (int) (defaultMinSizeDp * density);



            if (minWidth == INVALID_MIN_SIZE) {

                minWidth = mService.mStackSupervisor.mDefaultMinSizeOfResizeableTask;

                minWidth = defaultMinSize;

            }

            if (minHeight == INVALID_MIN_SIZE) {

                minHeight = mService.mStackSupervisor.mDefaultMinSizeOfResizeableTask;

                minHeight = defaultMinSize;

            }

        }

        final boolean adjustWidth = minWidth > bounds.width();