SystemUi: Nuke DONT_TRACK label, and introduce CMMetricsLogger constants. (f20ea48c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/logging/MetricsConstants.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ package com.android.internal.logging;
	* @hide		* @hide
	*/		*/
	public interface MetricsConstants {		public interface MetricsConstants {
	public static final int DONT_TRACK_ME_BRO = -Integer.MAX_VALUE + 1;
	// These constants must match those in the analytic pipeline, do not edit.		// These constants must match those in the analytic pipeline, do not edit.
	// Add temporary values to the top of MetricsLogger instead.		// Add temporary values to the top of MetricsLogger instead.
	public static final int VIEW_UNKNOWN = 0;		public static final int VIEW_UNKNOWN = 0;

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ import com.android.systemui.tuner.QsTuner;
	import com.viewpagerindicator.CirclePageIndicator;		import com.viewpagerindicator.CirclePageIndicator;
	import cyanogenmod.app.StatusBarPanelCustomTile;		import cyanogenmod.app.StatusBarPanelCustomTile;
	import cyanogenmod.providers.CMSettings;		import cyanogenmod.providers.CMSettings;
			import org.cyanogenmod.internal.logging.CMMetricsLogger;
	import org.cyanogenmod.internal.util.QSUtils;		import org.cyanogenmod.internal.util.QSUtils;

	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -2007,7 +2008,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return MetricsLogger.DONT_TRACK_ME_BRO;		return CMMetricsLogger.DONT_LOG;
	}		}

	public void showBroadcastTileDialog() {		public void showBroadcastTileDialog() {

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,13 +26,13 @@ import android.net.wifi.WifiManager;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.provider.Settings;		import android.provider.Settings;

	import com.android.internal.logging.MetricsConstants;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.qs.QSTile;		import com.android.systemui.qs.QSTile;

	import java.net.InetAddress;		import java.net.InetAddress;

	import cyanogenmod.providers.CMSettings;		import cyanogenmod.providers.CMSettings;
			import org.cyanogenmod.internal.logging.CMMetricsLogger;

	public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {		public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {

	@@ -85,7 +85,7 @@ public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return MetricsConstants.DONT_TRACK_ME_BRO;		return CMMetricsLogger.TILE_ADB_OVER_NETWORK;
	}		}

	private boolean isAdbEnabled() {		private boolean isAdbEnabled() {

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,10 +21,10 @@ import android.content.Intent;
	import android.provider.Settings;		import android.provider.Settings;
	import android.provider.Settings.Secure;		import android.provider.Settings.Secure;

	import com.android.internal.logging.MetricsLogger;
	import com.android.systemui.qs.SecureSetting;		import com.android.systemui.qs.SecureSetting;
	import com.android.systemui.qs.QSTile;		import com.android.systemui.qs.QSTile;
	import com.android.systemui.R;		import com.android.systemui.R;
			import org.cyanogenmod.internal.logging.CMMetricsLogger;

	/ Quick settings tile: Ambient Display /		/ Quick settings tile: Ambient Display /
	public class AmbientDisplayTile extends QSTile<QSTile.BooleanState> {		public class AmbientDisplayTile extends QSTile<QSTile.BooleanState> {
	@@ -86,7 +86,7 @@ public class AmbientDisplayTile extends QSTile<QSTile.BooleanState> {

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return MetricsLogger.DONT_TRACK_ME_BRO;		return CMMetricsLogger.TILE_AMBIENT_DISPLAY;
	}		}

	@Override		@Override

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,10 +23,10 @@ import android.hardware.SensorEventListener;
	import android.hardware.SensorManager;		import android.hardware.SensorManager;
	import android.widget.ImageView;		import android.widget.ImageView;

	import com.android.internal.logging.MetricsConstants;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.qs.QSTile;		import com.android.systemui.qs.QSTile;
	import com.android.systemui.qs.QSTileView;		import com.android.systemui.qs.QSTileView;
			import org.cyanogenmod.internal.logging.CMMetricsLogger;

	public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEventListener {		public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEventListener {
	private final static float ALPHA = 0.97f;		private final static float ALPHA = 0.97f;
	@@ -121,7 +121,7 @@ public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEv

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return MetricsConstants.DONT_TRACK_ME_BRO;		return CMMetricsLogger.TILE_COMPASS;
	}		}

	@Override		@Override