| 9652134e6e1b312e348ed3565343741239907f11 |
|
20-Sep-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp
Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6
(cherry picked from commit e6f258bab71af79e2c6131afaf26def437b110c6)
/packages/apps/Camera2/src/com/android/camera/ui/FilmstripGestureRecognizer.java
|
| 2bca210e5fc8a77685775ffb403096167b017dce |
|
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
see http://ag/438423, merge conflicts solved.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
Conflicts:
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/RotationTask.java
src/com/android/camera/widget/FilmstripView.java
/packages/apps/Camera2/src/com/android/camera/ui/FilmstripGestureRecognizer.java
|
| 26795a9258c0815ca2a92d2c660438066f001022 |
|
20-Feb-2014 |
Angus Kong <shkong@google.com> |
A test for media details.
Change-Id: If2615de75ed555c34316686de536d3289c834e75
/packages/apps/Camera2/src/com/android/camera/ui/FilmstripGestureRecognizer.java
|
| 166e36fb6e04d40a1bef0459ee6b96c9c736039b |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Implement the new filmstrip UI - first step.
More fancy stuffs will be added in the following CLs.
Change-Id: I065c7baf1ff9695121db4917158ffecd0bfc0d01
/packages/apps/Camera2/src/com/android/camera/ui/FilmstripGestureRecognizer.java
|