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

Commit 1eaab2d5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9330113 from 5142dafc to tm-qpr2-release 

Change-Id: Id34097353fab43b4d47957750245ab58da82c1ab
parents 570b88b1 5142dafc

core/java/android/app/ActivityClient.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -227,12 +227,13 @@ public class ActivityClient { 
    }

    }





    /**

    /**

     * Returns the windowing mode of the task that hosts the activity, or {@code -1} if task is not

     * Returns the {@link Configuration} of the task which hosts the Activity, or {@code null} if

     * found.

     * the task {@link Configuration} cannot be obtained.

     */

     */

    public int getTaskWindowingMode(IBinder activityToken) {

    @Nullable

    public Configuration getTaskConfiguration(IBinder activityToken) {

        try {

        try {

            return getActivityClientController().getTaskWindowingMode(activityToken);

            return getActivityClientController().getTaskConfiguration(activityToken);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }

core/java/android/app/IActivityClientController.aidl

+5 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,11 @@ interface IActivityClientController { 
    boolean willActivityBeVisible(in IBinder token);

    boolean willActivityBeVisible(in IBinder token);

    int getDisplayId(in IBinder activityToken);

    int getDisplayId(in IBinder activityToken);

    int getTaskForActivity(in IBinder token, in boolean onlyRoot);

    int getTaskForActivity(in IBinder token, in boolean onlyRoot);

    int getTaskWindowingMode(in IBinder activityToken);

    /**

     * Returns the {@link Configuration} of the task which hosts the Activity, or {@code null} if

     * the task {@link Configuration} cannot be obtained.

     */

    Configuration getTaskConfiguration(in IBinder activityToken);

    IBinder getActivityTokenBelow(IBinder token);

    IBinder getActivityTokenBelow(IBinder token);

    ComponentName getCallingActivity(in IBinder token);

    ComponentName getCallingActivity(in IBinder token);

    String getCallingPackage(in IBinder token);

    String getCallingPackage(in IBinder token);

core/java/android/provider/Settings.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -7775,6 +7775,13 @@ public final class Settings { 
        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =

        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =

                "high_text_contrast_enabled";

                "high_text_contrast_enabled";




















        /**














         * The color contrast, float in [-1, 1], 1 being the highest contrast.














         *














         * @hide














         */














        public static final String CONTRAST_LEVEL = "contrast_level";
























        /**







        /**











         * Setting that specifies whether the display magnification is enabled via a system-wide







         * Setting that specifies whether the display magnification is enabled via a system-wide











         * triple tap gesture. Display magnifications allows the user to zoom in the display content







         * triple tap gesture. Display magnifications allows the user to zoom in the display content

































core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java



+177
−215




























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/com/android/internal/app/ChooserActivity.java



+52
−4




























File changed.
Preview size limit exceeded, changes collapsed.