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

chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java
index 8450c91e4fced05e1997bab2228d9f4ac7ea98e9..698a566bb70520743620e2cb0ef5e8f97c52e718 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java
@@ -18,6 +18,7 @@ import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxyAndroidUIStrings;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -30,6 +31,12 @@ import java.util.List;
  */
 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";
+
     private int mNumDataUseItemsToDisplay = 10;
 
     private TableLayout mTableLayout;
@@ -89,7 +96,7 @@ public class DataReductionSiteBreakdownView extends LinearLayout {
         mDataUseItems = items;
         setTextViewUnsortedAttributes(mDataUsedTitle);
         setTextViewSortedAttributes(mDataSavedTitle);
-        Collections.sort(items, new DataSavedComparator());
+        Collections.sort(mDataUseItems, new DataSavedComparator());
         if (mDataUseItems.size() == 0) {
             setVisibility(GONE);
         } else {
@@ -130,7 +137,12 @@ public class DataReductionSiteBreakdownView extends LinearLayout {
             implements Comparator<DataReductionDataUseItem>, Serializable {
         @Override
         public int compare(DataReductionDataUseItem lhs, DataReductionDataUseItem rhs) {
-            if (lhs.getDataUsed() < rhs.getDataUsed()) {
+            // Force the 'Other' category to the bottom of the list.
+            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;
@@ -147,7 +159,12 @@ public class DataReductionSiteBreakdownView extends LinearLayout {
             implements Comparator<DataReductionDataUseItem>, Serializable {
         @Override
         public int compare(DataReductionDataUseItem lhs, DataReductionDataUseItem rhs) {
-            if (lhs.getDataSaved() < rhs.getDataSaved()) {
+            // Force the 'Other' category to the bottom of the list.
+            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;
@@ -180,7 +197,11 @@ public class DataReductionSiteBreakdownView extends LinearLayout {
                 TextView dataUsedView = (TextView) row.findViewById(R.id.site_data_used);
                 TextView dataSavedView = (TextView) row.findViewById(R.id.site_data_saved);
 
-                hostnameView.setText(mDataUseItems.get(i).getHostname());
+                String hostName = mDataUseItems.get(i).getHostname();
+                if (OTHER_HOST_NAME.equals(hostName)) {
+                    hostName = DataReductionProxyAndroidUIStrings.getOtherHostName();

[megjablon, 2017/06/27 18:03:52]

Since the translated string is being added in Android and "Other" is just being
used as a key we don't need this jni interface and the string can be put in
android_chrome_strings.grd

[Raj, 2017/06/27 18:24:08]

Done

+                }
+                hostnameView.setText(hostName);
                 dataUsedView.setText(mDataUseItems.get(i).getFormattedDataUsed(getContext()));
                 dataSavedView.setText(mDataUseItems.get(i).getFormattedDataSaved(getContext()));
 
@@ -228,4 +249,4 @@ public class DataReductionSiteBreakdownView extends LinearLayout {
 
         mTableLayout.requestLayout();
     }
-}
+}