Merge "Add log for debug" into rvc-dev (e92fbec3) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
		LifecycleObserver, OnStart, OnStop, OnDestroy, CachedBluetoothDevice.Callback {
		private static final String TAG = "AdvancedBtHeaderCtrl";
		private static final int LOW_BATTERY_LEVEL = 15;
		private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

		@VisibleForTesting
		LayoutPreference mLayoutPreference;
		@@ -215,6 +216,11 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont

		final int batteryLevel = BluetoothUtils.getIntMetaData(bluetoothDevice, batteryMetaKey);
		final boolean charging = BluetoothUtils.getBooleanMetaData(bluetoothDevice, chargeMetaKey);
		if (DBG) {
		Log.d(TAG, "updateSubLayout() icon : " + iconMetaKey + ", battery : " + batteryMetaKey
		+ ", charge : " + chargeMetaKey + ", batteryLevel : " + batteryLevel
		+ ", charging : " + charging + ", iconUri : " + iconUri);
		}
		if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
		linearLayout.setVisibility(View.VISIBLE);
		final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
		@@ -268,6 +274,9 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
		final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
		final String iconUri = BluetoothUtils.getStringMetaData(bluetoothDevice,
		BluetoothDevice.METADATA_MAIN_ICON);
		if (DBG) {
		Log.d(TAG, "updateDisconnectLayout() iconUri : " + iconUri);
		}
		if (iconUri != null) {
		final ImageView imageView = linearLayout.findViewById(R.id.header_icon);
		updateIcon(imageView, iconUri);

src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
		implements Preference.OnPreferenceClickListener {

		private static final String TAG = "AvailableMediaBluetoothDeviceUpdater";
		private static final boolean DBG = false;
		private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

		private static final String PREF_KEY = "available_media_bt";

src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ import java.util.Map;
		public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		LocalBluetoothProfileManager.ServiceListener {
		private static final String TAG = "BluetoothDeviceUpdater";
		private static final boolean DBG = false;
		private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

		protected final MetricsFeatureProvider mMetricsFeatureProvider;
		protected final DevicePreferenceCallback mDevicePreferenceCallback;

src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

		private static final String TAG = "ConnBluetoothDeviceUpdater";
		private static final boolean DBG = false;
		private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

		private static final String PREF_KEY = "connected_bt";

src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
		implements Preference.OnPreferenceClickListener {

		private static final String TAG = "SavedBluetoothDeviceUpdater";
		private static final boolean DBG = false;
		private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

		private static final String PREF_KEY = "saved_bt";