diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-04-01 21:45:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-01 21:45:35 +0000 |
| commit | 8f8811fa16147532716e5a4a70fda2f555d20589 (patch) | |
| tree | 817be0caaf5df720b66454137cd86576b92c54d7 | |
| parent | 6058af443b087ba50741cc3e61ec70e830e498fa (diff) | |
| parent | 0c08ea088594814e785c51633dc0fa0e59ac34bf (diff) | |
| download | android_packages_apps_Gallery2-8f8811fa16147532716e5a4a70fda2f555d20589.tar.gz android_packages_apps_Gallery2-8f8811fa16147532716e5a4a70fda2f555d20589.tar.bz2 android_packages_apps_Gallery2-8f8811fa16147532716e5a4a70fda2f555d20589.zip | |
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/ComboPreferences.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index c561e6b9c..e17e47aa8 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -22,6 +22,8 @@ import android.content.SharedPreferences; 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 @@ public class ComboPreferences implements @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 @@ public class ComboPreferences implements listener.onSharedPreferenceChanged(this, key); } BackupManager.dataChanged(mPackageName); + UsageStatistics.onEvent("CameraSettingsChange", null, key); } } |