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

Commit 72790bad authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Use feature instead of hidden config for multi-display" into oc-dev

parents 89628f88 1981f5fd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10616,6 +10616,7 @@ package android.content.pm { 
    field public static final int DONT_KILL_APP = 1; // 0x1

    field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";

    field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";

    field public static final java.lang.String FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS = "android.software.activities_on_secondary_displays";

    field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";

    field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";

    field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11300,6 +11300,7 @@ package android.content.pm { 
    field public static final java.lang.String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";

    field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";

    field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";

    field public static final java.lang.String FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS = "android.software.activities_on_secondary_displays";

    field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";

    field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";

    field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10655,6 +10655,7 @@ package android.content.pm { 
    field public static final int DONT_KILL_APP = 1; // 0x1

    field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";

    field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";

    field public static final java.lang.String FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS = "android.software.activities_on_secondary_displays";

    field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";

    field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";

    field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";

core/java/android/app/ActivityManager.java

+0 −10
Original line number Diff line number Diff line
@@ -1117,16 +1117,6 @@ public class ActivityManager { 
                    com.android.internal.R.bool.config_supportsSplitScreenMultiWindow);

    }



    /**

     * Returns true if the system supports running activities on secondary displays.

     * @hide

     */

    static public boolean supportsMultiDisplay() {

        return !isLowRamDeviceStatic()

                && Resources.getSystem().getBoolean(

                    com.android.internal.R.bool.config_supportsMultiDisplay);

    }



    /**

     * Return the maximum number of actions that will be displayed in the picture-in-picture UI when

     * the user interacts with the activity currently in picture-in-picture mode.

core/java/android/app/ActivityOptions.java

+8 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class ActivityOptions { 


    /**

     * The display id the activity should be launched into.

     * @see #setLaunchDisplayId(int)

     * @hide

     */

    private static final String KEY_LAUNCH_DISPLAY_ID = "android.activity.launchDisplayId";
@@ -1038,6 +1039,7 @@ public class ActivityOptions { 
     * Gets the id of the display where activity should be launched.

     * @return The id of the display where activity should be launched,

     *         {@link android.view.Display#INVALID_DISPLAY} if not set.

     * @see #setLaunchDisplayId(int)

     */

    public int getLaunchDisplayId() {

        return mLaunchDisplayId;
@@ -1045,6 +1047,12 @@ public class ActivityOptions { 


    /**

     * Sets the id of the display where activity should be launched.

     * An app can launch activities on public displays or private displays that are owned by the app

     * or where an app already has activities. Otherwise, trying to launch on a private display

     * or providing an invalid display id will result in an exception.

     * <p>

     * Setting launch display id will be ignored on devices that don't have

     * {@link android.content.pm.PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}.

     * @param launchDisplayId The id of the display where the activity should be launched.

     * @return {@code this} {@link ActivityOptions} instance.

     */