OSDN Git Service
Yu Shan Emily Lau [Thu, 10 Jun 2010 20:00:10 +0000 (13:00 -0700)]
Merge "Fixed the camera test instrumentation target naming issue." into froyo
Kenny Root [Thu, 10 Jun 2010 05:28:46 +0000 (22:28 -0700)]
Import revised translations
Change-Id: Ia5d2e7169014c35590ab1fe5ae5467d68f824d62
Yu Shan Emily Lau [Wed, 9 Jun 2010 21:26:35 +0000 (14:26 -0700)]
Fixed the camera test instrumentation target naming issue.
Change-Id: Ia98963e7ae38157d96a7fe3b70d37eca9c5f4af2
Owen Lin [Thu, 13 May 2010 04:12:50 +0000 (12:12 +0800)]
Add copyright headers to source codes.
Bug:
2680376
Change-Id: I4d0b297f2cee13bb03104996f020732713c61e03
Ray Chen [Mon, 10 May 2010 21:12:41 +0000 (14:12 -0700)]
Fix
2672651 When GPS is disabled, GPS EXIF data is still in the photo
http://
2672651
Change-Id: I7992574e978bba1f65c01c942220b0d435b45029
Daniel Sandler [Wed, 5 May 2010 19:28:30 +0000 (15:28 -0400)]
Nudge the camera preview 2dip from the screen edge.
On Sapphire, the preview background was right up against the
edge of the screen; since that portion of
border_view_finder.9.png is very dark, it looked as if there
was no border at all. Now there's a guaranteed 2dip of
bg_camera_pattern.png texture visible to the left of the
viewscreen.
Bug:
2655309
Change-Id: I4d4f45542700b8b0fec564b72895e42d9dd29da3
Michael Chan [Tue, 4 May 2010 03:40:55 +0000 (20:40 -0700)]
Merge "b/
2483367 Moving OneTimeInitializer to vendor/google" into froyo
Michael Chan [Fri, 30 Apr 2010 01:14:13 +0000 (18:14 -0700)]
b/
2483367 Moving OneTimeInitializer to vendor/google
See
ee510dbe764abbc7bf74c0bb214f4c9a09b87fe8
Change-Id: I9da94242451ead99c1b26796a4dc554a9d3a6503
Kenny Root [Thu, 29 Apr 2010 22:28:17 +0000 (15:28 -0700)]
Import revised translations
Change-Id: Id797436a1fe841a4ed068c23ecb9aeb907e29ec3
Kenny Root [Tue, 27 Apr 2010 20:00:25 +0000 (13:00 -0700)]
Import revised translations
Change-Id: Ife0e63f97c1cd90bcb397098b31116a1d3421e85
Owen Lin [Mon, 26 Apr 2010 03:34:30 +0000 (11:34 +0800)]
Avoid loading drawables in CameraSettings.
Bug:
2430326
Change-Id: Ia5e6f4320fac3a89ede5054e9ac7b6f31c973273
Chih-Chung Chang [Fri, 23 Apr 2010 17:16:52 +0000 (10:16 -0700)]
Merge "Startup time improvements. Bug:
2430326" into froyo
Chih-Chung Chang [Thu, 22 Apr 2010 10:40:53 +0000 (18:40 +0800)]
Startup time improvements.
Bug:
2430326
Change-Id: I36dde4cee9f086e468caf87378ce1f2fd0d011c7
Owen Lin [Fri, 23 Apr 2010 02:14:15 +0000 (10:14 +0800)]
Remove unused state in some resources.
Change-Id: I7acfd20cb77ace0c953b0f349a64fc85cc334365
Bug:
2557840
Owen Lin [Wed, 21 Apr 2010 07:21:15 +0000 (15:21 +0800)]
Reset scece mode overrides in InitializeHeadUpDisplay.
bug:
2612518
Change-Id: I1b349f3b52cb2f474fa1b0790cc1f8fbecb0b9aa
Owen Lin [Tue, 20 Apr 2010 03:14:44 +0000 (11:14 +0800)]
Remove GLRootView in onPause() and put it back in onResume() to avoid OOM in
Gallery.
Bug:
2557840
Change-Id: I2d6ff6da25bfe342472278efd5fc25c38d5fd5ce
Owen Lin [Wed, 21 Apr 2010 07:03:38 +0000 (00:03 -0700)]
Merge "Fix bug:
2609027." into froyo
Owen Lin [Tue, 20 Apr 2010 06:42:01 +0000 (14:42 +0800)]
Fix bug:
2609027.
Change-Id: Ic59f542f50c401492770423f98546e34a70fa2ef
Chih-Chung Chang [Tue, 20 Apr 2010 10:07:15 +0000 (18:07 +0800)]
Don't stop user from taking pictures while the media scanner is scanning.
Bug:
2603078
Change-Id: Ic2159201434083919d7f7bc6b1ea2f3438971ebd
Ray Chen [Tue, 13 Apr 2010 23:44:56 +0000 (16:44 -0700)]
Always encode GpsTimeStamp in Camera.
Bug:
2596154
Change-Id: I00f40032e7db512ab09f6a66e5db7dbef8dc8e27
Owen Lin [Tue, 13 Apr 2010 08:31:05 +0000 (16:31 +0800)]
Add aboutToChange to GLRootView.
This allow user to notify GLRootView to expect a size change in a near furture.
Change-Id: I8ea2a00c90f0d25c06ee9b292fa9defa2f379abd
Fix:
2591831
Chih-Chung Chang [Fri, 9 Apr 2010 12:48:02 +0000 (20:48 +0800)]
Add a hack to avoid allocating GL surface with different sizes.
Bug:
2515291
Change-Id: Ib0d886dcd355ddd3af09cc31089ed8c446911536
Owen Lin [Thu, 8 Apr 2010 10:22:30 +0000 (18:22 +0800)]
Fix a typo in the code.
Bug:
2580309
Change-Id: I25ade485a56230b919d07698e1f9d9f25baaa5b8
Chih-Chung Chang [Thu, 8 Apr 2010 05:10:41 +0000 (22:10 -0700)]
Merge "Fix the ANR after switching between Camera and Camcorder." into froyo
Chih-Chung Chang [Thu, 8 Apr 2010 05:10:29 +0000 (22:10 -0700)]
Merge "Make shortcut upgrading code a bit more robust. Bug:
2558040" into froyo
Wu-cheng Li [Sun, 4 Apr 2010 05:37:36 +0000 (13:37 +0800)]
Do not register OneShotPreviewCallback to reduce latency.
bug:
2430326
Change-Id: I14f10f1317096966edc094fc4df8691ec20fee11
Chih-Chung Chang [Thu, 8 Apr 2010 02:54:46 +0000 (19:54 -0700)]
Make shortcut upgrading code a bit more robust.
Bug:
2558040
Change-Id: Id2fac56bd4c6082039c48648a757ff228217c713
Owen Lin [Thu, 1 Apr 2010 07:42:33 +0000 (15:42 +0800)]
Fix the ANR after switching between Camera and Camcorder.
The reason of this bug is we try to queue an event in the GLThread, but the thread
has already dead when the GLRootView detacched from the window. So, we are
waiting a task that will never be executed.
I have seen a similar ANR in GLRootView.onTouch(), so I also fix the that issue
in this change.
Bug:
2559472
Change-Id: I49efd9ca01f1f6cce73320c31448ebaa7687469f
Wu-cheng Li [Sun, 4 Apr 2010 07:07:38 +0000 (15:07 +0800)]
Update the code due to API change.
bug:
2553570
Change-Id: Ifa6b2ebbbd0d988deef25afdd013b5429438e52a
Owen Lin [Thu, 1 Apr 2010 09:47:19 +0000 (17:47 +0800)]
Remove unused resources and code.
Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
Ray Chen [Tue, 30 Mar 2010 22:03:14 +0000 (15:03 -0700)]
ThumbnailUtils.createVideoThumbnail API change
Change-Id: I175e722353dafac615c34e7b5b0e08c47ad6502a
James Dong [Wed, 31 Mar 2010 21:39:23 +0000 (14:39 -0700)]
Camera app update due to CameraProfile and CamcorderProfile API changes
Also, make the quality level mapping from String to numeric number less
fragile.
Dependency: https://android-git.corp.google.com/g/#change,47310
bug -
2553862
Change-Id: I50606a16bd9d377f5002bc784a9dcc7b9f8c1486
Chih-Chung Chang [Tue, 30 Mar 2010 21:34:14 +0000 (14:34 -0700)]
Merge "Update shortcut for VideoCamera too." into froyo
Owen Lin [Fri, 26 Mar 2010 11:10:37 +0000 (19:10 +0800)]
Fix one more NPE. (Second run)
Bug:
2529339
Change-Id: Idbfa4e6950a9e1ee3259226697d1cffa34dd23fa
Owen Lin [Thu, 18 Mar 2010 00:28:07 +0000 (08:28 +0800)]
Improve GLListView UI.
1. Hide the scrollbar several seconds later.
2. Support fling operation now
Change-Id: I5ab22c91f5781ae3bc4b5aa779407ee374eddaa4
Owen Lin [Thu, 25 Mar 2010 07:36:26 +0000 (15:36 +0800)]
Add some more ways to dismiss popup window(UX change).
Bug:
2538066
Change-Id: Ieb5b28500363ff5cc88b508329c84c35ebc5b230
Yu Shan Emily Lau [Tue, 30 Mar 2010 02:19:00 +0000 (19:19 -0700)]
Merge "Update the camera package name in the camera tests." into froyo
Yu Shan Emily Lau [Mon, 29 Mar 2010 21:59:43 +0000 (14:59 -0700)]
Update the camera package name in the camera tests.
Change-Id: I7e82f9c8c3ea2273d24bfd45fedfe7f912d4f430
Chih-Chung Chang [Mon, 29 Mar 2010 17:37:14 +0000 (10:37 -0700)]
Update shortcut for VideoCamera too.
Change-Id: Iaeb2f276bdcf133c4cf3c5a16ae92556de12a875
Chih-Chung Chang [Fri, 26 Mar 2010 23:16:25 +0000 (16:16 -0700)]
Update the shortcut for Camera to the new component name
because our uid changed.
Change-Id: Ic9f47dad348567c78b4e1d224bdc95ab14d09df6
Chih-Chung Chang [Thu, 25 Mar 2010 18:53:10 +0000 (11:53 -0700)]
Revert "Fix one more NPE."
This reverts commit
416f65b0cc009d251a16512e7b6c3621bf62dc76.
This broke video recording because the GLThread has exited
after the GLSurfaceView is detached from the window, so the
the runnable put into queueEvent never runs.
Change-Id: I7b071ef170d4d36fd551a81db9f3af7f6ff85a83
Owen Lin [Tue, 23 Mar 2010 03:06:10 +0000 (11:06 +0800)]
Fix one more NPE.
Bug:
2529339
Change-Id: Ia9ea3ba839e35e1ce3e5cb3a1b1f0cc6f83f1465
Chih-Chung Chang [Wed, 24 Mar 2010 16:33:10 +0000 (09:33 -0700)]
Merge "Insert the "size" column with other attributes at the same time, so we don't need to spend time updating it."
Owen Lin [Wed, 24 Mar 2010 07:52:00 +0000 (00:52 -0700)]
Merge "Revert the icon rotation animation."
Chih-Chung Chang [Tue, 23 Mar 2010 22:28:39 +0000 (15:28 -0700)]
Insert the "size" column with other attributes at the same time,
so we don't need to spend time updating it.
Change-Id: I5d22f132f4d63b7a0a5bf8dfcfa04505ed324f34
Wei-Ta Chen [Mon, 22 Mar 2010 20:13:38 +0000 (13:13 -0700)]
Fix
2533691 by using REVIEW intent added in Gallery.
Bug:
2533691
Change-Id: Ia8b7732a485bde5dec6b7cff0b80d4d6f08a8fee
Owen Lin [Mon, 22 Mar 2010 10:03:38 +0000 (18:03 +0800)]
Revert the icon rotation animation.
Change-Id: If21daddd0caf6a7762ddb0478ab35d469908816b
Owen Lin [Mon, 22 Mar 2010 07:15:48 +0000 (15:15 +0800)]
Fix several NPEs.
Bug:
2529432 and Bug:
2529344
Change-Id: I6c845da35d7fcef7b3fc38952a32793458e1f59f
Wei-Ta Chen [Fri, 19 Mar 2010 23:58:34 +0000 (16:58 -0700)]
Fix
2427867 by specifying the "review" extra when reviewing the last video/photo.
For reviewing video, we explicitly start the activity: com.cooliris.media.Gallery.
Change-Id: Ied03c3d33e426c53a9841b7fb9f10c1ebcc904cb
Owen Lin [Fri, 19 Mar 2010 10:57:21 +0000 (18:57 +0800)]
Fix the startup crash.
Change-Id: Ide5dbbfe00f13cdcc09bf687e838243e579d43d0
Owen Lin [Thu, 18 Mar 2010 12:45:12 +0000 (20:45 +0800)]
Fix the zoom indicator not updated issue.
Bug:
2524432
Change-Id: I92bbbb5cc309ae8c1fff2df42691f8111a2d71f4
Owen Lin [Fri, 19 Mar 2010 10:26:04 +0000 (03:26 -0700)]
Merge "Fix the content truncated issue."
Owen Lin [Fri, 19 Mar 2010 04:38:04 +0000 (12:38 +0800)]
Fix the content truncated issue.
Bug:
2514443
Change-Id: I0c4aca1b5f13d6fc499848cefcc9f5e1888602da
Wu-cheng Li [Fri, 19 Mar 2010 01:30:02 +0000 (18:30 -0700)]
Get the parameters before reading maximum zoom.
bug:
2458926
Change-Id: Ie987df3ecfddc5582b101b4ead267dc2dbd7cc23
Owen Lin [Thu, 18 Mar 2010 11:43:09 +0000 (19:43 +0800)]
Fix a NPE in VideoCamera.
Bug:
2520984
Change-Id: Ief7c7f58150bf7323d8ea59422ff31523a0a517a
Owen Lin [Thu, 18 Mar 2010 02:49:20 +0000 (10:49 +0800)]
Fix the picture size settings doesn't get initialized issue.
Bug:
2524062
Change-Id: Ia1062a23572dce7acc00a6877b92d088bc62aae6
Eric Fischer [Thu, 18 Mar 2010 17:52:12 +0000 (10:52 -0700)]
Merge "Import revised translations"
Owen Lin [Thu, 18 Mar 2010 00:27:06 +0000 (08:27 +0800)]
More improvement on UI.
1. Disable on-screen settings while video/camera is acting.
2. Reset exposure in onResume()
Change-Id: I4a58ae9c1a2ecff6d3f504de48e2504c8d86c1f3
Kenny Root [Thu, 18 Mar 2010 05:09:35 +0000 (22:09 -0700)]
Import revised translations
Change-Id: I4f6e08eb39c31df83d75009f92acfb8e85047c99
Owen Lin [Tue, 16 Mar 2010 09:40:54 +0000 (17:40 +0800)]
Some more improvements of the UI.
Use stencial test to draw popup-window
Fix the ACTION_UP won't send to mMotionTarget
Make the text color in Zoom indicator same as others
Reset exposure compensation in onCreate
Change-Id: I4ff7c3774fd0573cc6ac4a86dbeeb9588b587d0c
Owen Lin [Mon, 15 Mar 2010 06:08:13 +0000 (14:08 +0800)]
Fix several UI issues.
1. Remove the cross in border_last_picture
2. Remove the gripper in VideoCamera
3. Solve the popup triangle locate in wrong position
4. Remove the top and bottom borders of the preview frame in Camera
5. Rotate the on-screen indicators when orientation changed
6. Add the checking for the flash mode in VideoCamera
Change-Id: I304ea3582d08c5e46ed750b7371588635a4d8009
Chih-Chung Chang [Sat, 13 Mar 2010 00:37:35 +0000 (16:37 -0800)]
Add switch to Camera/VideoCamera menu item.
Bug:
2249997
Change-Id: I14434fb5c617a62e02eaace120157c4a9d32e681
Chih-Chung Chang [Mon, 15 Mar 2010 20:13:20 +0000 (13:13 -0700)]
Update camera parameters only when the camera is in idle state.
Bug:
2497176
Change-Id: I66b5c676884805fc1d3ca8c2109b8c210a66880b
Owen Lin [Wed, 10 Mar 2010 09:14:25 +0000 (17:14 +0800)]
New UI for camcorder.
Change-Id: Id35564836da7b4051662cccfd0920480421499b0
Owen Lin [Wed, 10 Mar 2010 02:53:02 +0000 (10:53 +0800)]
Restore Settings.
Change-Id: Ie5c26869151dd8959c122bf3c748d61420ac5c30
Wu-cheng Li [Sat, 13 Mar 2010 02:54:04 +0000 (18:54 -0800)]
Remove the extra media recorder initialization during exit.
When users click on the video thumbnail, we should not initialize media
recorder again because we are about to exit.
bug:
2505003
Change-Id: Ifdf892142d2acc985fd91a77c87ff12ca5f3d603
Chih-Chung Chang [Thu, 11 Mar 2010 21:32:38 +0000 (13:32 -0800)]
Wait for camera idle (not focusing or snapshotting) before setting parameters.
Bug:
2497176
Change-Id: I8ac0d58e4f56042c70f30733aa6658ad4ca671b1
Romain Guy [Wed, 10 Mar 2010 20:26:30 +0000 (12:26 -0800)]
Camera should have the com.android.camera package name.
Related to bug #
2464545
Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
Owen Lin [Sat, 6 Mar 2010 03:18:18 +0000 (11:18 +0800)]
Add the new ZoomController UI and also the exposure compensation settings.
Fix the bug that some MotionEvent of some actions should always pass to the
component who accept the DOWN event.
Also fix a bug that nine patch image will be drawn incorrectly after rotation.
Change-Id: I8ab36fb6f958c1967afa11eed5f167842b59cada
Chih-Chung Chang [Wed, 10 Mar 2010 01:18:21 +0000 (17:18 -0800)]
Set initial version code.
Change-Id: Iafb8aad8ccb4e7f092c4627d217f0714c26c64c7
Wu-cheng Li [Tue, 9 Mar 2010 23:37:04 +0000 (15:37 -0800)]
Hide the preview in onPause to avoid rotated preview.
bug:
2257616
Change-Id: Ifce981831ce7022546ad1ec11527f2fe0bf36ff5
Chih-Chung Chang [Tue, 9 Mar 2010 06:04:56 +0000 (22:04 -0800)]
Merge "Make camera tests use the same key as camera."
Chih-Chung Chang [Tue, 9 Mar 2010 05:42:12 +0000 (21:42 -0800)]
Make camera tests use the same key as camera.
Change-Id: I7fd208bd47bf54ec83a59b1c877930b1dbd3c127
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:57 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: I817010aadf2ea1e2ffe0b18057f64ab7926c1805
Chih-Chung Chang [Sat, 6 Mar 2010 05:33:49 +0000 (21:33 -0800)]
Unbundle: change camera package name.
Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc
Chih-Chung Chang [Mon, 8 Mar 2010 23:55:13 +0000 (15:55 -0800)]
Revert "Unbundle: change package name to com.google.android.camera"
This reverts commit
1ace47c7352d65b10361863316b5748b4f3e0689.
Chih-Chung Chang [Mon, 8 Mar 2010 23:23:39 +0000 (15:23 -0800)]
Merge "Unbundle: change package name to com.google.android.camera"
Owen Lin [Fri, 5 Mar 2010 15:51:42 +0000 (23:51 +0800)]
Address the review comments.
Change-Id: Ia30be9e0081830bb05b6d7655c628d022ccd55d7
Owen Lin [Wed, 3 Mar 2010 13:12:40 +0000 (21:12 +0800)]
Add pixel density concept to the code. So, it draw about the same size on
mdpi and hdpi devices.
Update the UI assets for mdpi
Fix a issue that GLSurfaceView didn't call onPause and onResume in Camera.
Refactor. Improve the drawing and animation.
Also fix the RawTexture unsupported operation bugs and the NullPointerException
in GLRootView.
Change-Id: I7aeadcad72d64a665828a6bb4f0f73e685fde632
Chih-Chung Chang [Sat, 6 Mar 2010 05:33:49 +0000 (21:33 -0800)]
Unbundle: change package name to com.google.android.camera
Chih-Chung Chang [Sat, 6 Mar 2010 05:04:51 +0000 (21:04 -0800)]
Revert "Unbundle."
This reverts commit
7319f3f17216969cdb364224d748ef8d3b68af93.
Chih-Chung Chang [Fri, 5 Mar 2010 23:39:22 +0000 (15:39 -0800)]
Unbundle.
Chih-Chung Chang [Fri, 5 Mar 2010 23:34:47 +0000 (15:34 -0800)]
Remove unused code.
Chih-Chung Chang [Fri, 5 Mar 2010 06:15:45 +0000 (22:15 -0800)]
Remove unused code.
This is for unbundling, will clean more later.
Owen Lin [Fri, 5 Mar 2010 02:53:38 +0000 (18:53 -0800)]
Merge "Add strings for for new UI."
Owen Lin [Thu, 4 Mar 2010 06:45:33 +0000 (14:45 +0800)]
Add strings for for new UI.
Change-Id: I0b398d87f3526a70c45a607efbd7823185e53d64
Ray Chen [Fri, 5 Mar 2010 01:20:59 +0000 (17:20 -0800)]
Merge "Add location provider name to gps-processing-method parameter."
Eric Fischer [Thu, 4 Mar 2010 22:04:25 +0000 (14:04 -0800)]
Import new translations
Ray Chen [Thu, 25 Feb 2010 03:32:12 +0000 (11:32 +0800)]
Add location provider name to gps-processing-method parameter.
James Dong [Thu, 4 Mar 2010 01:39:26 +0000 (17:39 -0800)]
Merge "Use unhidden public API from MediaRecorder.java class for setting parameters This change depends on the MediaRecorder.java class change: 42513"
James Dong [Tue, 2 Mar 2010 02:38:44 +0000 (18:38 -0800)]
Use unhidden public API from MediaRecorder.java class for setting parameters
This change depends on the MediaRecorder.java class change: 42513
bug -
2362412
Ying Wang [Wed, 3 Mar 2010 22:58:34 +0000 (14:58 -0800)]
Enable proguard on Camera.
also fix proguard flags.
Horia Ciurdar [Wed, 3 Mar 2010 16:40:26 +0000 (08:40 -0800)]
Merge "Don't start recording right away, even when in quickCapture mode."
Wu-cheng Li [Tue, 2 Mar 2010 23:11:52 +0000 (15:11 -0800)]
Disable proguard to avoid camera crash.
We should check what classes/members we want to keep. Before that, let's disable
it to keep camera working.
Horia Ciurdar [Tue, 2 Mar 2010 18:59:32 +0000 (18:59 +0000)]
Don't start recording right away, even when in quickCapture mode.
Owen Lin [Tue, 2 Mar 2010 04:53:08 +0000 (20:53 -0800)]
Merge "The first runnable version of the new UI."
Eric Fischer [Sat, 27 Feb 2010 01:28:10 +0000 (17:28 -0800)]
Import new translations.
Owen Lin [Fri, 29 Jan 2010 00:10:19 +0000 (16:10 -0800)]
The first runnable version of the new UI.
Implement the new UI with OpenGL (GLSurfaceView).
Known issues:
* Texture are never freed from GL
* Do not consider the density of screen. Currently, the dimensions in mdpi
devices are wrong.
* It won't work on Sapphire, bug fired: Bug:
2473605
* The action UP event may pass a wrong target. (It should pass to the same
target who recive the DOWN action.
* Animation is not smooth enough.
* Should not allocate objects into heap during rendering path.
* The scrollbar in GLListView doesn't match the design
* We should calculate our own orientation instead of using the system one.
* Regression: "restore to default settings" is removed
Change-Id: I93fa45831aa87787dd5ee9e43e270a9d786c5a2a
James Dong [Wed, 24 Feb 2010 02:05:39 +0000 (18:05 -0800)]
Set duration and still image encoding quality using Java API
- rebased
bug -
2375978
Owen Lin [Thu, 25 Feb 2010 05:30:05 +0000 (21:30 -0800)]
Merge "Fix the no "SD Card is full" bug. Now, we show the error message when we find out the storage may be not enough for next picture."