📰 Tweak the suggestion ranks for UMA to handle fetchMore

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.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.cards;
 
 import android.support.annotation.IntDef;
 import android.view.View;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ntp.ContextMenuManager;
 import org.chromium.chrome.browser.ntp.ContextMenuManager.ContextMenuItemId;
 import org.chromium.chrome.browser.ntp.ContextMenuManager.Delegate;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.UiConfig;
+import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsConfig;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
  * Item that allows the user to perform an action on the NTP.
  * Note: Use {@link #refreshVisibility()} to update the visibility of the button instead of calling
  * {@link #setVisible(boolean)} directly.
  */
-class ActionItem extends OptionalLeaf {
+public class ActionItem extends OptionalLeaf {
     @IntDef({ACTION_NONE, ACTION_VIEW_ALL, ACTION_FETCH_MORE, ACTION_RELOAD})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Action {}
     public static final int ACTION_NONE = 0;
     public static final int ACTION_VIEW_ALL = 1;
     public static final int ACTION_FETCH_MORE = 2;
     public static final int ACTION_RELOAD = 3;
 
     private final SuggestionsCategoryInfo mCategoryInfo;
     private final SuggestionsSection mParentSection;
 
     @Action
     private int mCurrentAction = ACTION_NONE;
     private boolean mImpressionTracked;
+    private int mPerSectionRank = -1;
 
     public ActionItem(SuggestionsSection section) {
         mCategoryInfo = section.getCategoryInfo();
         mParentSection = section;
     }
 
     /** Call this instead of {@link #setVisible(boolean)} to update the visibility. */
     public void refreshVisibility() {
         mCurrentAction = findAppropriateAction();
         setVisible(mCurrentAction != ACTION_NONE);
     }
 
     @Override
     public int getItemViewType() {
         return ItemViewType.ACTION;
     }
 
     @Override
     protected void onBindViewHolder(NewTabPageViewHolder holder) {
         assert holder instanceof ViewHolder;
         ((ViewHolder) holder).onBindViewHolder(this);
     }
 
-    private int getPosition() {
-        // TODO(dgn): looks dodgy. Confirm that's what we want.
-        return mParentSection.getSuggestionsCount();
+    @CategoryInt
+    public int getCategory() {
+        return mCategoryInfo.getCategory();
+    }
+
+    public void setRank(int perSectionRank) {

[Bernhard Bauer, 2017/01/17 17:42:31]

The corresponding getter is called getPerSectionRank(). Can we name this one
setPerSectionRank() then?

[dgn, 2017/01/17 18:46:24]

Done.

+        mPerSectionRank = perSectionRank;
+    }
+
+    public int getPerSectionRank() {
+        return mPerSectionRank;
     }
 
     @VisibleForTesting
     void performAction(NewTabPageManager manager) {
-        manager.trackSnippetCategoryActionClick(mCategoryInfo.getCategory(), getPosition());
+        manager.getSuggestionsMetricsReporter().onMoreButtonClicked(this);
 
         switch (mCurrentAction) {
             case ACTION_VIEW_ALL:
                 mCategoryInfo.performViewAllAction(manager);
                 return;
             case ACTION_FETCH_MORE:
             case ACTION_RELOAD:
                 manager.getSuggestionsSource().fetchSuggestions(
                         mCategoryInfo.getCategory(), mParentSection.getDisplayedSuggestionIds());
                 mParentSection.onFetchStarted();
                 return;
             case ACTION_NONE:
             default:
                 // Should never be reached.
                 assert false;
         }
     }
 
     @Action
     private int findAppropriateAction() {
         boolean hasSuggestions = mParentSection.hasSuggestions();
         if (mCategoryInfo.hasViewAllAction()) return ACTION_VIEW_ALL;
         if (hasSuggestions && mCategoryInfo.hasFetchMoreAction()) return ACTION_FETCH_MORE;
         if (!hasSuggestions && mCategoryInfo.hasReloadAction()) return ACTION_RELOAD;
         return ACTION_NONE;
     }
 
+    /** ViewHolder associated to {@link ItemViewType#ACTION}. */
     public static class ViewHolder extends CardViewHolder implements ContextMenuManager.Delegate {
         private ActionItem mActionListItem;
 
         public ViewHolder(final NewTabPageRecyclerView recyclerView,
                 final NewTabPageManager manager, UiConfig uiConfig) {
             super(R.layout.new_tab_page_action_card, recyclerView, uiConfig, manager);
 
             itemView.findViewById(R.id.action_button)
                     .setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
                             mActionListItem.performAction(manager);
                         }
                     });
 
             new ImpressionTracker(itemView, new ImpressionTracker.Listener() {
                 @Override
                 public void onImpression() {
                     if (mActionListItem != null && !mActionListItem.mImpressionTracked) {
                         mActionListItem.mImpressionTracked = true;
-                        manager.trackSnippetCategoryActionImpression(
-                                mActionListItem.mCategoryInfo.getCategory(),
-                                mActionListItem.getPosition());
+                        manager.getSuggestionsMetricsReporter().onMoreButtonShown(mActionListItem);
                     }
                 }
             });
         }
 
         @Override
         public boolean isDismissable() {
             return SnippetsConfig.isSectionDismissalEnabled()
                     && !mActionListItem.mParentSection.hasSuggestions();
         }
@@ skipping 25 matching lines @@
 
         @Override
         public void onContextMenuCreated() {}
 
         public void onBindViewHolder(ActionItem item) {
             super.onBindViewHolder();
             mActionListItem = item;
         }
     }
 }