From 3cdf47e030fa27a451cbb4753a46f3ea9d04a07f Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Mon, 29 Jan 2018 16:01:41 -0500 Subject: [PATCH] Only show bluetooth icon when connected && enabled Test: visual Change-Id: Id1e6a483dec41d28f3679c37481a1538e8cadd57 Fixes: 71541936 --- .../systemui/statusbar/phone/PhoneStatusBarPolicy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 20b501821a97c..6444cc8166638 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -407,17 +407,17 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, int iconId = R.drawable.stat_sys_data_bluetooth; String contentDescription = mContext.getString(R.string.accessibility_quick_settings_bluetooth_on); - boolean bluetoothEnabled = false; + boolean bluetoothVisible = false; if (mBluetooth != null) { - bluetoothEnabled = mBluetooth.isBluetoothEnabled(); if (mBluetooth.isBluetoothConnected()) { iconId = R.drawable.stat_sys_data_bluetooth_connected; contentDescription = mContext.getString(R.string.accessibility_bluetooth_connected); + bluetoothVisible = mBluetooth.isBluetoothEnabled(); } } mIconController.setIcon(mSlotBluetooth, iconId, contentDescription); - mIconController.setIconVisibility(mSlotBluetooth, bluetoothEnabled); + mIconController.setIconVisibility(mSlotBluetooth, bluetoothVisible); } private final void updateTTY() {