Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index c561e6b..e17e47a 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -22,6 +22,8 @@
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.preference.PreferenceManager;
+import com.android.gallery3d.util.UsageStatistics;
+
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
@@ -205,9 +207,7 @@
@Override
public boolean contains(String key) {
- if (mPrefLocal.contains(key)) return true;
- if (mPrefGlobal.contains(key)) return true;
- return false;
+ return mPrefLocal.contains(key) || mPrefGlobal.contains(key);
}
private class MyEditor implements Editor {
@@ -330,5 +330,6 @@
listener.onSharedPreferenceChanged(this, key);
}
BackupManager.dataChanged(mPackageName);
+ UsageStatistics.onEvent("CameraSettingsChange", null, key);
}
}