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;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 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;
 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";
+
     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 39 matching lines @@
     }
 
     /**
      * Display the data use items once they have been fetched from the compression stats.
      * @param items A list of items split by hostname to show in the breakdown.
      */
     public void onQueryDataUsageComplete(List<DataReductionDataUseItem> items) {
         mDataUseItems = items;
         setTextViewUnsortedAttributes(mDataUsedTitle);
         setTextViewSortedAttributes(mDataSavedTitle);
-        Collections.sort(items, new DataSavedComparator());
+        Collections.sort(mDataUseItems, new DataSavedComparator());
         if (mDataUseItems.size() == 0) {
             setVisibility(GONE);
         } else {
             setVisibility(VISIBLE);
             updateSiteBreakdown();
             DataReductionProxyUma.dataReductionProxyUIAction(
                     DataReductionProxyUma.ACTION_SITE_BREAKDOWN_DISPLAYED);
         }
     }
 
@@ skipping 20 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) {
-            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;
             }
             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) {
-            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;
             } else if (lhs.getDataUsed() < rhs.getDataUsed()) {
                 return 1;
             } else if (lhs.getDataUsed() > rhs.getDataUsed()) {
                 return -1;
             }
             return 0;
         }
@@ skipping 12 matching lines @@
 
         for (int i = 0; i < mDataUseItems.size(); i++) {
             if (i < mNumDataUseItemsToDisplay) {
                 TableRow row = (TableRow) LayoutInflater.from(getContext())
                                        .inflate(R.layout.data_usage_breakdown_row, null);
 
                 TextView hostnameView = (TextView) row.findViewById(R.id.site_hostname);
                 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()));
 
                 mTableLayout.addView(row, i + 1);
             } else {
                 numRemainingSites++;
                 everythingElseDataUsage += mDataUseItems.get(i).getDataUsed();
                 everythingElseDataSavings += mDataUseItems.get(i).getDataSaved();
             }
         }
@@ skipping 27 matching lines @@
                     mNumDataUseItemsToDisplay += NUM_DATA_USE_ITEMS_TO_ADD;
                     updateSiteBreakdown();
                 }
             });
 
             mTableLayout.addView(row, mNumDataUseItemsToDisplay + 1);
         }
 
         mTableLayout.requestLayout();
     }
-}
+}