diff options
author | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-12-05 16:36:52 +0530 |
---|---|---|
committer | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-12-06 18:58:24 +0530 |
commit | dbdb7620da136374eea95170261032f910015db0 (patch) | |
tree | 007242cdb44941ecb855751c85da69aa97cc6a43 /src_pd/com/android/camera/util/UsageStatistics.java | |
parent | 1c7734057201ffd1b6d165d9e24793ef3d213043 (diff) | |
parent | df2b0819907c440a660e228414a18184732816d1 (diff) | |
download | android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.gz android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.bz2 android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.zip |
Merge remote-tracking branch into merge_branch
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Import translations. DO NOT MERGE
gcam: Clean up placeholders, and add deletion robustness.
Fix issue of focus indicator staying on without being hidden
Ensure view size gets updated after phone decors change.
Show the 100% state of the progress at least one frame.
Add parameters and deduplicate parameter changes
Revert parallel opening camera in photo mode.
Differentiate the InProgressData from the normal PhotoData.
Close mode menus if another control is touched
Start gcam module directly when handling capture intent.
Import translations. DO NOT MERGE
Add a null check to fix NPE
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
...
Conflicts:
res/layout/photo_module.xml
res/values/arrays.xml
src/com/android/camera/CameraActivity.java
src/com/android/camera/PhotoUI.java
src/com/android/camera/Storage.java
src/com/android/camera/WideAnglePanoramaModule.java
src/com/android/camera/ui/FilmStripView.java
Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
Diffstat (limited to 'src_pd/com/android/camera/util/UsageStatistics.java')
-rw-r--r-- | src_pd/com/android/camera/util/UsageStatistics.java | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java index 40f74a4ee..98dc89c9f 100644 --- a/src_pd/com/android/camera/util/UsageStatistics.java +++ b/src_pd/com/android/camera/util/UsageStatistics.java @@ -8,6 +8,9 @@ public class UsageStatistics { public static final String COMPONENT_CAMERA = "Camera"; public static final String COMPONENT_EDITOR = "Editor"; public static final String COMPONENT_IMPORTER = "Importer"; + public static final String COMPONENT_LIGHTCYCLE = "Lightcycle"; + public static final String COMPONENT_PANORAMA = "Panorama"; + public static final String COMPONENT_GCAM = "GCam"; public static final String TRANSITION_BACK_BUTTON = "BackButton"; public static final String TRANSITION_UP_BUTTON = "UpButton"; @@ -22,16 +25,38 @@ public class UsageStatistics { public static final String ACTION_CAPTURE_START = "CaptureStart"; public static final String ACTION_CAPTURE_FAIL = "CaptureFail"; public static final String ACTION_CAPTURE_DONE = "CaptureDone"; - public static final String ACTION_SHARE = "Share"; + + public static final String ACTION_STITCHING_START = "StitchingStart"; + public static final String ACTION_STITCHING_DONE = "StitchingDone"; + + public static final String ACTION_FOREGROUNDED = "Foregrounded"; + public static final String ACTION_OPEN_FAIL = "OpenFailure"; + public static final String ACTION_SCREEN_CHANGED = "ScreenChanged"; + public static final String ACTION_FILMSTRIP = "Filmstrip"; + public static final String ACTION_TOUCH_FOCUS= "TouchFocus"; + public static final String ACTION_DELETE = "Delete"; + public static final String ACTION_GALLERY = "Gallery"; + public static final String ACTION_EDIT= "Edit"; + public static final String ACTION_CROP= "Crop"; + public static final String ACTION_PLAY_VIDEO= "PlayVideo"; public static final String CATEGORY_LIFECYCLE = "AppLifecycle"; public static final String CATEGORY_BUTTON_PRESS = "ButtonPress"; public static final String LIFECYCLE_START = "Start"; + public static final String ACTION_SHARE = "Share"; + public static void initialize(Context context) {} 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 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 ""; + } } |