Bug 1242624 - Use our color palette for toolbar and URL bar text. r=sebastian

mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java

@@ -125,6 +125,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
     private static final int LEVEL_SEARCH_ICON = 999;
 
     private final ForegroundColorSpan mUrlColorSpan;
+    private final ForegroundColorSpan mPrivateUrlColorSpan;
     private final ForegroundColorSpan mBlockedColorSpan;
     private final ForegroundColorSpan mDomainColorSpan;
     private final ForegroundColorSpan mPrivateDomainColorSpan;
@@ -142,6 +143,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
         mTitlePadding = mTitle.getPaddingRight();
 
         mUrlColorSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.url_bar_urltext));
+        mPrivateUrlColorSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.url_bar_urltext_private));
         mBlockedColorSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.url_bar_blockedtext));
         mDomainColorSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.url_bar_domaintext));
         mPrivateDomainColorSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.url_bar_domaintext_private));
@@ -318,7 +320,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
 
         final SpannableStringBuilder builder = new SpannableStringBuilder(url);
 
-        builder.setSpan(mUrlColorSpan, 0, url.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        builder.setSpan(isPrivate ? mPrivateUrlColorSpan : mUrlColorSpan, 0, url.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         builder.setSpan(isPrivate ? mPrivateDomainColorSpan : mDomainColorSpan,
                 index, index + baseDomain.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 

mobile/android/base/resources/values/colors.xml

@@ -108,9 +108,10 @@
   <color name="textbox_stroke">#000</color>
   <color name="textbox_stroke_disabled">#666</color>
 
-  <color name="url_bar_urltext">#A6A6A6</color>
-  <color name="url_bar_domaintext">#000</color>
-  <color name="url_bar_domaintext_private">#FFF</color>
+  <color name="url_bar_urltext">#AFB1B3</color>
+  <color name="url_bar_urltext_private">#777777</color>
+  <color name="url_bar_domaintext">#363B40</color>
+  <color name="url_bar_domaintext_private">#FFFFFF</color>
   <color name="url_bar_blockedtext">#b14646</color>
   <color name="url_bar_shadow">#12000000</color>