OSDN Git Service
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."
Owen Lin [Wed, 3 Feb 2010 23:09:38 +0000 (15:09 -0800)]
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.
Bug:
2377057
Change-Id: Ie6684738a282c382cf6368276dd78f77ca848611
Wei-Ta Chen [Wed, 24 Feb 2010 03:34:22 +0000 (11:34 +0800)]
Enable enter and exit animations; and use overridePendingTransition
for disabling animations in switching VideoCamera and Camera.
Bug:
2416396
Chih-Chung Chang [Tue, 23 Feb 2010 17:12:11 +0000 (09:12 -0800)]
Merge "Remove unused resources."
Chih-Chung Chang [Mon, 22 Feb 2010 17:44:47 +0000 (09:44 -0800)]
Remove unused resources.
Chih-Chung Chang [Mon, 22 Feb 2010 17:09:56 +0000 (09:09 -0800)]
Merge "Move set screen brightness later so we can start preview earlier."
Chih-Chung Chang [Sat, 20 Feb 2010 01:59:40 +0000 (17:59 -0800)]
Remove unused strings.
Chih-Chung Chang [Fri, 19 Feb 2010 20:35:58 +0000 (12:35 -0800)]
Move set screen brightness later so we can start preview earlier.
Chih-Chung Chang [Thu, 11 Feb 2010 22:05:50 +0000 (14:05 -0800)]
Remove the use of native allocation.
Chih-Chung Chang [Thu, 11 Feb 2010 22:22:47 +0000 (14:22 -0800)]
Remove support for DRM images (they are not used now and reference to hidden classes).
Jeff Hamilton [Thu, 11 Feb 2010 22:25:48 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.
Change-Id: I4695e860b57b45010a201577bd611636717350e9
Ray Chen [Mon, 8 Feb 2010 07:04:41 +0000 (15:04 +0800)]
Revise due to ThumbnailUtils api change.
Bjorn Bringert [Wed, 10 Feb 2010 11:37:28 +0000 (03:37 -0800)]
Merge "Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES"
James Dong [Mon, 8 Feb 2010 02:42:26 +0000 (18:42 -0800)]
Replace calls to system_property with CamcorderProfile API
- rebased
bug -
2417312
Eugene Koh [Tue, 9 Feb 2010 20:21:54 +0000 (12:21 -0800)]
Merge "Update the mdpi resource with v2.0 icons"
Bjorn Bringert [Mon, 8 Feb 2010 21:38:38 +0000 (21:38 +0000)]
Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES
This Google-specific setting is going away because of unbundling.
This change will cause geotagging to be off by default, instead of
being set by SetupWizard by the "Use location for Google services"
prompt. If this is not desirable, another prompt could possibly be
added to SetupWizard, or a new framework geotagging setting
could be added and SetupWizard be modified to set that as part
of the Google location opt-in.
Part of: http://b/issue?id=
2383870
Change-Id: Ic160c2260dd597a35d79fec93250a816fbee8b81
Wu-cheng Li [Mon, 8 Feb 2010 12:05:28 +0000 (20:05 +0800)]
Remove some log messages.
Ray Chen [Fri, 5 Feb 2010 02:53:40 +0000 (10:53 +0800)]
Fix issue
2340332 Inconsistent UI between review mode in Camera app and album view in Gallery app
http://b/
2340332
Bai Tao [Mon, 8 Feb 2010 06:34:55 +0000 (14:34 +0800)]
Update the mdpi resource with v2.0 icons
The Android Open Source Project [Fri, 5 Feb 2010 22:25:53 +0000 (14:25 -0800)]
am
78492fe7: am
338259f2: reconcile main tree with open-source eclair
Merge commit '
78492fe70c43432a0f1c2d88bc9133d2708f51fc'
* commit '
78492fe70c43432a0f1c2d88bc9133d2708f51fc':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:49:48 +0000 (08:49 -0800)]
am
338259f2: reconcile main tree with open-source eclair
Merge commit '
338259f2740ec47ceb26ffa9d89341d1106e61b0' into eclair-plus-aosp
* commit '
338259f2740ec47ceb26ffa9d89341d1106e61b0':
android-2.1_r1 snapshot
Fix issue
2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Owen Lin [Thu, 4 Feb 2010 00:31:38 +0000 (16:31 -0800)]
Fix the switcher could be in wrong place some time.
Change-Id: I504978763da3da797f71ca9fd00116d8b27729ee
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Ray Chen [Thu, 28 Jan 2010 16:50:29 +0000 (08:50 -0800)]
Unbundle Camera: Unhide ThumbnailUtil and rename it to ThumbnailUtils.
Yu Shan Emily Lau [Thu, 28 Jan 2010 22:46:47 +0000 (14:46 -0800)]
am
3cd9af7e: am
499e3b0a: Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Merge commit '
3cd9af7e1a83b15994537e54f45f8453ae5eaa9a'
* commit '
3cd9af7e1a83b15994537e54f45f8453ae5eaa9a':
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Chih-Chung Chang [Tue, 26 Jan 2010 23:37:13 +0000 (15:37 -0800)]
Merge "Use public api instead of protected members."
Owen Lin [Tue, 26 Jan 2010 22:16:18 +0000 (14:16 -0800)]
Fix a bug that RotateImage didn't draw the thumbnail in the center.
Change-Id: Ia46c5ecbceebd5062c76b9396f39a17ae6bc1ed2
Chih-Chung Chang [Tue, 26 Jan 2010 21:40:21 +0000 (13:40 -0800)]
Use public api instead of protected members.
Owen Lin [Tue, 26 Jan 2010 01:09:52 +0000 (17:09 -0800)]
Fix a minor issue of "restore default" should also improve
performance as well.
Change-Id: I1a762ed78dc27bb711b652431481925c9bd1b8b5
Yu Shan Emily Lau [Tue, 26 Jan 2010 02:16:52 +0000 (18:16 -0800)]
am
499e3b0a: Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Merge commit '
499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0' into eclair-plus-aosp
* commit '
499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0':
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Yu Shan Emily Lau [Mon, 25 Jan 2010 21:57:12 +0000 (13:57 -0800)]
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Owen Lin [Sat, 23 Jan 2010 00:52:31 +0000 (16:52 -0800)]
Add quick capture settings for Camera application.
Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b
Bug:
2259528
Owen Lin [Tue, 19 Jan 2010 22:37:36 +0000 (06:37 +0800)]
Unbundle with the PreferenceManager.
Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6
Wu-cheng Li [Fri, 22 Jan 2010 09:54:17 +0000 (17:54 +0800)]
Fix the bug focus bracket may appear in infinite focus mode.
bug:
2247217
Owen Lin [Fri, 15 Jan 2010 21:24:14 +0000 (05:24 +0800)]
Add restore default settings for Camera/Camcorder app.
Bug:
2167010
Change-Id: I1b59ddd23ee9a3b9cc34f911c048e269fb872cf8
Horia Ciurdar [Thu, 21 Jan 2010 12:10:14 +0000 (12:10 +0000)]
Adding hidden quickCapture extra.
Owen Lin [Fri, 25 Dec 2009 04:50:27 +0000 (12:50 +0800)]
Set the brightness to a fixed value.
Bug:
2318682
Change-Id: I367fde55fab1102019accd69e69dc516c583c153
The Android Open Source Project [Tue, 12 Jan 2010 23:19:09 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Romain Guy [Fri, 8 Jan 2010 23:06:47 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Eric Fischer [Thu, 7 Jan 2010 23:56:56 +0000 (15:56 -0800)]
Update with latest translations.
Chih-Chung Chang [Wed, 6 Jan 2010 22:06:05 +0000 (14:06 -0800)]
am
e677eb26: am
2a8efc19: Use public api instead of hidden member. Don\'t use internal resource.
Merge commit '
e677eb26a6ad63e492837dbb0af1945546095d68'
* commit '
e677eb26a6ad63e492837dbb0af1945546095d68':
Use public api instead of hidden member. Don't use internal resource.
Chih-Chung Chang [Wed, 6 Jan 2010 21:46:21 +0000 (13:46 -0800)]
am
2a8efc19: Use public api instead of hidden member. Don\'t use internal resource.
Merge commit '
2a8efc192e4c8dd6fff475494591b05b92920f22' into eclair-mr2-plus-aosp
* commit '
2a8efc192e4c8dd6fff475494591b05b92920f22':
Use public api instead of hidden member. Don't use internal resource.
Chih-Chung Chang [Tue, 5 Jan 2010 11:07:13 +0000 (19:07 +0800)]
Use public api instead of hidden member. Don't use internal resource.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:22 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: I80b28db6aaf6af365f12681caa8905e896c2c30d
Ray Chen [Tue, 5 Jan 2010 23:41:47 +0000 (15:41 -0800)]
am
7240c764: am
2e862df9: Fix issue
2343916 Camera application does not obey date format setting.
Merge commit '
7240c7643291c5ad1f069e03bac0e730e8ff430f'
* commit '
7240c7643291c5ad1f069e03bac0e730e8ff430f':
Fix issue
2343916 Camera application does not obey date format setting.
Ray Chen [Tue, 5 Jan 2010 23:29:39 +0000 (15:29 -0800)]
am
2e862df9: Fix issue
2343916 Camera application does not obey date format setting.
Merge commit '
2e862df90cac949a91634da5dce4b54d7c20d505' into eclair-mr2-plus-aosp
* commit '
2e862df90cac949a91634da5dce4b54d7c20d505':
Fix issue
2343916 Camera application does not obey date format setting.
Ray Chen [Mon, 4 Jan 2010 22:44:51 +0000 (14:44 -0800)]
Fix issue
2343916 Camera application does not obey date format setting.
http://b/
2343916
Chih-Chung Chang [Tue, 5 Jan 2010 10:31:39 +0000 (02:31 -0800)]
am
e495d5d8: am
6d08c5d4: Remove "display name" and always use "title" field in display (same as Gallery).
Merge commit '
e495d5d8d2f00f1b4e9337b925de4dfb807f1e0c'
* commit '
e495d5d8d2f00f1b4e9337b925de4dfb807f1e0c':
Remove "display name" and always use "title" field in display (same as Gallery).
Chih-Chung Chang [Tue, 5 Jan 2010 10:21:15 +0000 (02:21 -0800)]
am
6d08c5d4: Remove "display name" and always use "title" field in display (same as Gallery).
Merge commit '
6d08c5d4cb3925a11a1adbfdb0e463ca6f5dca5a' into eclair-mr2-plus-aosp
* commit '
6d08c5d4cb3925a11a1adbfdb0e463ca6f5dca5a':
Remove "display name" and always use "title" field in display (same as Gallery).
Chih-Chung Chang [Tue, 5 Jan 2010 06:34:36 +0000 (14:34 +0800)]
Remove "display name" and always use "title" field in display (same as Gallery).