Changes to metrics logging on translate UI in Android.

chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java

 // Copyright 2017 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.infobar;
 
 import android.support.design.widget.TabLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ skipping 53 matching lines @@
     private static final String INFOBAR_HISTOGRAM = "Translate.CompactInfobar.Event";
     private static final String INFOBAR_HISTOGRAM_TRANSLATION_COUNT =
             "Translate.CompactInfobar.TranslationsPerPage";
 
     /**
      * This is used to back a UMA histogram, so it should be treated as
      * append-only. The values should not be changed or reused, and
      * INFOBAR_HISTOGRAM_BOUNDARY should be the last.
      */
     private static final int INFOBAR_IMPRESSION = 0;
-    private static final int INFOBAR_TRANSLATE = 1;
+    private static final int INFOBAR_TARGET_TAB_TRANSLATE = 1;
     private static final int INFOBAR_DECLINE = 2;
     private static final int INFOBAR_OPTIONS = 3;
     private static final int INFOBAR_MORE_LANGUAGES = 4;
     private static final int INFOBAR_MORE_LANGUAGES_TRANSLATE = 5;
     private static final int INFOBAR_PAGE_NOT_IN = 6;
     private static final int INFOBAR_ALWAYS_TRANSLATE = 7;
     private static final int INFOBAR_NEVER_TRANSLATE = 8;
     private static final int INFOBAR_NEVER_TRANSLATE_SITE = 9;
     private static final int INFOBAR_SCROLL_HIDE = 10;
     private static final int INFOBAR_SCROLL_SHOW = 11;
     private static final int INFOBAR_REVERT = 12;
     private static final int INFOBAR_SNACKBAR_ALWAYS_TRANSLATE_IMPRESSION = 13;
     private static final int INFOBAR_SNACKBAR_NEVER_TRANSLATE_IMPRESSION = 14;
     private static final int INFOBAR_SNACKBAR_NEVER_TRANSLATE_SITE_IMPRESSION = 15;
     private static final int INFOBAR_SNACKBAR_CANCEL_ALWAYS = 16;
     private static final int INFOBAR_SNACKBAR_CANCEL_NEVER_SITE = 17;
     private static final int INFOBAR_SNACKBAR_CANCEL_NEVER = 18;
     private static final int INFOBAR_ALWAYS_TRANSLATE_UNDO = 19;
-    private static final int INFOBAR_CLOSE = 20;
+    private static final int INFOBAR_CLOSE_DEPRECATED = 20;
     private static final int INFOBAR_SNACKBAR_AUTO_ALWAYS_IMPRESSION = 21;
     private static final int INFOBAR_SNACKBAR_AUTO_NEVER_IMPRESSION = 22;
     private static final int INFOBAR_SNACKBAR_CANCEL_AUTO_ALWAYS = 23;
     private static final int INFOBAR_SNACKBAR_CANCEL_AUTO_NEVER = 24;
     private static final int INFOBAR_HISTOGRAM_BOUNDARY = 25;
 
     // Need 2 instances of TranslateMenuHelper to prevent a race condition bug which happens when
     // showing language menu after dismissing overflow menu.
     private TranslateMenuHelper mOverflowMenuHelper;
     private TranslateMenuHelper mLanguageMenuHelper;
     private TintedImageButton mMenuButton;
 
     private boolean mMenuExpanded;
     private boolean mIsFirstLayout = true;
+    private boolean mUserInteracted;
 
     /** The controller for translate UI snackbars. */
     class TranslateSnackbarController implements SnackbarController {
         private final int mActionId;
 
         public TranslateSnackbarController(int actionId) {
             mActionId = actionId;
         }
 
         @Override
@@ skipping 59 matching lines @@
                 (LinearLayout) LayoutInflater.from(getContext())
                         .inflate(R.layout.infobar_translate_compact_content, parent, false);
 
         mTabLayout = (TranslateTabLayout) content.findViewById(R.id.translate_infobar_tabs);
         mTabLayout.addTabs(mOptions.sourceLanguageName(), mOptions.targetLanguageName());
 
         // Set translating status in the beginning for pages translated automatically.
         if (mInitialStep == TRANSLATING_INFOBAR) {
             mTabLayout.getTabAt(TARGET_TAB_INDEX).select();
             mTabLayout.showProgressBarOnTab(TARGET_TAB_INDEX);
+            mUserInteracted = true;
         }
 
         mTabLayout.addOnTabSelectedListener(this);
 
         // Dismiss all menus and end peeking animation when there is layout changed.
         mTabLayout.addOnLayoutChangeListener(new OnLayoutChangeListener() {
             @Override
             public void onLayoutChange(View v, int left, int top, int right, int bottom,
                     int oldLeft, int oldTop, int oldRight, int oldBottom) {
                 if (left != oldLeft || top != oldTop || right != oldRight || bottom != oldBottom) {
@@ skipping 48 matching lines @@
             default:
                 assert false : "Unsupported Menu Item Id";
         }
     }
 
     private void startTranslating(int tabPosition) {
         if (TARGET_TAB_INDEX == tabPosition) {
             // Already on the target tab.
             mTabLayout.showProgressBarOnTab(TARGET_TAB_INDEX);
             onButtonClicked(ActionType.TRANSLATE);
+            mUserInteracted = true;
         } else {
             mTabLayout.getTabAt(TARGET_TAB_INDEX).select();
         }
     }
 
     @CalledByNative
     private void onPageTranslated(int errorType) {
         incrementAndRecordTranslationsPerPageCount();
         if (mTabLayout != null) {
             mTabLayout.hideProgressBar();
@@ skipping 21 matching lines @@
                 Snackbar.UMA_TRANSLATE_ALWAYS, ACTION_AUTO_ALWAYS_TRANSLATE);
     }
 
     @Override
     protected void onNativeDestroyed() {
         mNativeTranslateInfoBarPtr = 0;
         super.onNativeDestroyed();
     }
 
     private void closeInfobar(boolean explicitly) {
+        if (!mUserInteracted) {
+            recordInfobarAction(INFOBAR_DECLINE);
+        }
+
         // Check if we should trigger the auto "never translate" if infobar is closed explicitly.
         if (explicitly && mNativeTranslateInfoBarPtr != 0
                 && nativeShouldAutoNeverTranslate(mNativeTranslateInfoBarPtr, mMenuExpanded)) {
             createAndShowSnackbar(getContext().getString(R.string.translate_snackbar_language_never,
                                           mOptions.sourceLanguageName()),
                     Snackbar.UMA_TRANSLATE_NEVER, ACTION_AUTO_NEVER_LANGUAGE);
             // Postpone the infobar dismiss until the snackbar finished showing.  Otherwise, the
             // reference to the native infobar is killed and there is no way for the snackbar to
             // perform the action.
             return;
         }
-        recordInfobarAction(INFOBAR_CLOSE);
         // This line will dismiss this infobar.
         super.onCloseButtonClicked();
     }
 
     @Override
     public void onCloseButtonClicked() {
         mTabLayout.endPeekingAnimationIfPlaying();
         closeInfobar(true);
     }
 
     @Override
     public void onTabSelected(TabLayout.Tab tab) {
         switch (tab.getPosition()) {
             case SOURCE_TAB_INDEX:
                 incrementAndRecordTranslationsPerPageCount();
                 recordInfobarAction(INFOBAR_REVERT);
                 onButtonClicked(ActionType.TRANSLATE_SHOW_ORIGINAL);
                 return;
             case TARGET_TAB_INDEX:
-                recordInfobarAction(INFOBAR_TRANSLATE);
+                recordInfobarAction(INFOBAR_TARGET_TAB_TRANSLATE);
                 recordInfobarLanguageData(
                         INFOBAR_HISTOGRAM_TRANSLATE_LANGUAGE, mOptions.targetLanguageCode());
                 startTranslating(TARGET_TAB_INDEX);
                 return;
             default:
                 assert false : "Unexpected Tab Index";
         }
     }
 
     @Override
@@ skipping 47 matching lines @@
                 return;
             default:
                 assert false : "Unexpected overflow menu code";
         }
     }
 
     @Override
     public void onTargetMenuItemClicked(String code) {
         // Reset target code in both UI and native.
         if (mNativeTranslateInfoBarPtr != 0 && mOptions.setTargetLanguage(code)) {
+            recordInfobarAction(INFOBAR_MORE_LANGUAGES_TRANSLATE);
             recordInfobarLanguageData(
                     INFOBAR_HISTOGRAM_MORE_LANGUAGES_LANGUAGE, mOptions.targetLanguageCode());
             nativeApplyStringTranslateOption(
                     mNativeTranslateInfoBarPtr, TranslateOption.TARGET_CODE, code);
             // Adjust UI.
             mTabLayout.replaceTabTitle(TARGET_TAB_INDEX, mOptions.getRepresentationFromCode(code));
             startTranslating(mTabLayout.getSelectedTabPosition());
         }
     }
 
@@ skipping 87 matching lines @@
                 if (mOptions.alwaysTranslateLanguageState()
                         && mTabLayout.getSelectedTabPosition() == SOURCE_TAB_INDEX) {
                     startTranslating(mTabLayout.getSelectedTabPosition());
                 }
                 return;
             case ACTION_AUTO_ALWAYS_TRANSLATE:
                 toggleAlwaysTranslate();
                 return;
             case ACTION_OVERFLOW_NEVER_LANGUAGE:
             case ACTION_AUTO_NEVER_LANGUAGE:
+                mUserInteracted = true;
                 // After applying this option, the infobar will dismiss.
                 nativeApplyBoolTranslateOption(
                         mNativeTranslateInfoBarPtr, TranslateOption.NEVER_TRANSLATE, true);
                 return;
             case ACTION_OVERFLOW_NEVER_SITE:
+                mUserInteracted = true;
                 // After applying this option, the infobar will dismiss.
                 nativeApplyBoolTranslateOption(
                         mNativeTranslateInfoBarPtr, TranslateOption.NEVER_TRANSLATE_SITE, true);
                 return;
             default:
                 assert false : "Unsupported Menu Item Id, in handle post snackbar";
         }
     }
 
     private void toggleAlwaysTranslate() {
@@ skipping 19 matching lines @@
                 INFOBAR_HISTOGRAM_TRANSLATION_COUNT, ++mTotalTranslationCount);
     }
 
     private native void nativeApplyStringTranslateOption(
             long nativeTranslateCompactInfoBar, int option, String value);
     private native void nativeApplyBoolTranslateOption(
             long nativeTranslateCompactInfoBar, int option, boolean value);
     private native boolean nativeShouldAutoNeverTranslate(
             long nativeTranslateCompactInfoBar, boolean menuExpanded);
 }