1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AppDrawerScrubberSections.java b/src/com/android/launcher3/AppDrawerScrubberSections.java
index 2d4fcaaaa..6ac12fdbf 100644
--- a/src/com/android/launcher3/AppDrawerScrubberSections.java
+++ b/src/com/android/launcher3/AppDrawerScrubberSections.java
@@ -29,12 +29,23 @@ public class AppDrawerScrubberSections {
     private static final int MAX_HEADERS = ALPHA_LETTERS.length() + MAX_NUMBER_CUSTOM_HEADERS;
     public static final int INVALID_INDEX = -1;
 
+    /** Header strings which have different strings in the scrubber **/
+    private static final HashMap<String, String> sHeaderScrubberStringMap;
+    static {
+        sHeaderScrubberStringMap = new HashMap<String, String>();
+        sHeaderScrubberStringMap.put(AppDrawerListAdapter.REMOTE_HEADER,
+                AppDrawerListAdapter.REMOTE_SCRUBBER);
+    }
+
     private AutoExpandTextView.HighlightedText mHighlightedText;
     private int mPreviousValidIndex;
     private int mNextValidIndex;
     private int mAdapterIndex;
 
     public AppDrawerScrubberSections(String text, boolean highlight, int idx) {
+        if (sHeaderScrubberStringMap.get(text) != null) {
+            text = sHeaderScrubberStringMap.get(text);
+        }
         mHighlightedText = new AutoExpandTextView.HighlightedText(text, highlight);
         mAdapterIndex = idx;
         mPreviousValidIndex = mNextValidIndex = idx;