Clean up document-mode specific UI.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.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.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 97 matching lines @@
     private TintedImageButton mHomeButton;
     private TextView mUrlBar;
     private View mUrlActionContainer;
     private ImageView mToolbarShadow;
 
     private final int mProgressBackBackgroundColorWhite;
 
     private ObjectAnimator mTabSwitcherModeAnimation;
     private ObjectAnimator mDelayedTabSwitcherModeAnimation;
 
-    private final List<View> mTabSwitcherModeViews = new ArrayList<View>();
-    private final Set<View> mBrowsingModeViews = new HashSet<View>();
+    private final List<View> mTabSwitcherModeViews = new ArrayList<>();
+    private final Set<View> mBrowsingModeViews = new HashSet<>();
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mIsInTabSwitcherMode;
 
     // This determines whether or not the toolbar draws as expected (false) or whether it always
     // draws as if it's showing the non-tabswitcher, non-animating toolbar. This is used in grabbing
     // a bitmap to use as a texture representation of this view.
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mTextureCaptureMode;
     private boolean mForceTextureCapture;
     private boolean mUseLightDrawablesForTextureCapture;
@@ skipping 199 matching lines @@
 
         mLocationBarBackground =
                 ApiCompatibilityUtils.getDrawable(getResources(), R.drawable.textbox);
         mLocationBarBackground.getPadding(mLocationBarBackgroundPadding);
         mLocationBar.setPadding(
                 mLocationBarBackgroundPadding.left, mLocationBarBackgroundPadding.top,
                 mLocationBarBackgroundPadding.right, mLocationBarBackgroundPadding.bottom);
 
         setLayoutTransition(null);
 
-        mMenuButtonWrapper.setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
-        if (FeatureUtilities.isDocumentMode(getContext())) {
-            ApiCompatibilityUtils.setMarginEnd(
-                    (MarginLayoutParams) mMenuButtonWrapper.getLayoutParams(),
-                    getResources().getDimensionPixelSize(R.dimen.document_toolbar_menu_offset));
-            hideTabSwitchingResources();
-        } else {
-            inflateTabSwitchingResources();
-        }
+        mMenuButtonWrapper.setVisibility(View.VISIBLE);
+        inflateTabSwitchingResources();
 
         setWillNotDraw(false);
     }
 
     private void inflateTabSwitchingResources() {
         mToggleTabStackButton = (ImageView) findViewById(R.id.tab_switcher_button);
         mNewTabButton = (NewTabButton) findViewById(R.id.new_tab_button);
 
         mToggleTabStackButton.setClickable(false);
         Resources resources = getResources();
@@ skipping 13 matching lines @@
         wm.getDefaultDisplay().getSize(screenSize);
 
         mToolbarButtonsContainer.measure(
                 MeasureSpec.makeMeasureSpec(screenSize.x, MeasureSpec.AT_MOST),
                 MeasureSpec.makeMeasureSpec(screenSize.y, MeasureSpec.AT_MOST));
 
         ApiCompatibilityUtils.setMarginEnd(getFrameLayoutParams(mNewTabButton),
                 mToolbarButtonsContainer.getMeasuredWidth());
     }
 
-    private void hideTabSwitchingResources() {
-        ImageView toggleTabStackButton = (ImageView) findViewById(R.id.tab_switcher_button);
-        toggleTabStackButton.setVisibility(View.GONE);
-        // We don't need to hide new tab button since it's invisible by default.
-    }
-
-    private void unhideTabSwitchingResources() {
-        ImageView toggleTabStackButton = (ImageView) findViewById(R.id.tab_switcher_button);
-        toggleTabStackButton.setVisibility(View.VISIBLE);
-    }
-
     private void enableTabSwitchingResources() {
         mToggleTabStackButton.setOnClickListener(this);
         mToggleTabStackButton.setOnLongClickListener(this);
         mToggleTabStackButton.setOnKeyListener(new KeyboardNavigationListener() {
             @Override
             public View getNextFocusForward() {
                 if (mMenuButton != null && mMenuButton.isShown()) {
                     return mMenuButton;
                 } else {
                     return getCurrentTabView();
                 }
             }
 
             @Override
             public View getNextFocusBackward() {
                 return findViewById(R.id.url_bar);
             }
         });
         mNewTabButton.setOnClickListener(this);
     }
 
-    private void removeTabSwitchingResources() {
-        ImageView toggleTabStackButton = (ImageView) findViewById(R.id.tab_switcher_button);
-        NewTabButton newTabButton = (NewTabButton) findViewById(R.id.new_tab_button);
-        assert mToolbarButtonsContainer.indexOfChild(toggleTabStackButton) >= 0;
-        mToolbarButtonsContainer.removeView(toggleTabStackButton);
-        assert indexOfChild(newTabButton) >= 0;
-        removeView(newTabButton);
-    }
-
     @Override
     protected boolean onMenuButtonTouchEvent(View v, MotionEvent event) {
         dismissTabSwitcherCallout();
         return super.onMenuButtonTouchEvent(v, event);
     }
 
     /**
      * Sets up click and key listeners once we have native library available to handle clicks.
      */
     @Override
     public void onNativeLibraryReady() {
         super.onNativeLibraryReady();
         getLocationBar().onNativeLibraryReady();
 
-        if (FeatureUtilities.isDocumentMode(getContext())) {
-            removeTabSwitchingResources();
-        } else {  // non-document mode
-            enableTabSwitchingResources();
-        }
+        enableTabSwitchingResources();
 
         mHomeButton.setOnClickListener(this);
 
         mMenuButton.setOnKeyListener(new KeyboardNavigationListener() {
             @Override
             public View getNextFocusForward() {
                 return getCurrentTabView();
             }
 
             @Override
@@ skipping 91 matching lines @@
         int rightViewBounds = getViewBoundsRightOfLocationBar(mVisualState);
 
         if (!hasVisibleViewPriorToUrlBar) {
             if (ApiCompatibilityUtils.isLayoutRtl(mLocationBar)) {
                 rightViewBounds -= mToolbarSidePadding;
             } else {
                 leftViewBounds += mToolbarSidePadding;
             }
         }
 
-        if (!mLocationBar.hasVisibleViewsAfterUrlBarWhenUnfocused()) {
-            // Add spacing between the end of the URL and the edge of the omnibox drawable.
-            // This only applies if there is no end aligned view that should be visible
-            // while the omnibox is unfocused.
-            if (ApiCompatibilityUtils.isLayoutRtl(mLocationBar)) {
-                leftViewBounds += mToolbarSidePadding;
-            } else {
-                rightViewBounds -= mToolbarSidePadding;
-            }
+        // Add spacing between the end of the URL and the edge of the omnibox drawable.
+        // This only applies if there is no end aligned view that should be visible
+        // while the omnibox is unfocused.
+        if (ApiCompatibilityUtils.isLayoutRtl(mLocationBar)) {
+            leftViewBounds += mToolbarSidePadding;
+        } else {
+            rightViewBounds -= mToolbarSidePadding;
         }
 
         mUnfocusedLocationBarLayoutWidth = rightViewBounds - leftViewBounds;
         mUnfocusedLocationBarLayoutLeft = leftViewBounds;
     }
 
     /**
      * @return The background drawable for the fullscreen overlay.
      */
     @VisibleForTesting
@@ skipping 375 matching lines @@
                     - NTP_SEARCH_BOX_EXPANSION_INTERPOLATOR.getInterpolation(mUrlExpansionPercent);
         } else {
             // During the transition from middle of the NTP to the top, keep the omnibox drawing
             // at the same size of the search box for first 40% of the scroll transition.
             shrinkage = Math.min(1f, (1f - mUrlExpansionPercent) * 1.66667f);
         }
 
         int leftBoundDifference = mNtpSearchBoxBounds.left - mLocationBarBackgroundBounds.left;
         int rightBoundDifference = mNtpSearchBoxBounds.right - mLocationBarBackgroundBounds.right;
         mLocationBarBackgroundNtpOffset.set(
-                (int) Math.round(leftBoundDifference * shrinkage),
+                Math.round(leftBoundDifference * shrinkage),
                 locationBarTranslationY,
-                (int) Math.round(rightBoundDifference * shrinkage),
+                Math.round(rightBoundDifference * shrinkage),
                 locationBarTranslationY);
 
         // The omnibox background bounds are outset by |mLocationBarBackgroundCornerRadius| in the
         // fully expanded state (and only there!) to hide the rounded corners, so undo that before
         // applying the shrinkage factor.
         mLocationBarNtpOffsetLeft =
                 (leftBoundDifference - mLocationBarBackgroundCornerRadius) * shrinkage;
         mLocationBarNtpOffsetRight =
                 (rightBoundDifference + mLocationBarBackgroundCornerRadius) * shrinkage;
 
@@ skipping 808 matching lines @@
             shadowDrawable.reverseTransition(URL_FOCUS_CHANGE_ANIMATION_DURATION_MS);
         }
     }
 
     private void triggerUrlFocusAnimation(final boolean hasFocus) {
         if (mUrlFocusLayoutAnimator != null && mUrlFocusLayoutAnimator.isRunning()) {
             mUrlFocusLayoutAnimator.cancel();
             mUrlFocusLayoutAnimator = null;
         }
 
-        List<Animator> animators = new ArrayList<Animator>();
+        List<Animator> animators = new ArrayList<>();
         if (hasFocus) {
             populateUrlFocusingAnimatorSet(animators);
         } else {
             populateUrlClearFocusingAnimatorSet(animators);
         }
         mUrlFocusLayoutAnimator = new AnimatorSet();
         mUrlFocusLayoutAnimator.playTogether(animators);
 
         mUrlFocusChangeInProgress = true;
         mUrlFocusLayoutAnimator.addListener(new AnimatorListenerAdapter() {
@@ skipping 24 matching lines @@
                     requestLayout();
                 }
                 mLocationBar.finishUrlFocusChange(hasFocus);
                 mUrlFocusChangeInProgress = false;
             }
         });
         mUrlFocusLayoutAnimator.start();
     }
 
     @Override
-    protected boolean shouldShowMenuButton() {
-        // Even in Document mode, the toolbar menu button will be shown while on the NTP.  This
-        // allows the menu to translate off the screen on scroll to match the tabbed behavior.
-        if (mVisualState == VisualState.NEW_TAB_NORMAL) return true;
-
-        return !mLocationBar.showMenuButtonInOmnibox() && super.shouldShowMenuButton();
-    }
-
-    @Override
     protected void updateTabCountVisuals(int numberOfTabs) {
         if (mReturnButton != null) mReturnButton.setEnabled(true);
         if (mHomeButton != null) mHomeButton.setEnabled(true);
 
         if (mToggleTabStackButton == null) return;
 
         mToggleTabStackButton.setEnabled(numberOfTabs >= 1);
         mToggleTabStackButton.setContentDescription(
                 getResources().getString(R.string.accessibility_toolbar_btn_tabswitcher_toggle,
                         numberOfTabs));
@@ skipping 259 matching lines @@
 
         if (mToggleTabStackButton != null) {
             mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
                     ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             if (mTabSwitcherAnimationTabStackDrawable != null) {
                 mTabSwitcherAnimationTabStackDrawable.setTint(
                         mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
             }
         }
 
-        if (shouldShowMenuButton()) {
-            mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
+        mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
 
-            if (mShowMenuBadge && !mIsInTabSwitcherMode) {
-                setAppMenuUpdateBadgeDrawable(mUseLightToolbarDrawables);
-            }
+        if (mShowMenuBadge && !mIsInTabSwitcherMode) {
+            setAppMenuUpdateBadgeDrawable(mUseLightToolbarDrawables);
         }
         ColorStateList tint = mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint;
         if (isReturnButtonVisible()) mReturnButton.setTint(tint);
         if (mIsHomeButtonEnabled) mHomeButton.setTint(tint);
 
         mLocationBar.updateVisualsForState();
         // Remove the side padding for incognito to ensure the badge icon aligns correctly with the
         // background of the location bar.
         if (isIncognito) {
             mLocationBar.setPadding(
@@ skipping 13 matching lines @@
         if (mIsInTabSwitcherMode) mNewTabButton.setIsIncognito(isIncognito);
 
         CharSequence newTabContentDescription = getResources().getText(
                 isIncognito ? R.string.accessibility_toolbar_btn_new_incognito_tab :
                         R.string.accessibility_toolbar_btn_new_tab);
         if (mNewTabButton != null
                 && !newTabContentDescription.equals(mNewTabButton.getContentDescription())) {
             mNewTabButton.setContentDescription(newTabContentDescription);
         }
 
-        getMenuButtonWrapper().setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
+        getMenuButtonWrapper().setVisibility(View.VISIBLE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mLocationBar;
     }
 
     @Override
     public void showAppMenuUpdateBadge() {
         super.showAppMenuUpdateBadge();
 
         // Set up variables.
         if (!mBrowsingModeViews.contains(mMenuBadge)) {
             mBrowsingModeViews.add(mMenuBadge);
         }
 
         // Finish any in-progress animations and set the TabSwitcherAnimationMenuBadgeDrawables.
         finishAnimations();
         setTabSwitcherAnimationMenuBadgeDrawable();
 
         // Show the badge.
-        if (!mIsInTabSwitcherMode && shouldShowMenuButton()) {
+        if (!mIsInTabSwitcherMode) {
             if (mUseLightToolbarDrawables) {
                 setAppMenuUpdateBadgeDrawable(mUseLightToolbarDrawables);
             }
             setAppMenuUpdateBadgeToVisible(true);
         }
-
-        mLocationBar.showAppMenuUpdateBadge(true);
     }
 
     @Override
     public void removeAppMenuUpdateBadge(boolean animate) {
         super.removeAppMenuUpdateBadge(animate);
 
         if (mBrowsingModeViews.contains(mMenuBadge)) {
             mBrowsingModeViews.remove(mMenuBadge);
             mTabSwitcherAnimationMenuBadgeDarkDrawable = null;
             mTabSwitcherAnimationMenuBadgeLightDrawable = null;
         }
 
         mLocationBar.removeAppMenuUpdateBadge(animate);
     }
 
     private void setTabSwitcherAnimationMenuDrawable() {
-        if (!shouldShowMenuButton()) return;
         mTabSwitcherAnimationMenuDrawable = ApiCompatibilityUtils.getDrawable(getResources(),
                 R.drawable.btn_menu);
         mTabSwitcherAnimationMenuDrawable.mutate();
         mTabSwitcherAnimationMenuDrawable.setColorFilter(
                 isIncognito() ? mLightModeDefaultColor : mDarkModeDefaultColor,
                 PorterDuff.Mode.SRC_IN);
         ((BitmapDrawable) mTabSwitcherAnimationMenuDrawable).setGravity(Gravity.CENTER);
     }
 
     private void setTabSwitcherAnimationMenuBadgeDrawable() {
@@ skipping 62 matching lines @@
         });
 
         if (mFullscreenManager != null) {
             mFullscreenCalloutToken =
                     mFullscreenManager.showControlsPersistentAndClearOldToken(
                             mFullscreenCalloutToken);
         }
     }
 }