[go: nahoru, domu]

Update shelf for jelly

*  Updates shelf nudge text color and typography
*  Updates home button to use "toggled" icon button colors when
   app list is shown
*  Updates home button nudge text and background colors
*  Updates app activity indicator colors for "inactive" indicator
   to match spec
*  Updates shelf button ink drop base color
*  Updates animating shelf background (and drag handle) to match
   in-app shelf colors

BUG=b:282832879

Change-Id: I7af5ead97e5f9f4f83298ad344fe4f2a5df21cb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4534896
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Commit-Queue: Toni Barzic <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1149937}
diff --git a/ash/shelf/home_button.h b/ash/shelf/home_button.h
index a672c4e..ec39393 100644
--- a/ash/shelf/home_button.h
+++ b/ash/shelf/home_button.h
@@ -141,6 +141,10 @@
   // Starts the launcher nudge animation.
   void StartNudgeAnimation();
 
+  // Sets the button's "toggled" state - the button is toggled when the bubble
+  // launcher is shown.
+  void SetToggled(bool toggled);
+
   void AddNudgeAnimationObserverForTest(NudgeAnimationObserver* observer);
   void RemoveNudgeAnimationObserverForTest(NudgeAnimationObserver* observer);
 
@@ -226,6 +230,8 @@
   // bounds of the home button.
   gfx::Rect GetExpandableContainerClipRectToHomeButton();
 
+  const bool jelly_enabled_;
+
   base::ScopedObservation<QuickAppAccessModel, QuickAppAccessModel::Observer>
       quick_app_model_observation_{this};