Merge "remove status bar icon logs" (529938db) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import android.util.TypedValue;
		import android.view.ContextThemeWrapper;
		import android.view.Gravity;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.ImageView;
		import android.widget.LinearLayout;
		@@ -56,7 +55,6 @@ import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
		import com.android.systemui.statusbar.policy.IconLogger;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;
		import com.android.systemui.util.Utils.DisableStateTracker;
		@@ -276,9 +274,6 @@ public class BatteryMeterView extends LinearLayout implements
		public void onTuningChanged(String key, String newValue) {
		if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {
		ArraySet<String> icons = StatusBarIconController.getIconBlacklist(newValue);
		boolean hidden = icons.contains(mSlotBattery);
		Dependency.get(IconLogger.class).onIconVisibility(mSlotBattery, !hidden);
		setVisibility(hidden ? View.GONE : View.VISIBLE);
		}
		}

packages/SystemUI/src/com/android/systemui/Dependency.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ExtensionController;
		import com.android.systemui.statusbar.policy.FlashlightController;
		import com.android.systemui.statusbar.policy.HotspotController;
		import com.android.systemui.statusbar.policy.IconLogger;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.statusbar.policy.LocationController;
		import com.android.systemui.statusbar.policy.NetworkController;
		@@ -217,7 +216,6 @@ public class Dependency extends SystemUI {
		@Inject Lazy<LeakDetector> mLeakDetector;
		@Inject Lazy<LeakReporter> mLeakReporter;
		@Inject Lazy<GarbageMonitor> mGarbageMonitor;
		@Inject Lazy<IconLogger> mIconLogger;
		@Inject Lazy<TunerService> mTunerService;
		@Inject Lazy<StatusBarWindowController> mStatusBarWindowController;
		@Inject Lazy<DarkIconDispatcher> mDarkIconDispatcher;
		@@ -392,8 +390,6 @@ public class Dependency extends SystemUI {

		mProviders.put(PowerUI.WarningsUI.class, mWarningsUI::get);

		mProviders.put(IconLogger.class, mIconLogger::get);

		mProviders.put(LightBarController.class, mLightBarController::get);

		mProviders.put(IWindowManager.class, mIWindowManager::get);

packages/SystemUI/src/com/android/systemui/DependencyBinder.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ import com.android.systemui.statusbar.policy.FlashlightController;
		import com.android.systemui.statusbar.policy.FlashlightControllerImpl;
		import com.android.systemui.statusbar.policy.HotspotController;
		import com.android.systemui.statusbar.policy.HotspotControllerImpl;
		import com.android.systemui.statusbar.policy.IconLogger;
		import com.android.systemui.statusbar.policy.IconLoggerImpl;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.statusbar.policy.KeyguardMonitorImpl;
		import com.android.systemui.statusbar.policy.LocationController;
		@@ -130,11 +128,6 @@ public abstract class DependencyBinder {
		public abstract NotificationRemoteInputManager.Callback provideNotificationRemoteInputManager(
		StatusBarRemoteInputCallback callbackImpl);

		/**
		*/
		@Binds
		public abstract IconLogger provideIconLogger(IconLoggerImpl loggerImpl);

		/**
		*/
		@Binds

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconStat
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
		import com.android.systemui.statusbar.policy.IconLogger;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;

		@@ -61,7 +60,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu

		private final ArrayList<IconManager> mIconGroups = new ArrayList<>();
		private final ArraySet<String> mIconBlacklist = new ArraySet<>();
		private final IconLogger mIconLogger = Dependency.get(IconLogger.class);

		// Points to light or dark context depending on the... context?
		private Context mContext;
		@@ -147,7 +145,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu
		int viewIndex = getViewIndex(index, holder.getTag());
		boolean blocked = mIconBlacklist.contains(slot);

		mIconLogger.onIconVisibility(getSlotName(index), holder.isVisible());
		mIconGroups.forEach(l -> l.onIconAdded(viewIndex, slot, blocked, holder));
		}

		@@ -281,8 +278,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu
		return;
		}

		mIconLogger.onIconHidden(slotName);

		int slotIndex = getSlotIndex(slotName);
		List<StatusBarIconHolder> iconsToRemove = slot.getHolderListInViewOrder();
		for (StatusBarIconHolder holder : iconsToRemove) {
		@@ -297,7 +292,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu
		if (getIcon(index, tag) == null) {
		return;
		}
		mIconLogger.onIconHidden(getSlotName(index));
		super.removeIcon(index, tag);
		int viewIndex = getViewIndex(index, 0);
		mIconGroups.forEach(l -> l.onRemoveIcon(viewIndex));
		@@ -305,7 +299,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu

		private void handleSet(int index, StatusBarIconHolder holder) {
		int viewIndex = getViewIndex(index, holder.getTag());
		mIconLogger.onIconVisibility(getSlotName(index), holder.isVisible());
		mIconGroups.forEach(l -> l.onSetIconHolder(viewIndex, holder));
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,6 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C

		private void updateClockVisibility() {
		boolean visible = shouldBeVisible();
		Dependency.get(IconLogger.class).onIconVisibility("clock", visible);
		int visibility = visible ? View.VISIBLE : View.GONE;
		super.setVisibility(visibility);
		}