📱 Simplify naming of generated java enums IntDefs

chrome/android/java/src/org/chromium/chrome/browser/ntp/ContentSuggestionsNotificationHelper.java

 // Copyright 2016 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.ntp;
 
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ skipping 12 matching lines @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsNotificationAction;
-import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsNotificationAction.ContentSuggestionsNotificationActionEnum;
-import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsNotificationOptOut.ContentSuggestionsNotificationOptOutEnum;
+import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsNotificationOptOut;
 import org.chromium.chrome.browser.preferences.ContentSuggestionsPreferences;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * Provides functionality needed for content suggestion notifications.
  *
@@ skipping 24 matching lines @@
             "ntp.content_suggestions.notification.cached_consecutive_ignored";
 
     // Tracks which URIs there is an active notification for.
     private static final String PREF_ACTIVE_NOTIFICATIONS =
             "ntp.content_suggestions.notification.active";
 
     private ContentSuggestionsNotificationHelper() {} // Prevent instantiation
 
     /**
      * Records the reason why Content Suggestions notifications have been opted out.
-     * @see ContentSuggestionsNotificationOptOutEnum;
+     * @see ContentSuggestionsNotificationOptOut;
      */
-    public static void recordNotificationOptOut(
-            @ContentSuggestionsNotificationOptOutEnum int reason) {
+    public static void recordNotificationOptOut(@ContentSuggestionsNotificationOptOut int reason) {
         nativeRecordNotificationOptOut(reason);
     }
 
     /**
      * Records an action performed on a Content Suggestions notification.
-     * @see ContentSuggestionsNotificationActionEnum;
+     * @see ContentSuggestionsNotificationAction;
      */
-    public static void recordNotificationAction(
-            @ContentSuggestionsNotificationActionEnum int action) {
+    public static void recordNotificationAction(@ContentSuggestionsNotificationAction int action) {
         nativeRecordNotificationAction(action);
     }
 
     /**
      * Opens the content suggestion when notification is tapped.
      */
     public static final class OpenUrlReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             int category = intent.getIntExtra(NOTIFICATION_CATEGORY_EXTRA, -1);
@@ skipping 258 matching lines @@
             Uri notificationUri = Uri.parse(serialized);
             ActiveNotification activeNotification = ActiveNotification.fromUri(notificationUri);
             if ((activeNotification != null) && (activeNotification.mId >= nextId)) {
                 nextId = activeNotification.mId + 1;
             }
         }
         return nextId;
     }
 
     private static String cachedMetricNameForAction(
-            @ContentSuggestionsNotificationActionEnum int action) {
+            @ContentSuggestionsNotificationAction int action) {
         switch (action) {
             case ContentSuggestionsNotificationAction.TAP:
                 return PREF_CACHED_ACTION_TAP;
             case ContentSuggestionsNotificationAction.DISMISSAL:
                 return PREF_CACHED_ACTION_DISMISSAL;
             case ContentSuggestionsNotificationAction.HIDE_DEADLINE:
                 return PREF_CACHED_ACTION_HIDE_DEADLINE;
             case ContentSuggestionsNotificationAction.HIDE_EXPIRY:
                 return PREF_CACHED_ACTION_HIDE_EXPIRY;
             case ContentSuggestionsNotificationAction.HIDE_FRONTMOST:
@@ skipping 11 matching lines @@
      *
      * Also tracks the number of consecutively-ignored notifications, resetting it on a tap or
      * otherwise incrementing it.
      *
      * This method may be called when the native library is not loaded. If it is loaded, the metrics
      * will immediately be sent to C++. If not, it will cache them for a later call to
      * flushCachedMetrics().
      *
      * @param action The action to update the pref for.
      */
-    private static void recordCachedActionMetric(
-            @ContentSuggestionsNotificationActionEnum int action) {
+    private static void recordCachedActionMetric(@ContentSuggestionsNotificationAction int action) {
         String prefName = cachedMetricNameForAction(action);
         assert !prefName.isEmpty();
 
         SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
         int currentValue = prefs.getInt(prefName, 0);
 
         int consecutiveIgnored = prefs.getInt(PREF_CACHED_CONSECUTIVE_IGNORED, 0);
         switch (action) {
             case ContentSuggestionsNotificationAction.TAP:
                 consecutiveIgnored = 0;
@@ skipping 53 matching lines @@
                     .remove(PREF_CACHED_ACTION_HIDE_SHUTDOWN)
                     .remove(PREF_CACHED_CONSECUTIVE_IGNORED)
                     .apply();
         }
     }
 
     private static native void nativeReceiveFlushedMetrics(int tapCount, int dismissalCount,
             int hideDeadlineCount, int hideExpiryCount, int hideFrontmostCount,
             int hideDisabledCount, int hideShutdownCount, int consecutiveIgnored);
     private static native void nativeRecordNotificationOptOut(
-            @ContentSuggestionsNotificationOptOutEnum int reason);
+            @ContentSuggestionsNotificationOptOut int reason);
     private static native void nativeRecordNotificationAction(
-            @ContentSuggestionsNotificationActionEnum int action);
+            @ContentSuggestionsNotificationAction int action);
 }