Fix text theming bug in Clank Start Phase 2.

This CL fixes 2 bugs with Clank Start Phase 2.

1. When focusing URL bar, the current tab's URL was displaying.

2. Primary color was returning default color during tab switcher exit
transition. Fixed by observing if a tab switcher exit is in progress.

R=yusufo@chromium.org

Bug: 968210
Change-Id: Id2a934be168e38aa5ffd50f6bddbe393e8500c70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635415Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Matt Simmons <mattsimmons@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664823}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java

@@ -1866,19 +1866,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
 
         if (inTabSwitcherMode) {
             mUrlBar.setText("");
-            mLocationBar.updateStatusIcon();
-            // Early return here allows the location bar to remain visible and functional while
-            // the tab switcher (overview) is being displayed.
-            return true;
-        }
-
-        if (getToolbarDataProvider() != null && getToolbarDataProvider().getUrlBarData() != null) {
-            // Set the text back to the correct display text in case we've previously cleared
-            // it.
+        } else if (getToolbarDataProvider() != null
+                && getToolbarDataProvider().getUrlBarData() != null) {
             mUrlBar.setText(getToolbarDataProvider().getUrlBarData().displayText);
         }
 
-        return false;
+        return true;
     }
 
     @Override
@@ -2096,9 +2089,9 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
 
         if (mToggleTabStackButton != null) mToggleTabStackButton.setClickable(!hasFocus);
 
-        if (getToolbarDataProvider().isInOverviewAndShowingOmnibox() && !hasFocus) {
+        if (getToolbarDataProvider().isInOverviewAndShowingOmnibox()) {
             mUrlBar.setText("");
-            return;
+            if (!hasFocus) return;
         }
 
         triggerUrlFocusAnimation(hasFocus);
@@ -2149,9 +2142,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
                 mLocationBar.finishUrlFocusChange(hasFocus);
                 mUrlFocusChangeInProgress = false;
 
-                if (getToolbarDataProvider().isInOverviewAndShowingOmnibox()) {
-                    mLocationBar.updateVisualsForState();
-                    mUrlBar.setText("");
+                if (getToolbarDataProvider().shouldShowLocationBarInOverviewMode()) {
+                    mLocationBar.updateStatusIcon();
+
+                    if (getToolbarDataProvider().isInOverviewAndShowingOmnibox()) {
+                        mUrlBar.setText("");
+                    }
                 }
             }
         });