Add 'Other' category on the Data Saver site-breakdown page

chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.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.preferences.datareduction;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
 import android.text.format.Formatter;
@@ skipping 12 matching lines @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 /**
  * A site breakdown view to be used by the Data Saver settings page. It displays the top ten sites
  * with the most data use or data savings.
  */
 public class DataReductionSiteBreakdownView extends LinearLayout {
     private static final int NUM_DATA_USE_ITEMS_TO_ADD = 10;
+
+    // Hostname used for the other bucket which consists of chrome-services traffic.
+    // This should be in sync with the same in DataReductionProxyDataUseObserver.
+    private static final String OTHER_HOST_NAME = "Other";

[rajendrant, 2017/06/20 23:24:25]

Not sure if a new string should be added in android_chrome_strings.grd.
Since this is a URL, it needs no translation.
wdyt

[megjablon, 2017/06/20 23:45:46]

This should definitely be translated. It will probably need to go in
generated_strings.grd so that we can get it in the observer, and then we'll have
a jni call to native to get it here.

[rajendrant, 2017/06/21 00:30:31]

OK. I am adding an entry in android_chrome_strings.grd and using that while
showing the UI.
The DB will still have it keyed as 'Other'. Translated string will be used only
in the UI.
wdyt. Is this fine. Or do you find it hacky.

+
     private int mNumDataUseItemsToDisplay = 10;
 
     private TableLayout mTableLayout;
     private TextView mDataUsedTitle;
     private TextView mDataSavedTitle;
     private List<DataReductionDataUseItem> mDataUseItems;
     @ColorInt
     private int mTextColor;
     @ColorInt
     private int mLightTextColor;
@@ skipping 79 matching lines @@
         }
         return drawables[2];
     }
 
     /**
      * Sorts the DataReductionDataUseItems by most to least data used.
      */
     private static final class DataUsedComparator
             implements Comparator<DataReductionDataUseItem>, Serializable {
         @Override
         public int compare(DataReductionDataUseItem lhs, DataReductionDataUseItem rhs) {

[megjablon, 2017/06/20 23:45:46]

Please add a comment as to what this is doing. At least to me, it isn't
instantly intuitive that is this if forcing the "Other" category to the bottom.

[rajendrant, 2017/06/21 00:30:31]

Done.

-            if (lhs.getDataUsed() < rhs.getDataUsed()) {
+            if (OTHER_HOST_NAME.equals(lhs.getHostname())) {
+                return 1;
+            } else if (OTHER_HOST_NAME.equals(rhs.getHostname())) {
+                return -1;
+            } else if (lhs.getDataUsed() < rhs.getDataUsed()) {
                 return 1;
             } else if (lhs.getDataUsed() > rhs.getDataUsed()) {
                 return -1;
             }
             return 0;
         }
     }
 
     /**
      * Sorts the DataReductionDataUseItems by most to least data saved. If data saved is equal, most
      * likely because both items have zero data saving, then sort by data used.
      */
     private static class DataSavedComparator
             implements Comparator<DataReductionDataUseItem>, Serializable {
         @Override
         public int compare(DataReductionDataUseItem lhs, DataReductionDataUseItem rhs) {

[megjablon, 2017/06/20 23:45:46]

Also a comment here.

[rajendrant, 2017/06/21 00:30:31]

Done.

-            if (lhs.getDataSaved() < rhs.getDataSaved()) {
+            if (OTHER_HOST_NAME.equals(lhs.getHostname())) {
+                return 1;
+            } else if (OTHER_HOST_NAME.equals(rhs.getHostname())) {
+                return -1;
+            } else if (lhs.getDataSaved() < rhs.getDataSaved()) {
                 return 1;
             } else if (lhs.getDataSaved() > rhs.getDataSaved()) {
                 return -1;
             } else if (lhs.getDataUsed() < rhs.getDataUsed()) {
                 return 1;
             } else if (lhs.getDataUsed() > rhs.getDataUsed()) {
                 return -1;
             }
             return 0;
         }
@@ skipping 60 matching lines @@
                     mNumDataUseItemsToDisplay += NUM_DATA_USE_ITEMS_TO_ADD;
                     updateSiteBreakdown();
                 }
             });
 
             mTableLayout.addView(row, mNumDataUseItemsToDisplay + 1);
         }
 
         mTableLayout.requestLayout();
     }
-}
+}