Show a Google "G" in the omnibox on the New Tab Page.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java

 // Copyright 2015 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.omnibox;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.support.v4.view.animation.FastOutLinearInInterpolator;
 import android.text.Selection;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.ui.UiUtils;
 
 /**
  * A location bar implementation specific for smaller/phone screens.
  */
 public class LocationBarPhone extends LocationBarLayout {
     private static final int KEYBOARD_MODE_CHANGE_DELAY_MS = 300;
     private static final int KEYBOARD_HIDE_DELAY_MS = 150;
 
     private static final int ACTION_BUTTON_TOUCH_OVERFLOW_LEFT = 15;
 
+    private static final Interpolator GOOGLE_G_FADE_INTERPOLATOR =
+            new FastOutLinearInInterpolator();
+
     private View mFirstVisibleFocusedView;
     private View mIncognitoBadge;
+    private View mGoogleGContainer;
+    private View mGoogleG;
     private View mUrlActionsContainer;
     private TintedImageButton mMenuButton;
     private ImageView mMenuBadge;
     private View mMenuButtonWrapper;
     private int mIncognitoBadgePadding;
+    private int mGoogleGWidth;
+    private int mGoogleGMargin;
     private float mUrlFocusChangePercent;
     private Runnable mKeyboardResizeModeTask;
     private ObjectAnimator mOmniboxBackgroundAnimator;
 
     private boolean mShowMenuBadge;
     private AnimatorSet mMenuBadgeAnimatorSet;
     private boolean mIsMenuBadgeAnimationRunning;
 
     /**
      * Constructor used to inflate from XML.
      */
     public LocationBarPhone(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
         mFirstVisibleFocusedView = findViewById(R.id.url_bar);
         mIncognitoBadge = findViewById(R.id.incognito_badge);
         mIncognitoBadgePadding =
                 getResources().getDimensionPixelSize(R.dimen.location_bar_incognito_badge_padding);
 
+        mGoogleGContainer = findViewById(R.id.google_g_container);
+        mGoogleG = findViewById(R.id.google_g);
+        mGoogleGWidth = getResources().getDimensionPixelSize(R.dimen.location_bar_google_g_width);
+        mGoogleGMargin = getResources().getDimensionPixelSize(R.dimen.location_bar_google_g_margin);
+
         mUrlActionsContainer = findViewById(R.id.url_action_container);
         Rect delegateArea = new Rect();
         mUrlActionsContainer.getHitRect(delegateArea);
         delegateArea.left -= ACTION_BUTTON_TOUCH_OVERFLOW_LEFT;
         TouchDelegate touchDelegate = new TouchDelegate(delegateArea, mUrlActionsContainer);
         assert mUrlActionsContainer.getParent() == this;
         setTouchDelegate(touchDelegate);
 
         mMenuButton = (TintedImageButton) findViewById(R.id.document_menu_button);
         mMenuBadge = (ImageView) findViewById(R.id.document_menu_badge);
@@ skipping 21 matching lines @@
                 return false;
             }
         });
     }
 
     @Override
     public View getMenuAnchor() {
         return mMenuButton;
     }
 
-    @Override
-    public void getContentRect(Rect outRect) {
-        super.getContentRect(outRect);
-        if (mIncognitoBadge.getVisibility() == View.GONE) return;
-
-        if (!ApiCompatibilityUtils.isLayoutRtl(this)) {
-            outRect.left += mIncognitoBadge.getWidth();
-        } else {
-            outRect.right -= mIncognitoBadge.getWidth();
-        }
-    }
-
     /**
      * @return The first view visible when the location bar is focused.
      */
     public View getFirstViewVisibleWhenFocused() {
         return mFirstVisibleFocusedView;
     }
 
     /**
      * Updates percentage of current the URL focus change animation.
      * @param percent 1.0 is 100% focused, 0 is completely unfocused.
@@ skipping 125 matching lines @@
 
         NewTabPage ntp = getToolbarDataProvider().getNewTabPageForCurrentTab();
         if (hasFocus && ntp != null && ntp.isLocationBarShownInNTP()) {
             mFadingView.showFadingOverlay();
         }
     }
 
     @Override
     protected void updateButtonVisibility() {
         updateDeleteButtonVisibility();
-        updateMicButtonVisiblity(mUrlFocusChangePercent);
+        updateMicButtonVisibility(mUrlFocusChangePercent);
+
+        NewTabPage ntp = getToolbarDataProvider().getNewTabPageForCurrentTab();

[mdjones, 2017/02/11 00:32:57]

Can we isolate all this new logic into a function like the two above? Something
like updateGoogleG()?

[Bernhard Bauer, 2017/02/13 17:18:01]

Done.

+        if (ntp == null || !ntp.isLocationBarShownInNTP()) {
+            mGoogleGContainer.setVisibility(View.GONE);
+            return;
+        }
+
+        mGoogleGContainer.setVisibility(View.VISIBLE);
+        float animationProgress =
+                GOOGLE_G_FADE_INTERPOLATOR.getInterpolation(mUrlFocusChangePercent);
+        mGoogleG.setAlpha(1 - animationProgress);
+
+        // Shrink the width down to zero, and the end margin down to half of its starting value.
+        FrameLayout.LayoutParams layoutParams =
+                (FrameLayout.LayoutParams) mGoogleG.getLayoutParams();
+        layoutParams.width = Math.round(mGoogleGWidth * (1 - animationProgress));
+        ApiCompatibilityUtils.setMarginEnd(
+                layoutParams, Math.round(MathUtils.interpolate(
+                                      mGoogleGMargin, mGoogleGMargin / 2f, animationProgress)));
+
+        // Just calling requestLayout() would not resolve the end margin.
+        mGoogleG.setLayoutParams(layoutParams);
     }
 
     @Override
     protected void updateLocationBarIconContainerVisibility() {
         super.updateLocationBarIconContainerVisibility();
         updateIncognitoBadgePadding();
     }
 
     private void updateIncognitoBadgePadding() {
         // This can be triggered in the super.onFinishInflate, so we need to null check in this
@@ skipping 69 matching lines @@
 
         mMenuBadgeAnimatorSet.start();
     }
 
     public void cancelAppMenuUpdateBadgeAnimation() {
         if (mIsMenuBadgeAnimationRunning && mMenuBadgeAnimatorSet != null) {
             mMenuBadgeAnimatorSet.cancel();
         }
     }
 }