Merge "Changes the default value of Notification.Action.mAllowGeneratedReplies" (3c290d43) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1051,7 +1051,7 @@ public class Notification implements Parcelable
		private final Bundle mExtras;
		private Icon mIcon;
		private final RemoteInput[] mRemoteInputs;
		private boolean mAllowGeneratedReplies = false;
		private boolean mAllowGeneratedReplies = true;

		/**
		* Small icon representing the action.
		@@ -1093,7 +1093,7 @@ public class Notification implements Parcelable
		*/
		@Deprecated
		public Action(int icon, CharSequence title, PendingIntent intent) {
		this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, false);
		this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, true);
		}

		/** Keep in sync with {@link Notification.Action.Builder#Builder(Action)}! */
		@@ -1166,7 +1166,7 @@ public class Notification implements Parcelable
		private final Icon mIcon;
		private final CharSequence mTitle;
		private final PendingIntent mIntent;
		private boolean mAllowGeneratedReplies;
		private boolean mAllowGeneratedReplies = true;
		private final Bundle mExtras;
		private ArrayList<RemoteInput> mRemoteInputs;

		@@ -1188,7 +1188,7 @@ public class Notification implements Parcelable
		* @param intent the {@link PendingIntent} to fire when users trigger this action
		*/
		public Builder(Icon icon, CharSequence title, PendingIntent intent) {
		this(icon, title, intent, new Bundle(), null, false);
		this(icon, title, intent, new Bundle(), null, true);
		}

		/**
		@@ -1260,7 +1260,7 @@ public class Notification implements Parcelable
		* @param allowGeneratedReplies {@code true} to allow generated replies, {@code false}
		* otherwise
		* @return this object for method chaining
		* The default value is {@code false}
		* The default value is {@code true}
		*/
		public Builder setAllowGeneratedReplies(boolean allowGeneratedReplies) {
		mAllowGeneratedReplies = allowGeneratedReplies;