am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev

* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
This commit is contained in:
PauloftheWest
2014-09-04 17:49:48 +00:00
committed by Android Git Automerger
2 changed files with 77 additions and 0 deletions

View File

@@ -67,6 +67,8 @@ public final class BluetoothDevicePreference extends Preference implements
mCachedDevice = cachedDevice;
setLayoutResource(R.layout.preference_bt_icon);
if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
if (! um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {