Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

Issue 1716313002: [Herb] Set up field trial for UI prototypes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: startsWith Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.toolbar; 5 package org.chromium.chrome.browser.toolbar;
6 6
7 import android.animation.Animator; 7 import android.animation.Animator;
8 import android.animation.AnimatorListenerAdapter; 8 import android.animation.AnimatorListenerAdapter;
9 import android.animation.AnimatorSet; 9 import android.animation.AnimatorSet;
10 import android.animation.ObjectAnimator; 10 import android.animation.ObjectAnimator;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 import org.chromium.base.metrics.RecordUserAction; 47 import org.chromium.base.metrics.RecordUserAction;
48 import org.chromium.chrome.R; 48 import org.chromium.chrome.R;
49 import org.chromium.chrome.browser.ChromeSwitches; 49 import org.chromium.chrome.browser.ChromeSwitches;
50 import org.chromium.chrome.browser.compositor.Invalidator; 50 import org.chromium.chrome.browser.compositor.Invalidator;
51 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost; 51 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
52 import org.chromium.chrome.browser.ntp.NewTabPage; 52 import org.chromium.chrome.browser.ntp.NewTabPage;
53 import org.chromium.chrome.browser.omnibox.LocationBar; 53 import org.chromium.chrome.browser.omnibox.LocationBar;
54 import org.chromium.chrome.browser.omnibox.LocationBarPhone; 54 import org.chromium.chrome.browser.omnibox.LocationBarPhone;
55 import org.chromium.chrome.browser.omnibox.UrlContainer; 55 import org.chromium.chrome.browser.omnibox.UrlContainer;
56 import org.chromium.chrome.browser.partnercustomizations.HomepageManager; 56 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
57 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
58 import org.chromium.chrome.browser.tab.Tab; 57 import org.chromium.chrome.browser.tab.Tab;
59 import org.chromium.chrome.browser.util.ColorUtils; 58 import org.chromium.chrome.browser.util.ColorUtils;
60 import org.chromium.chrome.browser.util.FeatureUtilities; 59 import org.chromium.chrome.browser.util.FeatureUtilities;
61 import org.chromium.chrome.browser.util.MathUtils; 60 import org.chromium.chrome.browser.util.MathUtils;
62 import org.chromium.chrome.browser.widget.TintedImageButton; 61 import org.chromium.chrome.browser.widget.TintedImageButton;
63 import org.chromium.chrome.browser.widget.newtab.NewTabButton; 62 import org.chromium.chrome.browser.widget.newtab.NewTabButton;
64 import org.chromium.ui.base.LocalizationUtils; 63 import org.chromium.ui.base.LocalizationUtils;
65 import org.chromium.ui.interpolators.BakedBezierInterpolator; 64 import org.chromium.ui.interpolators.BakedBezierInterpolator;
66 65
67 import java.util.ArrayList; 66 import java.util.ArrayList;
(...skipping 2075 matching lines...) Expand 10 before | Expand all | Expand 10 after
2143 ((BitmapDrawable) mTabSwitcherAnimationMenuBadgeLightDrawable).setGravit y(Gravity.CENTER); 2142 ((BitmapDrawable) mTabSwitcherAnimationMenuBadgeLightDrawable).setGravit y(Gravity.CENTER);
2144 } 2143 }
2145 2144
2146 @Override 2145 @Override
2147 public void setReturnButtonListener(View.OnClickListener listener) { 2146 public void setReturnButtonListener(View.OnClickListener listener) {
2148 mReturnButtonListener = listener; 2147 mReturnButtonListener = listener;
2149 mReturnButton.setOnClickListener(listener); 2148 mReturnButton.setOnClickListener(listener);
2150 } 2149 }
2151 2150
2152 private boolean isReturnButtonVisible() { 2151 private boolean isReturnButtonVisible() {
2153 String herbFlavor = ChromePreferenceManager.getHerbFlavor(); 2152 String herbFlavor = FeatureUtilities.getHerbFlavor();
2154 if (!TextUtils.equals(ChromeSwitches.HERB_FLAVOR_BASIL, herbFlavor) 2153 if (!TextUtils.equals(ChromeSwitches.HERB_FLAVOR_BASIL, herbFlavor)
2155 && !TextUtils.equals(ChromeSwitches.HERB_FLAVOR_CHIVE, herbFlavo r)) { 2154 && !TextUtils.equals(ChromeSwitches.HERB_FLAVOR_CHIVE, herbFlavo r)) {
2156 return false; 2155 return false;
2157 } 2156 }
2158 2157
2159 Tab currentTab = getToolbarDataProvider().getTab(); 2158 Tab currentTab = getToolbarDataProvider().getTab();
2160 return mReturnButtonListener != null && currentTab != null 2159 return mReturnButtonListener != null && currentTab != null
2161 && currentTab.isAllowedToReturnToExternalApp(); 2160 && currentTab.isAllowedToReturnToExternalApp();
2162 } 2161 }
2163 2162
2164 private void setUseLightDrawablesForTextureCapture() { 2163 private void setUseLightDrawablesForTextureCapture() {
2165 int currentPrimaryColor = getToolbarDataProvider().getPrimaryColor(); 2164 int currentPrimaryColor = getToolbarDataProvider().getPrimaryColor();
2166 mUseLightDrawablesForTextureCapture = isIncognito() 2165 mUseLightDrawablesForTextureCapture = isIncognito()
2167 || (currentPrimaryColor != 0 2166 || (currentPrimaryColor != 0
2168 && ColorUtils.shoudUseLightForegroundOnBackground(currentPrimary Color)); 2167 && ColorUtils.shoudUseLightForegroundOnBackground(currentPrimary Color));
2169 } 2168 }
2170 } 2169 }
2171 2170
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698