Merge "Block clicks on smart actions and replies just after creation/update." into qt-dev (aeed0cdd) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,12 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String SSIN_MAX_NUM_ACTIONS = "ssin_max_num_actions";

		/**
		* (int) The amount of time (ms) before smart suggestions are clickable, since the suggestions
		* were added.
		*/
		public static final String SSIN_ONCLICK_INIT_DELAY = "ssin_onclick_init_delay";

		/**
		* The default component of
		* {@link android.service.notification.NotificationAssistantService}.

packages/SystemUI/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -469,6 +469,10 @@
		-->
		<integer name="config_smart_replies_in_notifications_max_num_actions">-1</integer>

		<!-- Smart replies in notifications: Delay (ms) before smart suggestions are clickable, since
		they were added. -->
		<integer name="config_smart_replies_in_notifications_onclick_init_delay">200</integer>

		<!-- Screenshot editing default activity. Must handle ACTION_EDIT image/png intents.
		Blank sends the user to the Chooser first.
		This name is in the ComponentName flattened format (package/class) -->

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.policy.InflatedSmartReplies.SmartRepliesAndActions;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -3194,6 +3195,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mAmbientGoingAway = goingAway;
		}

		/**
		* Returns the Smart Suggestions backing the smart suggestion buttons in the notification.
		*/
		public SmartRepliesAndActions getExistingSmartRepliesAndActions() {
		return mPrivateLayout.getCurrentSmartRepliesAndActions();
		}

		@VisibleForTesting
		protected void setChildrenContainer(NotificationChildrenContainer childrenContainer) {
		mChildrenContainer = childrenContainer;

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewW
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.policy.InflatedSmartReplies;
		import com.android.systemui.statusbar.policy.InflatedSmartReplies.SmartRepliesAndActions;
		import com.android.systemui.statusbar.policy.SmartReplyConstants;
		import com.android.systemui.util.Assert;

		@@ -282,7 +283,8 @@ public class NotificationContentInflater {
		mIsChildInGroup, mUsesIncreasedHeight, mUsesIncreasedHeadsUpHeight,
		mRedactAmbient, packageContext);
		result = inflateSmartReplyViews(result, reInflateFlags, mRow.getEntry(),
		mRow.getContext(), mRow.getHeadsUpManager());
		mRow.getContext(), mRow.getHeadsUpManager(),
		mRow.getExistingSmartRepliesAndActions());
		apply(
		inflateSynchronously,
		result,
		@@ -344,20 +346,20 @@ public class NotificationContentInflater {

		private static InflationProgress inflateSmartReplyViews(InflationProgress result,
		@InflationFlag int reInflateFlags, NotificationEntry entry, Context context,
		HeadsUpManager headsUpManager) {
		HeadsUpManager headsUpManager, SmartRepliesAndActions previousSmartRepliesAndActions) {
		SmartReplyConstants smartReplyConstants = Dependency.get(SmartReplyConstants.class);
		SmartReplyController smartReplyController = Dependency.get(SmartReplyController.class);
		if ((reInflateFlags & FLAG_CONTENT_VIEW_EXPANDED) != 0 && result.newExpandedView != null) {
		result.expandedInflatedSmartReplies =
		InflatedSmartReplies.inflate(
		context, entry, smartReplyConstants, smartReplyController,
		headsUpManager);
		headsUpManager, previousSmartRepliesAndActions);
		}
		if ((reInflateFlags & FLAG_CONTENT_VIEW_HEADS_UP) != 0 && result.newHeadsUpView != null) {
		result.headsUpInflatedSmartReplies =
		InflatedSmartReplies.inflate(
		context, entry, smartReplyConstants, smartReplyController,
		headsUpManager);
		headsUpManager, previousSmartRepliesAndActions);
		}
		return result;
		}
		@@ -905,7 +907,8 @@ public class NotificationContentInflater {
		mIsChildInGroup, mUsesIncreasedHeight, mUsesIncreasedHeadsUpHeight,
		mRedactAmbient, packageContext);
		return inflateSmartReplyViews(inflationProgress, mReInflateFlags, mRow.getEntry(),
		mRow.getContext(), mRow.getHeadsUpManager());
		mRow.getContext(), mRow.getHeadsUpManager(),
		mRow.getExistingSmartRepliesAndActions());
		} catch (Exception e) {
		mError = e;
		return null;

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class NotificationContentView extends FrameLayout {
		private SmartReplyController mSmartReplyController;
		private InflatedSmartReplies mExpandedInflatedSmartReplies;
		private InflatedSmartReplies mHeadsUpInflatedSmartReplies;
		private SmartRepliesAndActions mCurrentSmartRepliesAndActions;

		private NotificationViewWrapper mContractedWrapper;
		private NotificationViewWrapper mExpandedWrapper;
		@@ -1259,18 +1260,18 @@ public class NotificationContentView extends FrameLayout {
		// the same SmartRepliesAndActions to avoid discrepancies between the two views. We here
		// reuse that object for our local SmartRepliesAndActions to avoid discrepancies between
		// this class and the InflatedSmartReplies classes.
		SmartRepliesAndActions smartRepliesAndActions = mExpandedInflatedSmartReplies != null
		mCurrentSmartRepliesAndActions = mExpandedInflatedSmartReplies != null
		? mExpandedInflatedSmartReplies.getSmartRepliesAndActions()
		: mHeadsUpInflatedSmartReplies.getSmartRepliesAndActions();
		if (DEBUG) {
		Log.d(TAG, String.format("Adding suggestions for %s, %d actions, and %d replies.",
		entry.notification.getKey(),
		smartRepliesAndActions.smartActions == null ? 0 :
		smartRepliesAndActions.smartActions.actions.size(),
		smartRepliesAndActions.smartReplies == null ? 0 :
		smartRepliesAndActions.smartReplies.choices.length));
		mCurrentSmartRepliesAndActions.smartActions == null ? 0 :
		mCurrentSmartRepliesAndActions.smartActions.actions.size(),
		mCurrentSmartRepliesAndActions.smartReplies == null ? 0 :
		mCurrentSmartRepliesAndActions.smartReplies.choices.length));
		}
		applySmartReplyView(smartRepliesAndActions, entry);
		applySmartReplyView(mCurrentSmartRepliesAndActions, entry);
		}

		private void applyRemoteInput(NotificationEntry entry, boolean hasFreeformRemoteInput) {
		@@ -1472,6 +1473,13 @@ public class NotificationContentView extends FrameLayout {
		}
		}

		/**
		* Returns the smart replies and actions currently shown in the notification.
		*/
		@Nullable public SmartRepliesAndActions getCurrentSmartRepliesAndActions() {
		return mCurrentSmartRepliesAndActions;
		}

		public void closeRemoteInput() {
		if (mHeadsUpRemoteInput != null) {
		mHeadsUpRemoteInput.close();