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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java

Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Very small changes from last pedrosimonneti@ review Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
index 9dbed774faca8b113c5ace516e0190eadc0edf71..5449b4bafc9ea6a0bca10ada8e68aea014c542eb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
@@ -186,6 +186,9 @@ public class ContextualSearchPanel extends OverlayPanel {
if (getPeekPromoControl().isVisible()) {
getPeekPromoControl().animateAppearance();
}
+ if (getIconSpriteControl().shouldAnimateAppearance()) {
+ getIconSpriteControl().animateApperance();
+ }
}
if (fromState == PanelState.PEEKED
@@ -650,6 +653,29 @@ public class ContextualSearchPanel extends OverlayPanel {
}
// ============================================================================================
+ // Search Provider Icon Sprite
+ // ============================================================================================
+
+ private ContextualSearchIconSpriteControl mIconSpriteControl;
+
+ /**
+ * @return The {@link ContextualSearchIconSpriteControl} for the panel.
+ */
+ public ContextualSearchIconSpriteControl getIconSpriteControl() {
+ if (mIconSpriteControl == null) {
+ mIconSpriteControl = new ContextualSearchIconSpriteControl(this, mContext);
+ }
+ return mIconSpriteControl;
+ }
+
+ /**
+ * @param shouldAnimateIconSprite Whether the search provider icon sprite should be animated.
+ */
+ public void setShouldAnimateIconSprite(boolean shouldAnimateIconSprite) {
+ getIconSpriteControl().setShouldAnimateAppearance(shouldAnimateIconSprite);
+ }
+
+ // ============================================================================================
// Promo
// ============================================================================================

Powered by Google App Engine
This is Rietveld 408576698