commit f22787169127546a3689efab4b8fc057a0aad922
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 12 07:45:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 12 07:45:13 2018 +0000
tree 98004ca01a6bee08b01616db20fb138ecd503cb5
parent 93932ec874f41d7aff23126161a053819951d218
parent e783c9c1e912d62bd98905461be7b04a793d985a

Merge "Switch count logging to action."

src/com/android/settings/core/instrumentation/StatsLogWriter.java

diff --git a/src/com/android/settings/core/instrumentation/StatsLogWriter.java b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
index ed711bb..2617259 100644
--- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
@@ -83,11 +83,6 @@
     }
 
     @Override
-    public void count(Context context, String name, int value) {
-        // No-op
-    }
-
-    @Override
     public void action(int attribution, int action, int pageId, String key, int value) {
         StatsLog.write(StatsLog.SETTINGS_UI_CHANGED /* atomName */,
                 attribution,

src/com/android/settings/widget/SwitchBar.java

diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 8afba40..6cde644 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -18,6 +18,7 @@
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
@@ -143,8 +144,13 @@
             @Override
             public void onClick(View v) {
                 if (mDisabledByAdmin) {
-                    mMetricsFeatureProvider.count(mContext,
-                            mMetricsTag + "/switch_bar|restricted", 1);
+                    mMetricsFeatureProvider.action(
+                            SettingsEnums.PAGE_UNKNOWN,
+                            SettingsEnums.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                            SettingsEnums.PAGE_UNKNOWN,
+                            mMetricsTag + "/switch_bar|restricted",
+                            1);
+
                     RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context,
                             mEnforcedAdmin);
                 }
@@ -287,7 +293,12 @@
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (mLoggingIntialized) {
-            mMetricsFeatureProvider.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
+            mMetricsFeatureProvider.action(
+                    SettingsEnums.PAGE_UNKNOWN,
+                    SettingsEnums.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                    SettingsEnums.PAGE_UNKNOWN,
+                    mMetricsTag + "/switch_bar",
+                    isChecked ? 1 : 0);
         }
         mLoggingIntialized = true;
         propagateChecked(isChecked);