Commit 9a29a66d authored by Jazz Xu's avatar Jazz Xu Committed by Commit Bot

[Lockscreen Media Controls] Modify progress bar color.

Change scrub bar color to #8AB4F8, 100% opacity for played,
30% for remaining track.

Bug: 1008228
Change-Id: I1cbc1c80bb3bcdd2bf450bfde90be3b07007c382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825792
Commit-Queue: Jazz Xu <jazzhsu@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarTommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700384}
parent b9d0dbf7
...@@ -43,6 +43,10 @@ namespace { ...@@ -43,6 +43,10 @@ namespace {
constexpr SkColor kMediaControlsBackground = SkColorSetA(SK_ColorDKGRAY, 150); constexpr SkColor kMediaControlsBackground = SkColorSetA(SK_ColorDKGRAY, 150);
constexpr SkColor kMediaButtonColor = SK_ColorWHITE; constexpr SkColor kMediaButtonColor = SK_ColorWHITE;
constexpr SkColor kProgressBarForeground =
SkColorSetARGB(0xFF, 0x8A, 0xB4, 0xF8);
constexpr SkColor kProgressBarBackground =
SkColorSetARGB(0x4C, 0x8A, 0xB4, 0xF8);
// Maximum number of actions that should be displayed on |button_row_|. // Maximum number of actions that should be displayed on |button_row_|.
constexpr size_t kMaxActions = 5; constexpr size_t kMaxActions = 5;
...@@ -268,10 +272,13 @@ LockScreenMediaControlsView::LockScreenMediaControlsView( ...@@ -268,10 +272,13 @@ LockScreenMediaControlsView::LockScreenMediaControlsView(
contents_view_->AddChildView(std::move(artwork_row)); contents_view_->AddChildView(std::move(artwork_row));
progress_ = contents_view_->AddChildView( auto progress_view =
std::make_unique<media_message_center::MediaControlsProgressView>( std::make_unique<media_message_center::MediaControlsProgressView>(
base::BindRepeating(&LockScreenMediaControlsView::SeekTo, base::BindRepeating(&LockScreenMediaControlsView::SeekTo,
base::Unretained(this)))); base::Unretained(this)));
progress_view->SetForegroundColor(kProgressBarForeground);
progress_view->SetBackgroundColor(kProgressBarBackground);
progress_ = contents_view_->AddChildView(std::move(progress_view));
// |button_row_| contains the buttons for controlling playback. // |button_row_| contains the buttons for controlling playback.
auto button_row = std::make_unique<NonAccessibleView>(); auto button_row = std::make_unique<NonAccessibleView>();
......
...@@ -130,6 +130,14 @@ void MediaControlsProgressView::UpdateProgress( ...@@ -130,6 +130,14 @@ void MediaControlsProgressView::UpdateProgress(
} }
} }
void MediaControlsProgressView::SetForegroundColor(SkColor color) {
progress_bar_->SetForegroundColor(color);
}
void MediaControlsProgressView::SetBackgroundColor(SkColor color) {
progress_bar_->SetBackgroundColor(color);
}
bool MediaControlsProgressView::OnMousePressed(const ui::MouseEvent& event) { bool MediaControlsProgressView::OnMousePressed(const ui::MouseEvent& event) {
if (!event.IsOnlyLeftMouseButton() || event.y() < kMinClickHeight || if (!event.IsOnlyLeftMouseButton() || event.y() < kMinClickHeight ||
event.y() > kMaxClickHeight) { event.y() > kMaxClickHeight) {
......
...@@ -25,6 +25,9 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaControlsProgressView ...@@ -25,6 +25,9 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaControlsProgressView
void UpdateProgress(const media_session::MediaPosition& media_position); void UpdateProgress(const media_session::MediaPosition& media_position);
void SetForegroundColor(SkColor color);
void SetBackgroundColor(SkColor color);
// views::View: // views::View:
bool OnMousePressed(const ui::MouseEvent& event) override; bool OnMousePressed(const ui::MouseEvent& event) override;
void OnGestureEvent(ui::GestureEvent* event) override; void OnGestureEvent(ui::GestureEvent* event) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment