Merge "Clean up and cover more QS metrics" (b03314da) · Commits · e / os / android_frameworks_base

core/java/android/metrics/LogMaker.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package android.metrics;

		import android.annotation.SystemApi;
		import android.content.ComponentName;
		import android.util.Log;
		import android.util.SparseArray;

		@@ -118,6 +119,16 @@ public class LogMaker {
		return this;
		}

		/**
		* @param component to replace the existing setting.
		* @hide
		*/
		public LogMaker setComponentName(ComponentName component) {
		entries.put(MetricsEvent.RESERVED_FOR_LOGBUILDER_PACKAGENAME, component.getPackageName());
		entries.put(MetricsEvent.FIELD_CLASS_NAME, component.getClassName());
		return this;
		}

		/** Remove the package name property. */
		public LogMaker clearPackageName() {
		entries.remove(MetricsEvent.RESERVED_FOR_LOGBUILDER_PACKAGENAME);

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.util.ArrayMap;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.app.NightDisplayController;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.util.Preconditions;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.systemui.assist.AssistManager;
		@@ -257,6 +258,8 @@ public class Dependency extends SystemUI {
		mProviders.put(VolumeDialogController.class, () ->
		new VolumeDialogControllerImpl(mContext));

		mProviders.put(MetricsLogger.class, () -> new MetricsLogger());

		// Put all dependencies above here so the factory can override them if it wants.
		SystemUIFactory.getInstance().injectDependencies(mProviders, mContext);
		}

packages/SystemUI/src/com/android/systemui/qs/QSDetail.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@

		package com.android.systemui.qs;

		import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_MORE_SETTINGS;

		import android.animation.Animator;
		import android.animation.Animator.AnimatorListener;
		import android.animation.AnimatorListenerAdapter;
		@@ -197,7 +199,7 @@ public class QSDetail extends LinearLayout {
		mDetailContent.removeAllViews();
		mDetailContent.addView(detailView);
		mDetailViews.put(viewCacheIndex, detailView);
		MetricsLogger.visible(mContext, adapter.getMetricsCategory());
		Dependency.get(MetricsLogger.class).visible(adapter.getMetricsCategory());
		announceForAccessibility(mContext.getString(
		R.string.accessibility_quick_settings_detail,
		adapter.getTitle()));
		@@ -206,7 +208,7 @@ public class QSDetail extends LinearLayout {
		setVisibility(View.VISIBLE);
		} else {
		if (mDetailAdapter != null) {
		MetricsLogger.hidden(mContext, mDetailAdapter.getMetricsCategory());
		Dependency.get(MetricsLogger.class).hidden(mDetailAdapter.getMetricsCategory());
		}
		mClosingDetail = true;
		mDetailAdapter = null;
		@@ -238,8 +240,12 @@ public class QSDetail extends LinearLayout {
		protected void setupDetailFooter(DetailAdapter adapter) {
		final Intent settingsIntent = adapter.getSettingsIntent();
		mDetailSettingsButton.setVisibility(settingsIntent != null ? VISIBLE : GONE);
		mDetailSettingsButton.setOnClickListener(v -> Dependency.get(ActivityStarter.class)
		.postStartActivityDismissingKeyguard(settingsIntent, 0));
		mDetailSettingsButton.setOnClickListener(v -> {
		Dependency.get(MetricsLogger.class).action(ACTION_QS_MORE_SETTINGS,
		mDetailAdapter.getMetricsCategory());
		Dependency.get(ActivityStarter.class)
		.postStartActivityDismissingKeyguard(settingsIntent, 0);
		});
		}

		protected void setupDetailHeader(final DetailAdapter adapter) {

packages/SystemUI/src/com/android/systemui/qs/QSFooter.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.qs;

		import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_DATE;

		import android.app.AlarmManager;
		import android.app.PendingIntent;
		import android.content.Context;
		@@ -358,6 +360,8 @@ public class QSFooter extends LinearLayout implements
		startSettingsActivity();
		}
		} else if (v == mDateTimeGroup) {
		Dependency.get(MetricsLogger.class).action(ACTION_QS_DATE,
		mNextAlarm != null);
		if (mNextAlarm != null) {
		PendingIntent showIntent = mNextAlarm.getShowIntent();
		mActivityStarter.startPendingIntentDismissingKeyguard(showIntent);

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ public interface QSHost {
		TileServices getTileServices();
		void removeTile(String tileSpec);

		int indexOf(String tileSpec);

		interface Callback {
		void onTilesChanged();
		}