| Index: ash/common/system/chromeos/palette/palette_tray.cc
|
| diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
|
| index e7c66b1d3aec98dd404396bc78d46b00ca581f97..afe1a096f13ce610fe1872a1d12a60cd2dcb3a0c 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.cc
|
| +++ b/ash/common/system/chromeos/palette/palette_tray.cc
|
| @@ -289,6 +289,10 @@ void PaletteTray::OnTouchscreenDeviceConfigurationChanged() {
|
| }
|
|
|
| void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
|
| + // Device may have a stylus but it has been forcibly disabled.
|
| + if (!palette_utils::HasStylusInput())
|
| + return;
|
| +
|
| PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
|
|
|
| // Don't do anything if the palette should not be shown or if the user has
|
|
|