Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp (3e3e48e9) · Commits · e / os / android_frameworks_base

api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -2346,6 +2346,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";
		}
		@@ -2369,7 +2370,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
		@@ -5924,7 +5924,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
		@@ -8539,24 +8539,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) {
		@@ -8672,10 +8682,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.
		*/
		@@ -8792,6 +8812,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
		@@ -8810,6 +8832,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 {
		}