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

Commit 1313bf7a authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Add back support for force resize developer option." into oc-mr1-dev 

am: 23b7a8ad

Change-Id: Ie167ce8ad4b6efddaa16eb0abca41ee3520229c6
parents 23c0298b 23b7a8ad

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -96,6 +96,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE 
import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;

import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;

import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;

import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;

import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES;

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

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

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.DEFAULT_DISPLAY;
@@ -1580,8 +1581,9 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 
        // A task can not be docked even if it is considered resizeable because it only supports

        // A task can not be docked even if it is considered resizeable because it only supports

        // picture-in-picture mode but has a non-resizeable resizeMode

        // picture-in-picture mode but has a non-resizeable resizeMode

        return mService.mSupportsSplitScreenMultiWindow

        return mService.mSupportsSplitScreenMultiWindow

                && isResizeable(false /* checkSupportsPip */)

                && (mService.mForceResizableActivities

                && !ActivityInfo.isPreserveOrientationMode(mResizeMode);

                        || (isResizeable(false /* checkSupportsPip */)

                                && !ActivityInfo.isPreserveOrientationMode(mResizeMode)));

    }

    }





    /**

    /**