Commit 2e5de0eb authored by Tetsui Ohkubo's avatar Tetsui Ohkubo Committed by Commit Bot

Make button beside brightness slider unclickable.

The button on the right of the brightness sldier is no-op, so we should
call SetEnabled(false).
In order to do this, this CL changed disabled color of the buton icon.

TEST=manual
BUG=854148

Change-Id: I1f0e98540a86696351135275be8946b7250cbc12
Reviewed-on: https://chromium-review.googlesource.com/1107423Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568752}
parent 126dd329
...@@ -18,6 +18,8 @@ UnifiedBrightnessView::UnifiedBrightnessView( ...@@ -18,6 +18,8 @@ UnifiedBrightnessView::UnifiedBrightnessView(
kSystemMenuBrightnessIcon, kSystemMenuBrightnessIcon,
IDS_ASH_STATUS_TRAY_BRIGHTNESS), IDS_ASH_STATUS_TRAY_BRIGHTNESS),
model_(model) { model_(model) {
button()->SetEnabled(false);
model_->AddObserver(this); model_->AddObserver(this);
OnDisplayBrightnessChanged(false /* by_user */); OnDisplayBrightnessChanged(false /* by_user */);
} }
......
...@@ -19,13 +19,17 @@ namespace ash { ...@@ -19,13 +19,17 @@ namespace ash {
TopShortcutButton::TopShortcutButton(views::ButtonListener* listener, TopShortcutButton::TopShortcutButton(views::ButtonListener* listener,
const gfx::VectorIcon& icon, const gfx::VectorIcon& icon,
int accessible_name_id) int accessible_name_id)
: views::ImageButton(listener) { : TopShortcutButton(listener, accessible_name_id) {
SetPreferredSize(gfx::Size(kTrayItemSize, kTrayItemSize));
SetImage(views::Button::STATE_NORMAL, SetImage(views::Button::STATE_NORMAL,
gfx::CreateVectorIcon(icon, kUnifiedMenuIconColor)); gfx::CreateVectorIcon(icon, kUnifiedMenuIconColor));
SetImage(views::Button::STATE_DISABLED, SetImage(views::Button::STATE_DISABLED,
gfx::CreateVectorIcon(icon, kUnifiedMenuIconColorDisabled)); gfx::CreateVectorIcon(icon, kUnifiedMenuIconColorDisabled));
}
TopShortcutButton::TopShortcutButton(views::ButtonListener* listener,
int accessible_name_id)
: views::ImageButton(listener) {
SetPreferredSize(gfx::Size(kTrayItemSize, kTrayItemSize));
SetImageAlignment(ALIGN_CENTER, ALIGN_MIDDLE); SetImageAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
SetTooltipText(l10n_util::GetStringUTF16(accessible_name_id)); SetTooltipText(l10n_util::GetStringUTF16(accessible_name_id));
......
...@@ -18,6 +18,7 @@ class TopShortcutButton : public views::ImageButton { ...@@ -18,6 +18,7 @@ class TopShortcutButton : public views::ImageButton {
TopShortcutButton(views::ButtonListener* listener, TopShortcutButton(views::ButtonListener* listener,
const gfx::VectorIcon& icon, const gfx::VectorIcon& icon,
int accessible_name_id); int accessible_name_id);
TopShortcutButton(views::ButtonListener* listener, int accessible_name_id);
~TopShortcutButton() override; ~TopShortcutButton() override;
// views::ImageButton: // views::ImageButton:
......
...@@ -47,7 +47,9 @@ void ReadOnlySlider::OnGestureEvent(ui::GestureEvent* event) {} ...@@ -47,7 +47,9 @@ void ReadOnlySlider::OnGestureEvent(ui::GestureEvent* event) {}
UnifiedSliderButton::UnifiedSliderButton(views::ButtonListener* listener, UnifiedSliderButton::UnifiedSliderButton(views::ButtonListener* listener,
const gfx::VectorIcon& icon, const gfx::VectorIcon& icon,
int accessible_name_id) int accessible_name_id)
: TopShortcutButton(listener, icon, accessible_name_id) {} : TopShortcutButton(listener, accessible_name_id) {
SetVectorIcon(icon);
}
UnifiedSliderButton::~UnifiedSliderButton() = default; UnifiedSliderButton::~UnifiedSliderButton() = default;
......
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