Add a preference for disabling vibration in notifications.

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java

 // Copyright 2014 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.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ skipping 12 matching lines @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences;
 import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
 import org.chromium.chrome.browser.preferences.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.webapk.lib.client.WebApkValidator;
 
 import java.net.URI;
@@ skipping 361 matching lines @@
             URI uri = new URI(parts[1]);
             if (uri.getHost() != null) return parts[1];
         } catch (URISyntaxException e) {
             Log.e(TAG, "Expected to find a valid url in the notification tag extra.", e);
             return null;
         }
         return null;
     }
 
     /**
-     * Generates the notfiication defaults from vibrationPattern's size and silent.
+     * Generates the notification defaults from vibrationPattern's size and silent.
      *
      * Use the system's default ringtone, vibration and indicator lights unless the notification
      * has been marked as being silent.
      * If a vibration pattern is set, the notification should use the provided pattern
-     * rather than the defaulting to system settings.
+     * rather than defaulting to the system settings.
      *
      * @param vibrationPatternLength Vibration pattern's size for the Notification.
      * @param silent Whether the default sound, vibration and lights should be suppressed.
+     * @param vibrateEnabled Whether vibration is enabled in preferences.
      * @return The generated notification's default value.
     */
     @VisibleForTesting
-    static int makeDefaults(int vibrationPatternLength, boolean silent) {
+    static int makeDefaults(int vibrationPatternLength, boolean silent, boolean vibrateEnabled) {
         assert !silent || vibrationPatternLength == 0;
 
         if (silent) return 0;
 
         int defaults = Notification.DEFAULT_ALL;
-        if (vibrationPatternLength > 0) {
+        if (vibrationPatternLength > 0 || !vibrateEnabled) {
             defaults &= ~Notification.DEFAULT_VIBRATE;
         }
         return defaults;
     }
 
     /**
      * Generates the vibration pattern used in Android notification.
      *
      * Android takes a long array where the first entry indicates the number of milliseconds to wait
      * prior to starting the vibration, whereas Chrome follows the syntax of the Web Vibration API.
@@ skipping 102 matching lines @@
         // the label and icon provided here only affect Android Wear, so don't abbreviate them.
         boolean abbreviateSiteSettings = actionTitles.length > 0 && !useCustomLayouts();
         int settingsIconId = abbreviateSiteSettings ? 0 : R.drawable.settings_cog;
         CharSequence settingsTitle = abbreviateSiteSettings
                                      ? res.getString(R.string.notification_site_settings_button)
                                      : res.getString(R.string.page_info_site_settings_button);
         // If the settings button is displayed together with the other buttons it has to be the last
         // one, so add it after the other actions.
         notificationBuilder.addSettingsAction(settingsIconId, settingsTitle, pendingSettingsIntent);
 
-        notificationBuilder.setDefaults(makeDefaults(vibrationPattern.length, silent));
-        if (vibrationPattern.length > 0) {
-            notificationBuilder.setVibrate(makeVibrationPattern(vibrationPattern));
+        // The NotificationManagerService in the core Android framework has a fallback vibration
+        // pattern. It is used when the device is in vibrate mode, there is no custom pattern, and
+        // the vibration default has been disabled, but there is a sound to play. Effectively, it
+        // plays the fallback pattern as fallback for the sound, even though the default vibration
+        // has been turned off. So in order to truly prevent vibration, specify a custom empty
+        // pattern.

[Peter Beverloo, 2016/06/07 12:46:01]

Can we make this significantly more concise? What about:

        // Block the fallback vibration pattern the Android Framework will apply
when the device is
        // in vibrate mode, there is no custom pattern and the vibration default
has been disabled.

[Michael van Ouwerkerk, 2016/06/07 16:34:21]

Sure, I did something shorter like that.

+        boolean vibrateEnabled = PrefServiceBridge.getInstance().isNotificationsVibrateEnabled();
+        if (!vibrateEnabled) {
+            vibrationPattern = new int[0];
         }
+        notificationBuilder.setDefaults(
+                makeDefaults(vibrationPattern.length, silent, vibrateEnabled));
+        notificationBuilder.setVibrate(makeVibrationPattern(vibrationPattern));
 
         String platformTag = makePlatformTag(persistentNotificationId, origin, tag);
         if (webApkPackage.isEmpty()) {
             mNotificationManager.notify(platformTag, PLATFORM_ID, notificationBuilder.build());
         } else {
             WebApkNotificationClient.notifyNotification(
                     webApkPackage, notificationBuilder, platformTag, PLATFORM_ID);
         }
     }
 
@@ skipping 156 matching lines @@
 
     private static native void nativeInitializeNotificationPlatformBridge();
 
     private native void nativeOnNotificationClicked(long nativeNotificationPlatformBridgeAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, String webApkPackage, int actionIndex);
     private native void nativeOnNotificationClosed(long nativeNotificationPlatformBridgeAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, boolean byUser);
 }