Merge "Add api to WearableExtender for setting and getting the bridge tag.... (4f52fe23) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

api/system-current.txt

+2 −0

api/test-current.txt

+2 −0

core/java/android/app/Notification.java

+32 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5834,6 +5834,7 @@ public class Notification implements Parcelable
	private static final String KEY_GRAVITY = "gravity";		private static final String KEY_GRAVITY = "gravity";
	private static final String KEY_HINT_SCREEN_TIMEOUT = "hintScreenTimeout";		private static final String KEY_HINT_SCREEN_TIMEOUT = "hintScreenTimeout";
	private static final String KEY_DISMISSAL_ID = "dismissalId";		private static final String KEY_DISMISSAL_ID = "dismissalId";
			private static final String KEY_BRIDGE_TAG = "bridgeTag";

	// Flags bitwise-ored to mFlags		// Flags bitwise-ored to mFlags
	private static final int FLAG_CONTENT_INTENT_AVAILABLE_OFFLINE = 0x1;		private static final int FLAG_CONTENT_INTENT_AVAILABLE_OFFLINE = 0x1;
	@@ -5863,6 +5864,7 @@ public class Notification implements Parcelable
	private int mGravity = DEFAULT_GRAVITY;		private int mGravity = DEFAULT_GRAVITY;
	private int mHintScreenTimeout;		private int mHintScreenTimeout;
	private String mDismissalId;		private String mDismissalId;
			private String mBridgeTag;

	/**		/**
	* Create a {@link android.app.Notification.WearableExtender} with default		* Create a {@link android.app.Notification.WearableExtender} with default
	@@ -5900,6 +5902,7 @@ public class Notification implements Parcelable
	mGravity = wearableBundle.getInt(KEY_GRAVITY, DEFAULT_GRAVITY);		mGravity = wearableBundle.getInt(KEY_GRAVITY, DEFAULT_GRAVITY);
	mHintScreenTimeout = wearableBundle.getInt(KEY_HINT_SCREEN_TIMEOUT);		mHintScreenTimeout = wearableBundle.getInt(KEY_HINT_SCREEN_TIMEOUT);
	mDismissalId = wearableBundle.getString(KEY_DISMISSAL_ID);		mDismissalId = wearableBundle.getString(KEY_DISMISSAL_ID);
			mBridgeTag = wearableBundle.getString(KEY_BRIDGE_TAG);
	}		}
	}		}

	@@ -5953,6 +5956,9 @@ public class Notification implements Parcelable
	if (mDismissalId != null) {		if (mDismissalId != null) {
	wearableBundle.putString(KEY_DISMISSAL_ID, mDismissalId);		wearableBundle.putString(KEY_DISMISSAL_ID, mDismissalId);
	}		}
			if (mBridgeTag != null) {
			wearableBundle.putString(KEY_BRIDGE_TAG, mBridgeTag);
			}

	builder.getExtras().putBundle(EXTRA_WEARABLE_EXTENSIONS, wearableBundle);		builder.getExtras().putBundle(EXTRA_WEARABLE_EXTENSIONS, wearableBundle);
	return builder;		return builder;
	@@ -5974,6 +5980,7 @@ public class Notification implements Parcelable
	that.mGravity = this.mGravity;		that.mGravity = this.mGravity;
	that.mHintScreenTimeout = this.mHintScreenTimeout;		that.mHintScreenTimeout = this.mHintScreenTimeout;
	that.mDismissalId = this.mDismissalId;		that.mDismissalId = this.mDismissalId;
			that.mBridgeTag = this.mBridgeTag;
	return that;		return that;
	}		}

	@@ -6462,12 +6469,11 @@ public class Notification implements Parcelable
	}		}

	/**		/**
	* When you post a notification, if you set the dismissal id field, then when that		* Sets the dismissal id for this notification. If a notification is posted with a
	* notification is canceled, notifications on other wearables and the paired Android phone		* dismissal id, then when that notification is canceled, notifications on other wearables
	* having that same dismissal id will also be canceled. Note that this only works if you		* and the paired Android phone having that same dismissal id will also be canceled. See
	* have notification bridge mode set to NO_BRIDGING in your Wear app manifest. See
	* <a href="{@docRoot}wear/notifications/index.html">Adding Wearable Features to		* <a href="{@docRoot}wear/notifications/index.html">Adding Wearable Features to
	* Notifications</a> for more information on how to use the bridge mode feature.		* Notifications</a> for more information.
	* @param dismissalId the dismissal id of the notification.		* @param dismissalId the dismissal id of the notification.
	* @return this object for method chaining		* @return this object for method chaining
	*/		*/
	@@ -6484,6 +6490,27 @@ public class Notification implements Parcelable
	return mDismissalId;		return mDismissalId;
	}		}

			/**
			* Sets a bridge tag for this notification. A bridge tag can be set for notifications
			* posted from a phone to provide finer-grained control on what notifications are bridged
			* to wearables. See <a href="{@docRoot}wear/notifications/index.html">Adding Wearable
			* Features to Notifications</a> for more information.
			* @param bridgeTag the bridge tag of the notification.
			* @return this object for method chaining
			*/
			public WearableExtender setBridgeTag(String bridgeTag) {
			mBridgeTag = bridgeTag;
			return this;
			}

			/**
			* Returns the bridge tag of the notification.
			* @return the bridge tag or null if not present.
			*/
			public String getBridgeTag() {
			return mBridgeTag;
			}

	private void setFlag(int mask, boolean value) {		private void setFlag(int mask, boolean value) {
	if (value) {		if (value) {
	mFlags \|= mask;		mFlags \|= mask;