Use MetricsEvent to log page views for new IA pages.

Bug: 33812754
Test: RunSettingsRoboTests
Change-Id: Ib49daa1078df44f50ecfa351c061d36849708fd7
This commit is contained in:
Fan Zhang
2016-12-21 12:12:32 -08:00
parent d65ab0e63f
commit 8f057ca3d4
13 changed files with 23 additions and 24 deletions

View File

@@ -19,6 +19,7 @@ package com.android.settings.applications;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -35,7 +36,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return APP_AND_NOTIFICATION_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY;
}
@Override

View File

@@ -18,6 +18,7 @@ package com.android.settings.connecteddevice;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -39,7 +40,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return CONNECTED_DEVICE_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
}
@Override

View File

@@ -43,18 +43,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
// metrics placeholder value. Only use this for development.
protected final int PLACEHOLDER_METRIC = 10000;
protected final int SYSTEM_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 1;
protected final int STORAGE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 2;
protected final int NETWORK_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 3;
protected final int CONNECTED_DEVICE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 4;
protected final int APP_AND_NOTIFICATION_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 5;
protected final int INPUT_AND_GESTURE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 6;
protected final int LANGUAGE_AND_REGION_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 7;
protected final int GESTURE_SWIPE_TO_NOTIFICATION = PLACEHOLDER_METRIC + 8;
protected final int GESTURE_DOUBLE_TAP_POWER = PLACEHOLDER_METRIC + 9;
protected final int GESTURE_PICKUP = PLACEHOLDER_METRIC + 10;
protected final int GESTURE_DOUBLE_TAP_SCREEN = PLACEHOLDER_METRIC + 11;
protected final int GESTURE_DOUBLE_TWIST = PLACEHOLDER_METRIC + 12;
private final PreferenceDividerDecoration mDividerDecoration =
new PreferenceDividerDecoration();

View File

@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -37,7 +38,7 @@ public class StorageDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return STORAGE_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_STORAGE_CATEGORY;
}
@Override

View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -35,7 +36,7 @@ public class DoubleTapPowerSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return GESTURE_DOUBLE_TAP_POWER;
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_POWER;
}
@Override

View File

@@ -21,6 +21,7 @@ import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -37,7 +38,7 @@ public class DoubleTapScreenSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return GESTURE_DOUBLE_TAP_SCREEN;
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN;
}
@Override

View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -35,7 +36,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return GESTURE_DOUBLE_TWIST;
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TWIST;
}
@Override

View File

@@ -21,6 +21,7 @@ import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -37,7 +38,7 @@ public class PickupGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return GESTURE_PICKUP;
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_PICKUP;
}
@Override

View File

@@ -19,6 +19,7 @@ package com.android.settings.gestures;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -35,7 +36,7 @@ public class SwipeToNotificationSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return GESTURE_SWIPE_TO_NOTIFICATION;
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION;
}
@Override

View File

@@ -21,6 +21,7 @@ import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
@@ -43,7 +44,7 @@ public class InputAndGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return INPUT_AND_GESTURE_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_INPUT_CATEGORY;
}
@Override

View File

@@ -19,6 +19,7 @@ package com.android.settings.language;
import android.content.Context;
import android.speech.tts.TtsEngines;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -34,7 +35,7 @@ public class LanguageAndRegionSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return LANGUAGE_AND_REGION_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY;
}
@Override

View File

@@ -43,7 +43,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return NETWORK_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY;
}
@Override

View File

@@ -19,6 +19,7 @@ import android.content.Context;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -42,7 +43,7 @@ public class SystemDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return SYSTEM_CATEGORY_FRAGMENT;
return MetricsProto.MetricsEvent.SETTINGS_SYSTEM_CATEGORY;
}
@Override