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

Commit 06b770cf authored by Mady Mellor's avatar Mady Mellor
Browse files

qt-r1-bubbles-dev @ build 5835883 

Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
parents 428f61ca af098fbf

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -2372,6 +2372,7 @@ package android.provider { 
    field public static final String LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST = "location_ignore_settings_package_whitelist";

    field public static final String LOW_POWER_MODE = "low_power";

    field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";

    field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";

  }
@@ -2395,7 +2396,7 @@ package android.provider { 
    field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";

    field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

cmds/statsd/src/atoms.proto

+2 −1
Original line number Diff line number Diff line
@@ -5939,7 +5939,8 @@ message BubbleUIChanged { 
    optional bool is_ongoing = 10;



    // Whether the bubble is produced by an app running in foreground.

    optional bool is_foreground = 11;

    // This is deprecated and the value should be ignored.

    optional bool is_foreground = 11 [deprecated = true];

}



/**

core/java/android/app/ITaskStackListener.aidl

+7 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ oneway interface ITaskStackListener { 
     */

    void onSingleTaskDisplayDrawn(int displayId);



    /*

     * Called when the last task is removed from a display which can only contain one task.

     *

     * @param displayId the id of the display from which the window is removed.

     */

    void onSingleTaskDisplayEmpty(int displayId);



    /**

     * Called when a task is reparented to a stack on a different display.

     *

core/java/android/app/Notification.java

+29 −5
Original line number Diff line number Diff line
@@ -8542,24 +8542,34 @@ public class Notification implements Parcelable 
         * If set and the app creating the bubble is in the foreground, the bubble will be posted

         * in its expanded state, with the contents of {@link #getIntent()} in a floating window.

         *

         * <p>If the app creating the bubble is not in the foreground this flag has no effect.</p>

         * <p>This flag has no effect if the app posting the bubble is not in the foreground.

         * The app is considered foreground if it is visible and on the screen, note that

         * a foreground service does not qualify.

         * </p>

         *

         * <p>Generally this flag should only be set if the user has performed an action to request

         * or create a bubble.</p>

         *

         * @hide

         */

        private static final int FLAG_AUTO_EXPAND_BUBBLE = 0x00000001;

        public static final int FLAG_AUTO_EXPAND_BUBBLE = 0x00000001;



        /**

         * If set and the app posting the bubble is in the foreground, the bubble will

         * be posted <b>without</b> the associated notification in the notification shade.

         *

         * <p>If the app posting the bubble is not in the foreground this flag has no effect.</p>

         * <p>This flag has no effect if the app posting the bubble is not in the foreground.

         * The app is considered foreground if it is visible and on the screen, note that

         * a foreground service does not qualify.

         * </p>

         *

         * <p>Generally this flag should only be set if the user has performed an action to request

         * or create a bubble, or if the user has seen the content in the notification and the

         * notification is no longer relevant.</p>

         *

         * @hide

         */

        private static final int FLAG_SUPPRESS_NOTIFICATION = 0x00000002;

        public static final int FLAG_SUPPRESS_NOTIFICATION = 0x00000002;



        private BubbleMetadata(PendingIntent expandIntent, PendingIntent deleteIntent,

                Icon icon, int height, @DimenRes int heightResId) {
@@ -8675,10 +8685,20 @@ public class Notification implements Parcelable 
            out.writeInt(mDesiredHeightResId);

        }



        private void setFlags(int flags) {

        /**

         * @hide

         */

        public void setFlags(int flags) {

            mFlags = flags;

        }



        /**

         * @hide

         */

        public int getFlags() {

            return mFlags;

        }



        /**

         * Builder to construct a {@link BubbleMetadata} object.

         */
@@ -8795,6 +8815,8 @@ public class Notification implements Parcelable 
             * {@link #getIntent()} in a floating window).

             *

             * <p>This flag has no effect if the app posting the bubble is not in the foreground.

             * The app is considered foreground if it is visible and on the screen, note that

             * a foreground service does not qualify.

             * </p>

             *

             * <p>Generally, this flag should only be set if the user has performed an action to
@@ -8813,6 +8835,8 @@ public class Notification implements Parcelable 
             * the notification shade.

             *

             * <p>This flag has no effect if the app posting the bubble is not in the foreground.

             * The app is considered foreground if it is visible and on the screen, note that

             * a foreground service does not qualify.

             * </p>

             *

             * <p>Generally, this flag should only be set if the user has performed an action to

core/java/android/app/TaskStackListener.java

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    public void onSingleTaskDisplayDrawn(int displayId) throws RemoteException {

    }



    @Override

    public void onSingleTaskDisplayEmpty(int displayId) throws RemoteException {

    }



    @Override

    public void onTaskDisplayChanged(int taskId, int newDisplayId) throws RemoteException {

    }