Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f057ca3 authored by Fan Zhang's avatar Fan Zhang
Browse files

Use MetricsEvent to log page views for new IA pages. 

Bug: 33812754
Test: RunSettingsRoboTests
Change-Id: Ib49daa1078df44f50ecfa351c061d36849708fd7
parent d65ab0e6

src/com/android/settings/applications/AppAndNotificationDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/core/InstrumentedPreferenceFragment.java

+0 −12
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/deviceinfo/StorageDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/gestures/DoubleTapPowerSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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