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

Commit 597cf9db authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add back support for force resize developer option." into... 

Merge "Merge "Add back support for force resize developer option." into oc-mr1-dev am: 23b7a8ad am: 1313bf7a"
parents 74dffd0f 71d61fa2

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -97,6 +97,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;
@@ -1581,8 +1582,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)));

    }

    }





    /**

    /**