summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-06-15 17:03:41 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-15 17:03:41 +0000
commit7d656b623fcfb272975c7cbb5ca0d54ab27342b1 (patch)
tree760d347c4dfc90fdfb12726f2a815f63ce70971b
parent33809d724ead76445211eacca4b36654407ac423 (diff)
parent817c4ca6d4863580ba1f825d2d7fe816d7ad5490 (diff)
Merge \"Fix flashlight dim state\" into nyc-dev
am: 817c4ca6d4 Change-Id: Ie49b1d3daaffe3f31bde760c1b8ed8391e82771f
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
index 5ff0bd0156ae..0aa723edfb31 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
@@ -102,7 +102,8 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements
protected void handleUpdateState(BooleanState state, Object arg) {
state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label);
if (!mFlashlightController.isAvailable()) {
- Drawable icon = mHost.getContext().getDrawable(R.drawable.ic_signal_flashlight_disable);
+ Drawable icon = mHost.getContext().getDrawable(R.drawable.ic_signal_flashlight_disable)
+ .mutate();
final int disabledColor = mHost.getContext().getColor(R.color.qs_tile_tint_unavailable);
icon.setTint(disabledColor);
state.icon = new DrawableIcon(icon);