Plumb through notification action types and placeholders on Android

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilderTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.notifications;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.SpannableStringBuilder;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 /**
  * Instrumentation unit tests for StandardNotificationBuilder.
  *
  * Extends NativeLibraryTestBase so that {@link UrlUtilities#getDomainAndRegistry} can access
  * native GetDomainAndRegistry, when called by {@link RoundedIconGenerator#getIconTextForUrl} during
@@ skipping 40 matching lines @@
                 .setBody("body")
                 .setOrigin("origin")
                 .setTicker(new SpannableStringBuilder("ticker"))
                 .setImage(image)
                 .setLargeIcon(largeIcon)
                 .setSmallIcon(R.drawable.ic_chrome)
                 .setDefaults(Notification.DEFAULT_ALL)
                 .setVibrate(new long[] {100L})
                 .setContentIntent(outContentAndDeleteIntents[0])
                 .setDeleteIntent(outContentAndDeleteIntents[1])
-                .addAction(actionIcon, "button 1", null /* intent */)
-                .addAction(actionIcon, "button 2", null /* intent */)
+                .addButtonAction(actionIcon, "button 1", null /* intent */)
+                .addButtonAction(actionIcon, "button 2", null /* intent */)
                 .addSettingsAction(0 /* iconId */, "settings", null /* intent */);
     }
 
     @SmallTest
     @Feature({"Browser", "Notifications"})
     public void testSetAll() {
         PendingIntent[] contentAndDeleteIntents = new PendingIntent[2];
         NotificationBuilderBase builder = createAllOptionsBuilder(contentAndDeleteIntents);
         Notification notification = builder.build();
 
@@ skipping 86 matching lines @@
             otherBuilder.setSmallIcon(bitmap);
             Notification otherNotification = otherBuilder.build();
             assertTrue(expected.sameAs(
                     NotificationTestUtil.getSmallIconFromNotification(context, otherNotification)));
         } else {
             Bitmap expected =
                     BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chrome);
             assertTrue(expected.sameAs(result));
         }
     }
+
+    @MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT_WATCH)
+    @TargetApi(Build.VERSION_CODES.KITKAT_WATCH) // RemoteInputs were only added in KITKAT_WATCH.
+    @SmallTest
+    @Feature({"Browser", "Notifications"})
+    public void testAddTextActionSetsRemoteInput() {
+        Context context = getInstrumentation().getTargetContext();
+        NotificationBuilderBase notificationBuilder = new StandardNotificationBuilder(
+                context).addTextAction(null, "Action Title", null, "Placeholder");
+
+        Notification notification = notificationBuilder.build();
+
+        assertEquals(1, notification.actions.length);
+        assertEquals("Action Title", notification.actions[0].title);
+        assertNotNull(notification.actions[0].getRemoteInputs());
+        assertEquals(1, notification.actions[0].getRemoteInputs().length);
+        assertEquals("Placeholder", notification.actions[0].getRemoteInputs()[0].getLabel());
+    }
 }