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

Commit fbe12c4e authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Added PackageManager#FEATURE_PICTURE_IN_PICTURE 

Indicating that a device supports picture-in-picture
multi-window mode.

Also allow activities to be in Pip mode if force resizeable
is enabled.

Bug: 25580820
Bug: 26187878
Change-Id: If80edfee39ece5a51d21040e4d3a8a9135aa1783
parent 1d724e02

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9531,6 +9531,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";

    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";

    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";

    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9848,6 +9848,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";

    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";

    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";

    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9531,6 +9531,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";

    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";

    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";

    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

core/java/android/content/pm/PackageManager.java

+7 −0
Original line number Diff line number Diff line
@@ -1761,6 +1761,13 @@ public abstract class PackageManager { 
    public static final String FEATURE_FREEFORM_WINDOW_MANAGEMENT

            = "android.software.freeform_window_management";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports picture-in-picture multi-window mode.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports creating secondary users and managed profiles via

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

+18 −9
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ import static android.app.ActivityManager.StackId.HOME_STACK_ID; 
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;

import static android.app.ActivityManager.StackId.PINNED_STACK_ID;

import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;

import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

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

import static android.provider.Settings.Global.DEBUG_APP;
@@ -1279,6 +1280,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    boolean mAlwaysFinishActivities = false;

    boolean mForceResizableActivities;

    boolean mSupportsFreeformWindowManagement;

    boolean mSupportsPictureInPicture;

    IActivityController mController = null;

    String mProfileApp = null;

    ProcessRecord mProfileProc = null;
@@ -9400,6 +9402,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
        enforceCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS,

                "moveTopActivityToPinnedStack()");

        synchronized (this) {

            if (!mSupportsPictureInPicture) {

                throw new IllegalStateException("moveTopActivityToPinnedStack:"

                        + "Device doesn't support picture-in-pciture mode");

            }















            long ident = Binder.clearCallingIdentity();















            try {















                return mStackSupervisor.moveTopStackActivityToPinnedStackLocked(stackId, bounds);










@@ -12014,6 +12021,8 @@ public final class ActivityManagerService extends ActivityManagerNative













        final ContentResolver resolver = mContext.getContentResolver();















        final boolean freeformWindowManagement =















                mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT);













        final boolean supportsPictureInPicture =













                mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE);





























        final String debugApp = Settings.Global.getString(resolver, DEBUG_APP);















        final boolean waitForDebugger = Settings.Global.getInt(resolver, WAIT_FOR_DEBUGGER, 0) != 0;









@@ -12039,20 +12048,21 @@ public final class ActivityManagerService extends ActivityManagerNative













            mAlwaysFinishActivities = alwaysFinishActivities;















            mForceResizableActivities = forceResizable;















            mSupportsFreeformWindowManagement = freeformWindowManagement || forceResizable;













            mSupportsPictureInPicture = supportsPictureInPicture || forceResizable;















            // This happens before any activities are started, so we can















            // change mConfiguration in-place.















            updateConfigurationLocked(configuration, null, true);















            if (DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,















                    "Initial config: " + mConfiguration);













        }













    }



























    /** Loads resources after the current configuration has been set. */













    private void loadResourcesOnSystemReady() {













            // Load resources only after the current configuration has been set.















            final Resources res = mContext.getResources();















            mHasRecents = res.getBoolean(com.android.internal.R.bool.config_hasRecents);













        mThumbnailWidth = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_width);













        mThumbnailHeight = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_height);













            mThumbnailWidth = res.getDimensionPixelSize(













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













            mThumbnailHeight = res.getDimensionPixelSize(













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













        }















    }





























    public boolean testIsSystemReady() {










@@ -12368,7 +12378,6 @@ public final class ActivityManagerService extends ActivityManagerNative













        }





























        retrieveSettings();













        loadResourcesOnSystemReady();















        final int currentUserId;















        synchronized (this) {















            currentUserId = mUserController.getCurrentUserIdLocked();