diff options
| author | Seth Raphael <magicseth@google.com> | 2013-11-12 11:21:17 -0800 |
|---|---|---|
| committer | Seth Raphael <magicseth@google.com> | 2013-11-12 14:16:46 -0800 |
| commit | 77775f170a4596421fd566005522f56f82b1c276 (patch) | |
| tree | 9cd158d176f2a10e5f5200740b4fbdfb068b6327 | |
| parent | a7c84bacfd76e5e865655bd5a9b248d64f970af1 (diff) | |
| download | android_packages_apps_Snap-77775f170a4596421fd566005522f56f82b1c276.tar.gz android_packages_apps_Snap-77775f170a4596421fd566005522f56f82b1c276.tar.bz2 android_packages_apps_Snap-77775f170a4596421fd566005522f56f82b1c276.zip | |
Add parameters and deduplicate parameter changes
Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
| -rw-r--r-- | src/com/android/camera/ComboPreferences.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 | ||||
| -rw-r--r-- | src_pd/com/android/camera/util/UsageStatistics.java | 7 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index 80adfbe84..42cf62423 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -330,8 +330,5 @@ public class ComboPreferences implements listener.onSharedPreferenceChanged(this, key); } BackupManager.dataChanged(mPackageName); - - Object newValue = sharedPreferences.getAll().get(key); - UsageStatistics.onEvent("CameraSettingsChange", newValue.toString(), key); } } diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index 34040d79b..909b32c55 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -27,6 +27,7 @@ import android.util.Log; import android.util.TypedValue; import com.android.camera.util.CameraUtil; +import com.android.camera.util.UsageStatistics; import com.android.camera2.R; /** @@ -159,6 +160,7 @@ public class ListPreference extends CameraPreference { SharedPreferences.Editor editor = getSharedPreferences().edit(); editor.putString(mKey, value); editor.apply(); + UsageStatistics.onEvent("CameraSettingsChange", value, mKey); } @Override diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d6b1b65ca..d2281f40b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1014,7 +1014,8 @@ public class PhotoModule setCameraState(SNAPSHOT_IN_PROGRESS); UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_CAPTURE_DONE, "Photo", 0, - UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg")); + UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg"), + mParameters.flatten()); return true; } diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java index faacb9ddd..98dc89c9f 100644 --- a/src_pd/com/android/camera/util/UsageStatistics.java +++ b/src_pd/com/android/camera/util/UsageStatistics.java @@ -51,10 +51,11 @@ public class UsageStatistics { public static void setPendingTransitionCause(String cause) {} public static void onContentViewChanged(String screenComponent, String screenName) {} public static void onEvent(String category, String action, String label) {}; - public static void onEvent(String category, String action, String label, long optional_value) {}; - public static void onEvent(String category, String action, String label, long optional_value, + public static void onEvent(String category, String action, String label, long optionalValue) {}; + public static void onEvent(String category, String action, String label, long optionalValue, String fileNameHash) {}; - + public static void onEvent(String category, String action, String label, + long optionalValue, String fileNameHash, String parameters) {} public static String hashFileName(String fileName) { return ""; } |