Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index a25929c..95fd19a 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -45,7 +45,7 @@
public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
View.OnClickListener {
- public static interface OnSwitchChangeListener {
+ public interface OnSwitchChangeListener {
/**
* Called when the checked state of the Switch has changed.
*
@@ -63,7 +63,8 @@
private String mLabel;
private String mSummary;
- private boolean mDisabledByAdmin = false;
+ private boolean mLoggingIntialized;
+ private boolean mDisabledByAdmin;
private EnforcedAdmin mEnforcedAdmin = null;
private String mMetricsTag;
@@ -233,7 +234,6 @@
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
} else {
final boolean isChecked = !mSwitch.isChecked();
- MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
setChecked(isChecked);
}
}
@@ -247,6 +247,10 @@
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (mLoggingIntialized) {
+ MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
+ }
+ mLoggingIntialized = true;
propagateChecked(isChecked);
}