[SB Refactor] Minor logging changes to StatusBarIconController etc. (a784c33e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,16 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
	@IntDef({STATE_ICON, STATE_DOT, STATE_HIDDEN})		@IntDef({STATE_ICON, STATE_DOT, STATE_HIDDEN})
	public @interface VisibleState { }		public @interface VisibleState { }

			/** Returns a human-readable string of {@link VisibleState}. */
			public static String getVisibleStateString(@VisibleState int state) {
			switch(state) {
			case STATE_ICON: return "ICON";
			case STATE_DOT: return "DOT";
			case STATE_HIDDEN: return "HIDDEN";
			default: return "UNKNOWN";
			}
			}

	private static final String TAG = "StatusBarIconView";		private static final String TAG = "StatusBarIconView";
	private static final Property<StatusBarIconView, Float> ICON_APPEAR_AMOUNT		private static final Property<StatusBarIconView, Float> ICON_APPEAR_AMOUNT
	= new FloatProperty<StatusBarIconView>("iconAppearAmount") {		= new FloatProperty<StatusBarIconView>("iconAppearAmount") {
	@@ -561,7 +571,8 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
	@Override		@Override
	public String toString() {		public String toString() {
	return "StatusBarIconView("		return "StatusBarIconView("
	+ "slot='" + mSlot + " alpha=" + getAlpha() + " icon=" + mIcon		+ "slot='" + mSlot + "' alpha=" + getAlpha() + " icon=" + mIcon
			+ " visibleState=" + getVisibleStateString(getVisibleState())
	+ " iconColor=#" + Integer.toHexString(mIconColor)		+ " iconColor=#" + Integer.toHexString(mIconColor)
	+ " notification=" + mNotification + ')';		+ " notification=" + mNotification + ')';
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.java

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,18 @@ public class StatusBarIconHolder {
	private @IconType int mType = TYPE_ICON;		private @IconType int mType = TYPE_ICON;
	private int mTag = 0;		private int mTag = 0;

			/** Returns a human-readable string representing the given type. */
			public static String getTypeString(@IconType int type) {
			switch(type) {
			case TYPE_ICON: return "ICON";
			case TYPE_WIFI: return "WIFI_OLD";
			case TYPE_MOBILE: return "MOBILE_OLD";
			case TYPE_MOBILE_NEW: return "MOBILE_NEW";
			case TYPE_WIFI_NEW: return "WIFI_NEW";
			default: return "UNKNOWN";
			}
			}

	private StatusBarIconHolder() {		private StatusBarIconHolder() {
	}		}

	@@ -230,4 +242,11 @@ public class StatusBarIconHolder {
	public int getTag() {		public int getTag() {
	return mTag;		return mTag;
	}		}

			@Override
			public String toString() {
			return "StatusBarIconHolder(type=" + getTypeString(mType)
			+ " tag=" + getTag()
			+ " visible=" + isVisible() + ")";
			}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Collections;		import java.util.Collections;
	import java.util.List;		import java.util.List;
			import java.util.stream.Collectors;

	/** A class holding the list of all the system icons that could be shown in the status bar. */		/** A class holding the list of all the system icons that could be shown in the status bar. */
	public class StatusBarIconList {		public class StatusBarIconList {
	@@ -302,7 +303,7 @@ public class StatusBarIconList {

	@Override		@Override
	public String toString() {		public String toString() {
	return String.format("(%s) %s", mName, subSlotsString());		return String.format("(%s) holder=%s %s", mName, mHolder, subSlotsString());
	}		}

	private String subSlotsString() {		private String subSlotsString() {
	@@ -310,7 +311,10 @@ public class StatusBarIconList {
	return "";		return "";
	}		}

	return "" + mSubSlots.size() + " subSlots";		return "\| " + mSubSlots.size() + " subSlots: "
			+ mSubSlots.stream()
			.map(StatusBarIconHolder::toString)
			.collect(Collectors.joining("\|"));
	}		}
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.content.Context
	import android.util.AttributeSet		import android.util.AttributeSet
	import android.view.LayoutInflater		import android.view.LayoutInflater
	import com.android.systemui.R		import com.android.systemui.R
			import com.android.systemui.statusbar.StatusBarIconView.getVisibleStateString
	import com.android.systemui.statusbar.pipeline.mobile.ui.binder.MobileIconBinder		import com.android.systemui.statusbar.pipeline.mobile.ui.binder.MobileIconBinder
	import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.LocationBasedMobileViewModel		import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.LocationBasedMobileViewModel
	import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarView		import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarView
	@@ -31,6 +32,14 @@ class ModernStatusBarMobileView(

	var subId: Int = -1		var subId: Int = -1

			override fun toString(): String {
			return "ModernStatusBarMobileView(" +
			"slot='$slot', " +
			"subId=$subId, " +
			"visibleState=${getVisibleStateString(visibleState)}); " +
			"viewString=${super.toString()}"
			}

	companion object {		companion object {

	/**		/**

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.content.Context
	import android.util.AttributeSet		import android.util.AttributeSet
	import android.view.LayoutInflater		import android.view.LayoutInflater
	import com.android.systemui.R		import com.android.systemui.R
			import com.android.systemui.statusbar.StatusBarIconView
	import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarView		import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarView
	import com.android.systemui.statusbar.pipeline.wifi.ui.binder.WifiViewBinder		import com.android.systemui.statusbar.pipeline.wifi.ui.binder.WifiViewBinder
	import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel		import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel
	@@ -33,6 +34,14 @@ class ModernStatusBarWifiView(
	context: Context,		context: Context,
	attrs: AttributeSet?,		attrs: AttributeSet?,
	) : ModernStatusBarView(context, attrs) {		) : ModernStatusBarView(context, attrs) {

			override fun toString(): String {
			return "ModernStatusBarWifiView(" +
			"slot='$slot', " +
			"visibleState=${StatusBarIconView.getVisibleStateString(visibleState)}); " +
			"viewString=${super.toString()}"
			}

	companion object {		companion object {
	/**		/**
	* Inflates a new instance of [ModernStatusBarWifiView], binds it to a view model, and		* Inflates a new instance of [ModernStatusBarWifiView], binds it to a view model, and
	@@ -45,12 +54,9 @@ class ModernStatusBarWifiView(
	slot: String,		slot: String,
	wifiViewModel: LocationBasedWifiViewModel,		wifiViewModel: LocationBasedWifiViewModel,
	): ModernStatusBarWifiView {		): ModernStatusBarWifiView {
	return (		return (LayoutInflater.from(context).inflate(R.layout.new_status_bar_wifi_group, null)
	LayoutInflater.from(context).inflate(R.layout.new_status_bar_wifi_group, null)		as ModernStatusBarWifiView)
	as ModernStatusBarWifiView		.also { it.initView(slot) { WifiViewBinder.bind(it, wifiViewModel) } }
	).also {
	it.initView(slot) { WifiViewBinder.bind(it, wifiViewModel) }
	}
	}		}
	}		}
	}		}