[Messages] Dismiss message on primary action click

This CL adds logic in SingleActionMessage to dismiss the message when
the user taps on primary button.

BUG=1152520
R=lazzzis@chromium.org

Change-Id: I6f32c69278cd613f47839af7c70e8d41db99a848
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560829
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Lijin Shen <lazzzis@google.com>
Cr-Commit-Position: refs/heads/master@{#831156}

components/messages/android/java/src/org/chromium/components/messages/MessageBannerProperties.java

@@ -18,7 +18,7 @@ import org.chromium.ui.modelutil.PropertyModel.WritableObjectPropertyKey;
 public class MessageBannerProperties {
     public static final WritableObjectPropertyKey<String> PRIMARY_BUTTON_TEXT =
             new WritableObjectPropertyKey<>();
-    public static final WritableObjectPropertyKey<OnClickListener> PRIMARY_BUTTON_CLICK_LISTENER =
+    public static final WritableObjectPropertyKey<Runnable> ON_PRIMARY_ACTION =
             new WritableObjectPropertyKey<>();
     public static final WritableObjectPropertyKey<String> TITLE = new WritableObjectPropertyKey<>();
     public static final WritableObjectPropertyKey<String> DESCRIPTION =
@@ -35,18 +35,26 @@ public class MessageBannerProperties {
     public static final WritableObjectPropertyKey<Runnable> ON_DISMISSED =
             new WritableObjectPropertyKey<>();
 
-    // TRANSLATION_Y and ALPHA should only be accessed by the message banner component.
+    // Following properties should only be accessed by the message banner component.
     static final WritableFloatPropertyKey TRANSLATION_Y = new WritableFloatPropertyKey();
     static final WritableFloatPropertyKey ALPHA = new WritableFloatPropertyKey();
     static final WritableObjectPropertyKey<Runnable> ON_TOUCH_RUNNABLE =
             new WritableObjectPropertyKey<>();
+    // PRIMARY_BUTTON_CLICK_LISTENER is SingleActionMessage's handler attached to primary button
+    // view. SingleActionMessage calls ON_PRIMARY_ACTION from the handler.
+    static final WritableObjectPropertyKey<OnClickListener> PRIMARY_BUTTON_CLICK_LISTENER =
+            new WritableObjectPropertyKey<>();
 
+    // TODO(pavely): There is no need to maintain two lists of property keys. Remove one and clean
+    // up references.
     public static final PropertyKey[] ALL_KEYS =
             new PropertyKey[] {PRIMARY_BUTTON_TEXT, PRIMARY_BUTTON_CLICK_LISTENER, TITLE,
                     DESCRIPTION, ICON, ICON_RESOURCE_ID, SECONDARY_ICON,
-                    SECONDARY_ICON_CONTENT_DESCRIPTION, TRANSLATION_Y, ALPHA, ON_TOUCH_RUNNABLE};
+                    SECONDARY_ICON_CONTENT_DESCRIPTION, TRANSLATION_Y, ALPHA, ON_TOUCH_RUNNABLE,
+                    ON_PRIMARY_ACTION};
 
-    public static final PropertyKey[] SINGLE_ACTION_MESSAGE_KEYS = new PropertyKey[] {
-            PRIMARY_BUTTON_TEXT, PRIMARY_BUTTON_CLICK_LISTENER, TITLE, DESCRIPTION, ICON,
-            ICON_RESOURCE_ID, ON_DISMISSED, TRANSLATION_Y, ALPHA, ON_TOUCH_RUNNABLE};
+    public static final PropertyKey[] SINGLE_ACTION_MESSAGE_KEYS =
+            new PropertyKey[] {PRIMARY_BUTTON_TEXT, PRIMARY_BUTTON_CLICK_LISTENER, TITLE,
+                    DESCRIPTION, ICON, ICON_RESOURCE_ID, ON_DISMISSED, TRANSLATION_Y, ALPHA,
+                    ON_TOUCH_RUNNABLE, ON_PRIMARY_ACTION};
 }

components/messages/android/java/src/org/chromium/components/messages/MessageWrapper.java

@@ -4,8 +4,6 @@
 
 package org.chromium.components.messages;
 
-import android.view.View;
-
 import androidx.annotation.DrawableRes;
 
 import org.chromium.base.annotations.CalledByNative;
@@ -35,8 +33,7 @@ public final class MessageWrapper {
         mNativeMessageWrapper = nativeMessageWrapper;
         mMessageProperties =
                 new PropertyModel.Builder(MessageBannerProperties.SINGLE_ACTION_MESSAGE_KEYS)
-                        .with(MessageBannerProperties.PRIMARY_BUTTON_CLICK_LISTENER,
-                                this::handleActionClick)
+                        .with(MessageBannerProperties.ON_PRIMARY_ACTION, this::handleActionClick)
                         .with(MessageBannerProperties.ON_DISMISSED, this::handleMessageDismissed)
                         .build();
     }
@@ -91,7 +88,7 @@ public final class MessageWrapper {
         mNativeMessageWrapper = 0;
     }
 
-    private void handleActionClick(View v) {
+    private void handleActionClick() {
         if (mNativeMessageWrapper == 0) return;
         MessageWrapperJni.get().handleActionClick(mNativeMessageWrapper);
     }

components/messages/android/java/src/org/chromium/components/messages/MessageWrapperTest.java

@@ -76,7 +76,7 @@ public class MessageWrapperTest {
         final long nativePtr = 1;
         MessageWrapper message = MessageWrapper.create(nativePtr);
         PropertyModel messageProperties = message.getMessageProperties();
-        messageProperties.get(MessageBannerProperties.PRIMARY_BUTTON_CLICK_LISTENER).onClick(null);
+        messageProperties.get(MessageBannerProperties.ON_PRIMARY_ACTION).run();
         Mockito.verify(mNativeMock).handleActionClick(nativePtr);
         messageProperties.get(MessageBannerProperties.ON_DISMISSED).run();
         Mockito.verify(mNativeMock).handleDismissCallback(nativePtr);
@@ -93,7 +93,7 @@ public class MessageWrapperTest {
         PropertyModel messageProperties = message.getMessageProperties();
 
         message.clearNativePtr();
-        messageProperties.get(MessageBannerProperties.PRIMARY_BUTTON_CLICK_LISTENER).onClick(null);
+        messageProperties.get(MessageBannerProperties.ON_PRIMARY_ACTION).run();
         Mockito.verify(mNativeMock, never()).handleActionClick(nativePtr);
         messageProperties.get(MessageBannerProperties.ON_DISMISSED).run();
         Mockito.verify(mNativeMock, never()).handleDismissCallback(nativePtr);

components/messages/android/java/src/org/chromium/components/messages/SingleActionMessage.java

@@ -7,6 +7,7 @@ package org.chromium.components.messages;
 import android.annotation.SuppressLint;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
+import android.view.View;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -42,6 +43,9 @@ public class SingleActionMessage implements MessageStateHandler {
         mDismissHandler = dismissHandler;
         mAutoDismissTimer = new MessageAutoDismissTimer(10 * DateUtils.SECOND_IN_MILLIS);
         mMaxTranslationSupplier = maxTranslationSupplier;
+
+        mModel.set(
+                MessageBannerProperties.PRIMARY_BUTTON_CLICK_LISTENER, this::handlePrimaryAction);
     }
 
     /**
@@ -97,6 +101,11 @@ public class SingleActionMessage implements MessageStateHandler {
         if (onDismissed != null) onDismissed.run();
     }
 
+    private void handlePrimaryAction(View v) {
+        mModel.get(MessageBannerProperties.ON_PRIMARY_ACTION).run();
+        mDismissHandler.onResult(mModel);
+    }
+
     @VisibleForTesting
     void setMessageBannerForTesting(MessageBannerCoordinator messageBanner) {
         mMessageBanner = messageBanner;

components/messages/android/java/src/org/chromium/components/messages/SingleActionMessageTest.java

@@ -108,7 +108,7 @@ public class SingleActionMessageTest extends DummyUiActivityTestCase {
                 .with(MessageBannerProperties.ICON,
                         ApiCompatibilityUtils.getDrawable(
                                 activity.getResources(), android.R.drawable.ic_menu_add))
-                .with(MessageBannerProperties.PRIMARY_BUTTON_CLICK_LISTENER, (v) -> {})
+                .with(MessageBannerProperties.ON_PRIMARY_ACTION, () -> {})
                 .with(MessageBannerProperties.ON_TOUCH_RUNNABLE, () -> {})
                 .with(MessageBannerProperties.ON_DISMISSED,
                         () -> { mDismissCallback.notifyCalled(); })