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

Commit f20c718f authored by Jason Monk's avatar Jason Monk
Browse files

Add metrics for settings conditionals 

Bug: 27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
parent d719ae8e

src/com/android/settings/dashboard/DashboardAdapter.java

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.ImageView;

import android.widget.TextView;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.util.ArrayUtils;

import com.android.settings.R;

import com.android.settings.SettingsActivity;
@@ -343,18 +345,26 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
    @Override

    public void onClick(View v) {

        if (v.getTag() == mExpandedCondition) {

            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,

                    mExpandedCondition.getMetricsConstant());

            mExpandedCondition.onPrimaryClick();

        } else {

            mExpandedCondition = (Condition) v.getTag();

            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,

                    mExpandedCondition.getMetricsConstant());

            notifyDataSetChanged();

        }

    }



    public void onExpandClick(View v) {

        if (v.getTag() == mExpandedCondition) {

            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_COLLAPSE,

                    mExpandedCondition.getMetricsConstant());

            mExpandedCondition = null;

        } else {

            mExpandedCondition = (Condition) v.getTag();

            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,

                    mExpandedCondition.getMetricsConstant());

        }

        notifyDataSetChanged();

    }

src/com/android/settings/dashboard/DashboardSummary.java

+8 −1
Original line number Diff line number Diff line
@@ -25,12 +25,14 @@ import android.view.Menu; 
import android.view.MenuInflater;

import android.view.View;

import android.view.ViewGroup;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.HelpUtils;

import com.android.settings.InstrumentedFragment;

import com.android.settings.R;

import com.android.settings.Settings;

import com.android.settings.SettingsActivity;

import com.android.settings.dashboard.conditional.Condition;

import com.android.settings.dashboard.conditional.ConditionAdapterUtils;

import com.android.settings.dashboard.conditional.ConditionManager;

import com.android.settings.dashboard.conditional.FocusRecyclerView;
@@ -109,7 +111,9 @@ public class DashboardSummary extends InstrumentedFragment 


        ((SettingsDrawerActivity) getActivity()).addCategoryListener(this);

        mSummaryLoader.setListening(true);

        Log.d(TAG, "onResume");

        for (Condition c : mConditionManager.getVisibleConditions()) {

            MetricsLogger.visible(getContext(), c.getMetricsConstant());

        }

    }



    @Override
@@ -118,6 +122,9 @@ public class DashboardSummary extends InstrumentedFragment 


        ((SettingsDrawerActivity) getActivity()).remCategoryListener(this);

        mSummaryLoader.setListening(false);

        for (Condition c : mConditionManager.getVisibleConditions()) {

            MetricsLogger.hidden(getContext(), c.getMetricsConstant());

        }

    }



    @Override

src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.Intent;

import android.graphics.drawable.Icon;

import android.net.ConnectivityManager;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.Settings;

import com.android.settingslib.WirelessUtils;
@@ -76,6 +77,11 @@ public class AirplaneModeCondition extends Condition { 
        }

    }



    @Override

    public int getMetricsConstant() {

        return MetricsEvent.SETTINGS_CONDITION_AIRPLANE_MODE;

    }



    public static class Receiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {

src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.dashboard.conditional; 
import android.content.Intent;

import android.graphics.drawable.Icon;

import android.net.NetworkPolicyManager;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.Settings;
@@ -58,6 +59,11 @@ public class BackgroundDataCondition extends Condition { 
                Settings.DataUsageSummaryActivity.class));

    }



    @Override

    public int getMetricsConstant() {

        return MetricsEvent.SETTINGS_CONDITION_BACKGROUND_DATA;

    }



    @Override

    public void onActionClick(int index) {

        if (index == 0) {

src/com/android/settings/dashboard/conditional/BatterySaverCondition.java

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.dashboard.conditional; 


import android.graphics.drawable.Icon;

import android.os.PowerManager;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.fuelgauge.BatterySaverSettings;
@@ -67,4 +68,9 @@ public class BatterySaverCondition extends Condition { 
            throw new IllegalArgumentException("Unexpected index " + index);

        }

    }



    @Override

    public int getMetricsConstant() {

        return MetricsEvent.SETTINGS_CONDITION_BATTERY_SAVER;

    }

}