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

Commit 420d46ee authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

Merge \"log as counters instead of histograms\" into nyc-dev 

am: 6913b611

Change-Id: I1f63c363b2980682dd61e863d94b71aeca3048b5
parents e3eaa087 6913b611

src/com/android/settings/SharedPreferencesLogger.java

+2 −2
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ public class SharedPreferencesLogger implements SharedPreferences { 
    }



    private void logValue(String key, String value) {

        MetricsLogger.histogram(mContext, mTag + "/" + key + "|" + value, 1);

        MetricsLogger.count(mContext, mTag + "/" + key + "|" + value, 1);

    }



    private void logPackageName(String key, String value) {

        MetricsLogger.histogram(mContext, mTag + "/" + key, 1);

        MetricsLogger.count(mContext, mTag + "/" + key, 1);

        MetricsLogger.action(mContext, MetricsEvent.ACTION_GENERIC_PACKAGE,

                mTag + "/" + key + "|" + value);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -229,11 +229,11 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC 
    @Override

    public void onClick(View v) {

        if (mDisabledByAdmin) {

            MetricsLogger.histogram(mContext, mMetricsTag + "/switch_bar|restricted", 1);

            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|restricted", 1);

            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);

        } else {

            final boolean isChecked = !mSwitch.isChecked();

            MetricsLogger.histogram(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);

            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);

            setChecked(isChecked);

        }

    }