• Home
  • History
  • Annotate
  • only in /packages/apps/Camera/src/
History log of /packages/apps/Camera/src/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
b10ed0f6bde8f02b3b8a0d66e337bdd32bee23a5 06-Dec-2012 Michael Kolb <kolby@google.com> Fix picture size option for Arabic languages

Bug: 7680113

Use English locale when using String.format
to convert numbers

Change-Id: I0efde459efb571a22e5e3afb23659633c4874c05
om/android/camera/CameraSettings.java
7769af02cb63bb2e4575ff3b9621ca39700fc917 01-Dec-2012 Your Name <jreck@google.com> Merge "Don't re-launch activities we already started" into gb-ub-photos-arches
759c3a5b4c1399943f3f3db51e97d44009fdaa59 30-Nov-2012 Your Name <jreck@google.com> Don't re-launch activities we already started

Bug: 7650419

Change-Id: Id5831fa6878be23b2123381bbc922554eb0afb1a
om/android/camera/ProxyLauncher.java
fe00bf5a2b86472a3c1de34dec224c52f040fe09 29-Nov-2012 Michael Kolb <kolby@google.com> Prevent Camera UI from showing up in Galllery

Bug: 7634363

Confirm fullscreen state (camera mode) after camera and UI are started

Change-Id: I7b1d730f83095dcaa403945a4c2e098888ef8496
om/android/camera/PhotoModule.java
8eae48b01cab6dc63ba03ebf54bf95a20d3f293e 28-Nov-2012 Your Name <jreck@google.com> Remove orientation compensation

Bug: 7446056

Change-Id: Ie01d7c705bf86db72dff4b3cbf9ee7f4491271cd
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
43ded1fea6ea1c513b056f25d34ce37b3f053627 20-Nov-2012 Doris Liu <tianliu@google.com> Merge "Fix shutter button missing in pano" into gb-ub-photos-arches
b2443bada6ac9b65006d825605c783ddaf825bef 20-Nov-2012 Michael Kolb <kolby@google.com> Enable play button in video review

Bug: 7554804

Change-Id: I435f34c6fb36d0b5c2d220ed6cfb630836ade3c1
om/android/camera/VideoModule.java
45df1bd45d714decb63ae69c98116c75184459f9 20-Nov-2012 Doris Liu <tianliu@google.com> Fix shutter button missing in pano

Bug: 7553175

Shutter button in SRI pano mode is missing even though it is set
to be visible after coming back from lightcycle. So here we do a
layout request to force the shutter button to show.

Change-Id: I004cb29e78018ae48639934c615818e644f56bbf
om/android/camera/CameraActivity.java
02fdcaef920cd764cc7c0ab937367475835e9c9b 15-Nov-2012 Doris Liu <tianliu@google.com> Gray out location setting in secure camera

Bug: 7532731
Change-Id: I1f0c0341c226a79e4a3e50c8e3a6053c2b46a4f1
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/VideoController.java
om/android/camera/ui/MoreSettingPopup.java
3e40e8d8a2fecd360fb7fe339ec1c6044e4a70bc 07-Nov-2012 John Reck <jreck@google.com> Animate between camera modules

Bug: 7265781

Change-Id: Id226392fc1b14ebe5374d1952c830c960c5588d1
om/android/camera/CameraActivity.java
om/android/camera/CameraScreenNail.java
c6c123c85fdc2bf9a9f93fd25f3b951c016a67c0 01-Nov-2012 Angus Kong <shkong@google.com> Add overlay control for maximum recording length.

bug:7075393
Change-Id: Iaf7bdf81c6bd2c09e71d2ac1210c86cfde00398a
om/android/camera/CameraSettings.java
om/android/camera/VideoModule.java
bdc502a9e0b1c701b5c5a87021dab224eb8360ba 30-Oct-2012 Wu-cheng Li <wuchengli@google.com> Lock AE and AWB after the focus completes.

bug:7372273

Change-Id: I08136f32f508c0c55c8f6169b3ea6176097d07d3
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
33cdc54921e467440d9a280fc176d4b8ce746ad0 29-Oct-2012 Michael Kolb <kolby@google.com> Prevent swiping to Gallery while taking HDR

Bug: 7426867

Change-Id: I96920d95adc45f7df4aaffbf2b88ba0af11ce42a
om/android/camera/PhotoModule.java
398aea153020d33e8d061ef3bc0caa28bf7f6c15 26-Oct-2012 Michael Kolb <kolby@google.com> Hide switcher earlier in HDR mode

Bug: 7369396

Change-Id: Ieac1bd955247c818b55b77a2e29ff176e79a5f6d
om/android/camera/PhotoModule.java
ee76ead514ff1860847f574658a5a37bd0de5a28 26-Oct-2012 John Reck <jreck@google.com> Merge "Add proxy launcher" into gb-ub-photos-arches
be83315adf908d321db009bff56b6d89b7881204 25-Oct-2012 Wu-cheng Li <wuchengli@google.com> Add actual layouts for keyguard widget.

bug:7412250
Change-Id: Ib53a3c2191d80dbe16b1ae0d7c30d213c759f35f
om/android/camera/PhotoModule.java
20f8a92e29e5edb414fae43f87c2c6890ea8fc84 24-Oct-2012 John Reck <jreck@google.com> Add proxy launcher

Bug: 7394901

Change-Id: Ibdefb00c3553576995bda5e6a670c53d77f865bd
om/android/camera/CameraActivity.java
om/android/camera/ProxyLauncher.java
9b96a7c0c863538920d0245cc7819e9d01409c1d 25-Oct-2012 Angus Kong <shkong@google.com> Force renderring request for Camera Animation.

bug:7410862
Change-Id: Ib6788fdafa01734d757804bea3e29c82f363849c
om/android/camera/ActivityBase.java
5c61b6787a263c60e32e0ebc5ff7213f69baef26 25-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Clean up SRI panorama UI." into gb-ub-photos-arches
f6b9a4f112896be9b5f91cabc93dd951b7ad4f03 25-Oct-2012 Iliyan Malchev <malchev@google.com> Merge "Revert "Use photo picture size for video snapshot"" into gb-ub-photos-arches
cd4b5bd53fe9cbf3cdccfbba94f2bc12250eb187 24-Oct-2012 Iliyan Malchev <malchev@google.com> Revert "Use photo picture size for video snapshot"

This reverts commit 8a91b608b73eac4677eba27db621b48ce2e66849

We need to reinstate the aspect-ratio matching code in the camera app to
resolve an underlying hardware limitation where the snapshot pipeline must have
the same aspect ratio as the preview/encoder pipeline. A matching CL will go
into the HAL.

Bug: 7372274
Change-Id: I6daa104a4524a7af3721049d03313416fed60f83
Signed-off-by: Iliyan Malchev <malchev@google.com>
om/android/camera/CameraManager.java
om/android/camera/Util.java
om/android/camera/VideoModule.java
789f6cc484e04b496de9d856ceb8f170c474b9ff 24-Oct-2012 Michael Kolb <kolby@google.com> Clean up focus dial code

Bug: 7404017

Immediately start new animation for focusing

Change-Id: I9ca0fb6f0f26501c6d8e732b248238f79be2d1f4
om/android/camera/ui/PieRenderer.java
445ed7298889bb5f3ba1ee8c0db4ae6e46f1fbb8 22-Oct-2012 Wu-cheng Li <wuchengli@google.com> Clean up SRI panorama UI.

- Change Saving... to Rendering panorama.
- Change preview area and progress bar to landscape in portrait mode.
- Move cancel button to the center in portrait mode.

bug:7385654

Change-Id: I166e6c419962b440a0a6148bc133ac6e14cba308
om/android/camera/PanoramaModule.java
6e5431e790db3430e9bbf9eda4bdf793ba446491 24-Oct-2012 Wu-cheng Li <wuchengli@google.com> am fd3edfbb: Fix panorama progress indicator direction.

* commit 'fd3edfbbbe8328b738ce7b4c3a1fd37ee053b72e':
Fix panorama progress indicator direction.
fd3edfbbbe8328b738ce7b4c3a1fd37ee053b72e 24-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix panorama progress indicator direction.

The direction from SRI native code is relative to the camera.
Convert them to UI direction.

bug:7385654

Change-Id: Ib0858554e92b39cc4c24c3a055cf7d29c09df6fd
om/android/camera/PanoramaModule.java
66bb8f9ca956950c40aa780325ed3dd8f39659a7 24-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 553ebe08: Small clean up of SRI panorama.

* commit '553ebe08a5fd329178a44ea0d316df5d5551c92b':
Small clean up of SRI panorama.
553ebe08a5fd329178a44ea0d316df5d5551c92b 24-Oct-2012 Wu-cheng Li <wuchengli@google.com> Small clean up of SRI panorama.

- Remove unused PanoViewHorizontalBar_xlarge.
- Fix compile warning and potential invalid ret_code.

bug:7385654
Change-Id: Ia9b512701c800f96531261208d43ff3bb29b7b1c
om/android/camera/MosaicPreviewRenderer.java
e173ae37dbca2621295434e6014a8346f2e20a1c 24-Oct-2012 Doris Liu <tianliu@google.com> am dff2ace0: rm activity states(AlbumPage,etc) when invisible

* commit 'dff2ace04b640fa8103dda8d1c4074c7d5affed8':
rm activity states(AlbumPage,etc) when invisible
dff2ace04b640fa8103dda8d1c4074c7d5affed8 24-Oct-2012 Doris Liu <tianliu@google.com> rm activity states(AlbumPage,etc) when invisible

Bug: 7384972

Companion CL for https://googleplex-android-review.googlesource.com/#/c/245256/1
Change-Id: Ifaca126448f6541413d83b5e59625b5fc17b5f2e
om/android/camera/CameraActivity.java
cf5c82f0ce0087a2ceaed0ea8bb8f76defe712b1 23-Oct-2012 Michael Kolb <kolby@google.com> am 7420a50a: Merge "Make sure clear runs on UI thread" into gb-ub-photos-arches

* commit '7420a50a12db2fe6bfacee3ec20a89fd90898639':
Make sure clear runs on UI thread
7420a50a12db2fe6bfacee3ec20a89fd90898639 23-Oct-2012 Michael Kolb <kolby@google.com> Merge "Make sure clear runs on UI thread" into gb-ub-photos-arches
af4108c15f5cbb6db063ad1cd50bc3b97dcd0509 23-Oct-2012 Michael Kolb <kolby@google.com> am 0fcaa534: Fix NPE in tests

* commit '0fcaa534c4fd12c242b2f1e2240ad714cc952c9b':
Fix NPE in tests
b458bdc36f035f86f7fafa12bfdbf9c29ecb6d88 23-Oct-2012 Michael Kolb <kolby@google.com> Make sure clear runs on UI thread

Bug: 7361183

Change-Id: Iaef7c284366086a1b19836d9c6568a20729958d2
om/android/camera/ui/PieRenderer.java
0fcaa534c4fd12c242b2f1e2240ad714cc952c9b 23-Oct-2012 Michael Kolb <kolby@google.com> Fix NPE in tests

Bug: 7381934

Change-Id: Ibe1d356573570caf0c512c32b874fc1ed5af438d
om/android/camera/PhotoModule.java
2a623b6c29592d58c2b412a65b2bf63137041983 23-Oct-2012 Michael Kolb <kolby@google.com> am b9b40e51: Merge "Render disabled menu items correctly" into gb-ub-photos-arches

* commit 'b9b40e512cc19c4a33f24d899515278696bf80fd':
Render disabled menu items correctly
461514a0670486cc95ceb6775ad2e5d6ce67f224 23-Oct-2012 Michael Kolb <kolby@google.com> Render disabled menu items correctly

Bug: 7395663

Change-Id: I46c55a6aff5e47926091f8c947564e5f1528d992
om/android/camera/ui/PieRenderer.java
bae548e18789b503f7a7e89bef0f73d50c8da381 20-Oct-2012 George Mount <mount@google.com> am fbcd0807: Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches

* commit 'fbcd08074c53fb3001febc4be6ff2216139820fe':
Hide the switcher pop-up when the switcher is hidden.
fbcd08074c53fb3001febc4be6ff2216139820fe 20-Oct-2012 George Mount <mount@google.com> Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches
4337579d19b5217db1dce7a2461b865377719cbe 19-Oct-2012 Michael Kolb <kolby@google.com> am 8fd37ebb: Make zooming more responsive

* commit '8fd37ebbf180eb58f77ce80b07f2fd26f2bfd52a':
Make zooming more responsive
b8317ef78fa41224a0a8d43431c3eac8e10772f1 19-Oct-2012 George Mount <mount@google.com> Hide the switcher pop-up when the switcher is hidden.

Bug 7378703

Change-Id: I8f6bf5fc0431698e66cf2e74a8c4234cc24022e9
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
8fd37ebbf180eb58f77ce80b07f2fd26f2bfd52a 19-Oct-2012 Michael Kolb <kolby@google.com> Make zooming more responsive

Bug: 7381639

Change-Id: Ie1bd6cf2fcc99a0709e717f44d9b09586ed9e53e
om/android/camera/ui/ZoomRenderer.java
bd2af0cd656da89fcb686cee56ae4d9664ae9c4a 19-Oct-2012 Michael Kolb <kolby@google.com> am b829523f: Fix NPE when exiting camera due to policy

* commit 'b829523fcc88abc91c894ce3d1a20fe48ec83f1e':
Fix NPE when exiting camera due to policy
b829523fcc88abc91c894ce3d1a20fe48ec83f1e 19-Oct-2012 Michael Kolb <kolby@google.com> Fix NPE when exiting camera due to policy

Bug: 7371366

Change-Id: If2fb7bb2a5db9b359c0fd0567099a26690fd3b64
om/android/camera/PhotoModule.java
fa0e369d21ca0cea5858ad1274ae814a3bc16ae4 19-Oct-2012 Michael Kolb <kolby@google.com> am 86b5afc0: Merge "Use photo picture size for video snapshot" into gb-ub-photos-arches

* commit '86b5afc017bd71f1acc63ef441b92a906300b2f4':
Use photo picture size for video snapshot
86b5afc017bd71f1acc63ef441b92a906300b2f4 19-Oct-2012 Michael Kolb <kolby@google.com> Merge "Use photo picture size for video snapshot" into gb-ub-photos-arches
8a91b608b73eac4677eba27db621b48ce2e66849 19-Oct-2012 Michael Kolb <kolby@google.com> Use photo picture size for video snapshot

Bug: 7331463

Change-Id: I21bcb4bb700b79b2d32e37b666b924e0eae3c0fd
om/android/camera/CameraManager.java
om/android/camera/Util.java
om/android/camera/VideoModule.java
c68af146a13d99f77c6b97b61b3e957a80d88224 19-Oct-2012 Michael Kolb <kolby@google.com> am 2c81abc4: Fix zoom change listener

* commit '2c81abc40b4922dc9a89220fce911fff75b608bd':
Fix zoom change listener
2c81abc40b4922dc9a89220fce911fff75b608bd 19-Oct-2012 Michael Kolb <kolby@google.com> Fix zoom change listener

Bug: 7377840

Monkey bug fix regression

Change-Id: Ica70e46caf2a0f51e91f0aea0a8287fe5f23cee0
om/android/camera/PhotoModule.java
857221fa836077359db8145a2534271f6705457f 19-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 224cf5df: Show text in potrait when orientation is portrait.

* commit '224cf5df606a3017b2899e22b1b4ed82d97c525c':
Show text in potrait when orientation is portrait.
224cf5df606a3017b2899e22b1b4ed82d97c525c 19-Oct-2012 Wu-cheng Li <wuchengli@google.com> Show text in potrait when orientation is portrait.

bug:7375765

Change-Id: Ifa272703cc8ed428fe7abba255c63d1d3fd23291
om/android/camera/PanoramaModule.java
c3f7c160f754e187b08a7d26c54abe6c10be3982 18-Oct-2012 Doris Liu <tianliu@google.com> am 861ea12f: Fix NPE at PhotoModule.onShowSwitcherPopup

* commit '861ea12f1386e2061b7ad25d8886004f57ecf5bf':
Fix NPE at PhotoModule.onShowSwitcherPopup
861ea12f1386e2061b7ad25d8886004f57ecf5bf 18-Oct-2012 Doris Liu <tianliu@google.com> Fix NPE at PhotoModule.onShowSwitcherPopup

Bug: 7316940

This NPE happens when switcher is tapped to bring up the switcher
popup before camera is done opening. It's a typical monkey bug.
So, null check is added.

Change-Id: I734daf12ba186f83628a4e4f7313dcaee00fe782
om/android/camera/PhotoModule.java
b50699d9e8ad8ac73d128e4e6fe6029a73ef56c6 18-Oct-2012 Doris Liu <tianliu@google.com> am c9c5d414: Merge "Clean up accessibility mode" into gb-ub-photos-arches

* commit 'c9c5d414f24fea5133bf0498fdf454d1ddb036fd':
Clean up accessibility mode
c9c5d414f24fea5133bf0498fdf454d1ddb036fd 18-Oct-2012 Doris Liu <tianliu@google.com> Merge "Clean up accessibility mode" into gb-ub-photos-arches
1ae07ad4e5594fea931db5e9cc9acc24f3a4b7bb 18-Oct-2012 Doris Liu <tianliu@google.com> Clean up accessibility mode

Bug: 7374006
Change-Id: I8f18934f4dc8e433e2895e30885e4c3cfb6902f5
om/android/camera/ui/CameraSwitcher.java
dd93425edabef901b21fb8c5da7a3dba3195cf4d 18-Oct-2012 Michael Kolb <kolby@google.com> am 7820dfcc: Merge "Fix touch handling on menu button" into gb-ub-photos-arches

* commit '7820dfccf8dadfcde21848e983e4e6afbe0b86f1':
Fix touch handling on menu button
7820dfccf8dadfcde21848e983e4e6afbe0b86f1 18-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix touch handling on menu button" into gb-ub-photos-arches
2d7d3ba77de967edd69889d1c01a7c3372fd30a4 18-Oct-2012 Michael Kolb <kolby@google.com> am f0b0425a: Hide switcher during HDR capture

* commit 'f0b0425adb224dcd6dcdc515a37f6554339dd1b3':
Hide switcher during HDR capture
b1ddf5700f9e3950cead691cab57c4bbf03e577d 18-Oct-2012 Michael Kolb <kolby@google.com> Fix touch handling on menu button

Bug: 7371667

Also fixes review buttons;
Fixes layout of buttons for Nakasi

Change-Id: I2343f2bc5b4d3a4de3373cc29c3fb9640ad48a08
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
f0b0425adb224dcd6dcdc515a37f6554339dd1b3 18-Oct-2012 Michael Kolb <kolby@google.com> Hide switcher during HDR capture

Bug: 7369396

Change-Id: I835d440c4c1308709237d46b69fd41919ee6b300
om/android/camera/PhotoModule.java
35ccd3bbcd8fc67d39e1066e8dd0399091403ab5 18-Oct-2012 Michael Kolb <kolby@google.com> am 8a27da05: Fix capture retake mode

* commit '8a27da058a8318c876fb18b1f4964724b5508d6b':
Fix capture retake mode
8a27da058a8318c876fb18b1f4964724b5508d6b 18-Oct-2012 Michael Kolb <kolby@google.com> Fix capture retake mode

Bug: 7368741

Change-Id: Ia5547afda5078eec70beb35dbea1ab0ac88d6a01
om/android/camera/PhotoModule.java
bef540d479c2445827e2ca672a87d0cb1211eef1 18-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 7148f0ea: Merge "Panorama should add Exif before adding the image to media store." into gb-ub-photos-arches

* commit '7148f0ea7d52fc887fda269c292878dc43e90bab':
Panorama should add Exif before adding the image to media store.
7148f0ea7d52fc887fda269c292878dc43e90bab 18-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Panorama should add Exif before adding the image to media store." into gb-ub-photos-arches
20523f6b162324ac642358b8802fc12a664aa73e 17-Oct-2012 Wu-cheng Li <wuchengli@google.com> Panorama should add Exif before adding the image to media store.

Otherwise, wrong image size is written to the media store. Also,
sometimes gallery cannot generate a thumbnail.

bug:7323502

Change-Id: I742b97dcce24529ee34c475ee5a08e0b00be83d8
om/android/camera/PanoramaModule.java
om/android/camera/Storage.java
32c1f4785ef8d259c74b4434be2dde89514c9733 18-Oct-2012 Michael Kolb <kolby@google.com> am 50dfe58a: Fix monkey bug

* commit '50dfe58a04d7174d72a411a73845fba01ac02dd0':
Fix monkey bug
50dfe58a04d7174d72a411a73845fba01ac02dd0 18-Oct-2012 Michael Kolb <kolby@google.com> Fix monkey bug

Bug: 7347446

Change-Id: I6bbe7ca9addb97b9205b5d34ab9dfa7f3d361194
om/android/camera/PhotoModule.java
315ee46fb1854f7328b3b4f8057caeac841702fe 18-Oct-2012 Michael Kolb <kolby@google.com> am 34badb11: Merge "Fix NPE in CameraSettings" into gb-ub-photos-arches

* commit '34badb1107b22867fe479e0e4c27469562237f83':
Fix NPE in CameraSettings
ed61bcd7cd05b41e5525570f9e271813695612b9 18-Oct-2012 Michael Kolb <kolby@google.com> Fix NPE in CameraSettings

Bug: 7369233

Change-Id: Ie14bbbbdb86e7abd93b2aa08c80eeb1e1de47d20
om/android/camera/CameraSettings.java
a19fd74f9d261c07382e793c6368944864fa19ea 18-Oct-2012 Michael Kolb <kolby@google.com> am a486af36: Show flash indicator in video mode

* commit 'a486af36252dd394696926e27bd2c97623debee7':
Show flash indicator in video mode
a486af36252dd394696926e27bd2c97623debee7 17-Oct-2012 Michael Kolb <kolby@google.com> Show flash indicator in video mode

Bug: 7357911

For those that don't see the flash being on.

Change-Id: Idf77b049c36abc8b899cad79ed57de117612a486
om/android/camera/VideoModule.java
77007467c949db4bddf9014503e50c4b24be76f8 17-Oct-2012 Michael Kolb <kolby@google.com> am 5e4ea5b0: Add background to camera controls

* commit '5e4ea5b07a06795a2af3bab8e07e7760d2741f78':
Add background to camera controls
5e4ea5b07a06795a2af3bab8e07e7760d2741f78 17-Oct-2012 Michael Kolb <kolby@google.com> Add background to camera controls

Bug: 7334946

Change-Id: I479bd52c27214009532aab136919c20ff01f1728
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
39ed4b96243e190ef6b0514602f5faa896ac79a5 17-Oct-2012 John Reck <jreck@google.com> am 20713e25: Merge "Fix animation orientation" into gb-ub-photos-arches

* commit '20713e252a8876e36bc9a15c0e5b6e2204412688':
Fix animation orientation
20713e252a8876e36bc9a15c0e5b6e2204412688 17-Oct-2012 John Reck <jreck@google.com> Merge "Fix animation orientation" into gb-ub-photos-arches
e810e7bb841524c5b1fd1baaf3b6d7641353bff0 17-Oct-2012 Michael Kolb <kolby@google.com> am 47996184: Merge "Larger shutter button for tablets" into gb-ub-photos-arches

* commit '479961843c6f9ef3c4af4de61aa359df227112d1':
Larger shutter button for tablets
d0d0e26a7de012a19420fe1640d82b9430f0a4f7 17-Oct-2012 John Reck <jreck@google.com> Fix animation orientation

Bug: 7363502

Change-Id: Ide002122f1dc61d06b6a01733ccccc54d463ba88
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
479961843c6f9ef3c4af4de61aa359df227112d1 17-Oct-2012 Michael Kolb <kolby@google.com> Merge "Larger shutter button for tablets" into gb-ub-photos-arches
85592e394ed906df12a59510e7375729058b9841 17-Oct-2012 John Reck <jreck@google.com> am 5aee141a: Merge "Respect screen lock for capture animation" into gb-ub-photos-arches

* commit '5aee141a671d6474a874f29f9c50f95d3f70346a':
Respect screen lock for capture animation
d200be24670fe4e455abeef0e684af6370f85a79 17-Oct-2012 Michael Kolb <kolby@google.com> Larger shutter button for tablets

Bug: 7334841

Constrain width of camera controls

Change-Id: I0b9737950ca8a4e48735181931b2792b96f17f93
om/android/camera/CameraActivity.java
5aee141a671d6474a874f29f9c50f95d3f70346a 17-Oct-2012 John Reck <jreck@google.com> Merge "Respect screen lock for capture animation" into gb-ub-photos-arches
008eda17f689eaeb13fbd0c399def9c9870f3285 17-Oct-2012 John Reck <jreck@google.com> am 8a3640ce: Expose the uncropped width/height for FaceView

* commit '8a3640ceaab154f3a5c4c043c6f8db8afd815e6e':
Expose the uncropped width/height for FaceView
bab66b2479fec953811dba84633b24f95b138c34 17-Oct-2012 John Reck <jreck@google.com> Respect screen lock for capture animation

Bug: 7363502

Change-Id: I082ca1ed85cd8b67b8c0cf0bfce0a58bbf1f30f0
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
8a3640ceaab154f3a5c4c043c6f8db8afd815e6e 17-Oct-2012 John Reck <jreck@google.com> Expose the uncropped width/height for FaceView

Bug: 7366204

Change-Id: If741a8621e2f281bbb2de5def822c46eff9487ff
om/android/camera/CameraScreenNail.java
om/android/camera/ui/FaceView.java
0121a8822f509779d8283c7a9551e6e4074bc44e 17-Oct-2012 John Reck <jreck@google.com> am 5bf0244b: Remove oversizing path from CameraScreenNail

* commit '5bf0244bc2ccc8de9950baf3edd2868b5393d716':
Remove oversizing path from CameraScreenNail
5bf0244bc2ccc8de9950baf3edd2868b5393d716 17-Oct-2012 John Reck <jreck@google.com> Remove oversizing path from CameraScreenNail

Bug: 7302956

Change-Id: I237ba0f33358f05becbf228d1e342ad069aaceac
om/android/camera/ActivityBase.java
om/android/camera/CameraScreenNail.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
7c41381ee075f44e2ccf473a427d06c22a5c111e 16-Oct-2012 Michael Kolb <kolby@google.com> am 40d03901: Fix face detection circles for landscape devices

* commit '40d03901adfba08db6f2f274ded7d60ff4001663':
Fix face detection circles for landscape devices
40d03901adfba08db6f2f274ded7d60ff4001663 16-Oct-2012 Michael Kolb <kolby@google.com> Fix face detection circles for landscape devices

Bug: 7257939

Change-Id: If6b2227cbb289004bd959fbc6f6319f2f4261606
om/android/camera/CameraScreenNail.java
om/android/camera/ui/FaceView.java
36761e1cdbe8c43d4c6bf24e887c2d1f506f4b88 16-Oct-2012 Michael Kolb <kolby@google.com> am ec6a318c: Fix assets for wb and exposure

* commit 'ec6a318cdba09ff85bdcacd861442b617399b6da':
Fix assets for wb and exposure
ec6a318cdba09ff85bdcacd861442b617399b6da 16-Oct-2012 Michael Kolb <kolby@google.com> Fix assets for wb and exposure

Bug: 7338305
Bug: 7338210

Change-Id: I1f281478d431a3c3da8fd60e7b8ca658660c2e87
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/PieController.java
5a9907bb28d01dfed111938ae5d9355e8ebcf7d4 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> am eec0ab92: Remove unused drawables and xml files.

* commit 'eec0ab92b1c9c32bf1e36bddb360386879f74615':
Remove unused drawables and xml files.
eec0ab92b1c9c32bf1e36bddb360386879f74615 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> Remove unused drawables and xml files.

bug:7201108

Change-Id: Idc831de134e492fe4bbe4071b69a54fea42e65bc
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/FocusIndicatorRotateLayout.java
791a107fadc17717f68813b67d1516c1561b9467 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> am ed19156e: Remove old camera classes and xml files.

* commit 'ed19156e705efb982b351653a3ea9b15f5a08df7':
Remove old camera classes and xml files.
ed19156e705efb982b351653a3ea9b15f5a08df7 14-Oct-2012 Wu-cheng Li <wuchengli@google.com> Remove old camera classes and xml files.

bug:7201108

Change-Id: I80ac607bed5bbc4a05c13b871017a4a54e76767e
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraActivity.java
om/android/camera/CameraHolder.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
om/android/camera/PanoramaActivity.java
om/android/camera/PhotoModule.java
om/android/camera/Thumbnail.java
om/android/camera/ThumbnailHolder.java
om/android/camera/VideoCamera.java
om/android/camera/VideoModule.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/ControlPanelLayout.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingRestore.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/ListPrefSettingPopup.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/StackLayout.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
928dbd27e000816837ad1dc1a5c3d7df23e8d712 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 0a5afab1: Merge "No need to set contrained frame for camera screen nail." into gb-ub-photos-arches

* commit '0a5afab19b863eb869c2798814a2ad15f6270f24':
No need to set contrained frame for camera screen nail.
0a5afab19b863eb869c2798814a2ad15f6270f24 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "No need to set contrained frame for camera screen nail." into gb-ub-photos-arches
df1b9a0edc2b66c7d717e2d2259b6322125a61c4 16-Oct-2012 Doris Liu <tianliu@google.com> am 59d61767: Do not show location prompt in Nakasi

* commit '59d61767a832eb69f68c1d131af6c59fff7e8616':
Do not show location prompt in Nakasi
59d61767a832eb69f68c1d131af6c59fff7e8616 16-Oct-2012 Doris Liu <tianliu@google.com> Do not show location prompt in Nakasi

Bug: 7353489
Change-Id: I450bc23d6640bb5390c1d9c46627596c50d0772b
om/android/camera/PhotoModule.java
4d697514912f776a01644d9f331b8805399ca583 16-Oct-2012 Doris Liu <tianliu@google.com> am b7fc8732: Fix NPE for onConfigurationChanged

* commit 'b7fc87328c1ee793e6c66ff6af45495268f954ba':
Fix NPE for onConfigurationChanged
b7fc87328c1ee793e6c66ff6af45495268f954ba 16-Oct-2012 Doris Liu <tianliu@google.com> Fix NPE for onConfigurationChanged

Bug: 7333590

Adding null check in setParameters in FocusOverlayManager. The NPE happens
when onConfigurationChanged is called before camera is ready.

TODO: Refactor FocusOverlayManager to separate UI and camera code. (After
a discussion with MTV folks, we agree that the code refactoring has a slightly
lower priority.)

Change-Id: I5b1e60c97207e42f73d7583c2c53c9e17652a60a
om/android/camera/FocusOverlayManager.java
cbded3384a10cdc291b8a59544cfcec001451720 15-Oct-2012 Michael Kolb <kolby@google.com> am 17a04fb7: Don\'t show menu on tap

* commit '17a04fb7378effcef5728b5b21442a59fb88572d':
Don't show menu on tap
17a04fb7378effcef5728b5b21442a59fb88572d 15-Oct-2012 Michael Kolb <kolby@google.com> Don't show menu on tap

Bug: 7344432

Change-Id: Ie611492cffbda8d6c7249e3f76daa43b5ff89a6b
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/PieRenderer.java
4c3a254e1b2db0cd358398e5012b6e88e8d9f8a1 15-Oct-2012 Michael Kolb <kolby@google.com> am f5b3e987: Merge "Fix menu fade in animation" into gb-ub-photos-arches

* commit 'f5b3e987e313d01fc90906e2887602acdf54fde6':
Fix menu fade in animation
f5b3e987e313d01fc90906e2887602acdf54fde6 15-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix menu fade in animation" into gb-ub-photos-arches
8ca6fe2bab37b5f6cb085101684e9fce28d186c3 15-Oct-2012 John Reck <jreck@google.com> am 9b475cfd: Aniamte before capture if HDR

* commit '9b475cfd71609cfe2936b5be2b55c334949858ee':
Aniamte before capture if HDR
9b475cfd71609cfe2936b5be2b55c334949858ee 15-Oct-2012 John Reck <jreck@google.com> Aniamte before capture if HDR

Bug: 7349527

Change-Id: I0f74c53fef2bdcf22b44557146df8ab241575219
om/android/camera/PhotoModule.java
0795772dfca3b13eca437f010deb1c3ab74115a7 15-Oct-2012 Michael Kolb <kolby@google.com> Fix menu fade in animation

Bug: 7350205

Change-Id: Ic1e3e848de6559da0e8d0317df34f3aa04c4a3a1
om/android/camera/ui/PieRenderer.java
defaede4eecb2e6a50d7ca50d83975908ca336f7 15-Oct-2012 Michael Kolb <kolby@google.com> am 0ad5161f: Hide menu button when popup is out

* commit '0ad5161f6fd4790f0934de9497c10660a2186d0a':
Hide menu button when popup is out
0ad5161f6fd4790f0934de9497c10660a2186d0a 15-Oct-2012 Michael Kolb <kolby@google.com> Hide menu button when popup is out

Bug: 7345627

Change-Id: Ibd3e2eebc2f1b061556afec7752ebc74508f362d
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
3bf0d20c744e5c904e16de9d284e15387a23fd48 15-Oct-2012 Michael Kolb <kolby@google.com> am 5ee84981: Remove switcher from menu if only one camera present

* commit '5ee84981bf79e2e86fe050f88c426734fb687eaf':
Remove switcher from menu if only one camera present
5ee84981bf79e2e86fe050f88c426734fb687eaf 15-Oct-2012 Michael Kolb <kolby@google.com> Remove switcher from menu if only one camera present

Bug: 7344724

Change-Id: I85e8cb499842888574e238259215efe76f969be2
om/android/camera/PhotoController.java
6aeda7e13240bdce36dbfab8a1e33231d4694273 15-Oct-2012 Michael Kolb <kolby@google.com> am aee79b34: Merge "Fix pie item alpha" into gb-ub-photos-arches

* commit 'aee79b3445f60fe507d77c4cca90a20c74fcfe45':
Fix pie item alpha
aee79b3445f60fe507d77c4cca90a20c74fcfe45 15-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix pie item alpha" into gb-ub-photos-arches
14be58c5dd35f30c1bdaba4c626df053ab2202c3 15-Oct-2012 Michael Kolb <kolby@google.com> am 0af8a3b2: Set actual zoom value in initialize

* commit '0af8a3b2ce98424614dd2ac33ec896142851dab5':
Set actual zoom value in initialize
8c5c6f27146086393591336b74b7742ba0c6fe7d 15-Oct-2012 Michael Kolb <kolby@google.com> Fix pie item alpha

Bug: 7345340

Change-Id: I4962a910cdf2bad1f46c6d6f1ce8fd3824948c16
om/android/camera/ui/PieRenderer.java
0af8a3b2ce98424614dd2ac33ec896142851dab5 15-Oct-2012 Michael Kolb <kolby@google.com> Set actual zoom value in initialize

Bug: 7346114

Change-Id: I246d1fe202da9b3fd0f4f016259dea6a929e47a5
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/ZoomRenderer.java
925d4cf76bc9fba1a4843f58182d809ecdf89daf 15-Oct-2012 Wu-cheng Li <wuchengli@google.com> No need to set contrained frame for camera screen nail.

New camera UI has full screen preview. There is no need
to set contrained frame anymore.

bug:7311572

Change-Id: Ia491c687436d997358fa274f6251c0bd16062acb
om/android/camera/ActivityBase.java
08f41647f6ee636e29463361284ab9970f724606 14-Oct-2012 John Reck <jreck@google.com> am 3ed120d2: Use drawables instead of views

* commit '3ed120d2204c73ab20d6093f112367de60129eb3':
Use drawables instead of views
3ed120d2204c73ab20d6093f112367de60129eb3 14-Oct-2012 John Reck <jreck@google.com> Use drawables instead of views

Bug: 7238158

Change-Id: Icdec6a7e84f1d04f7b9782ff7cb1f53c557399b0
om/android/camera/PhotoController.java
om/android/camera/PieController.java
om/android/camera/VideoController.java
om/android/camera/drawable/TextDrawable.java
om/android/camera/ui/PieItem.java
om/android/camera/ui/PieRenderer.java
8c1434c547278e0f7c24dfa76f1ab498f4411184 14-Oct-2012 Doris Liu <tianliu@google.com> am 287833cb: Fix camera screen nail for swiping during capture

* commit '287833cbc4d2590ff058a9c55d726689105d1004':
Fix camera screen nail for swiping during capture
287833cbc4d2590ff058a9c55d726689105d1004 13-Oct-2012 Doris Liu <tianliu@google.com> Fix camera screen nail for swiping during capture

Bug: 7341774

Flash animation is triggered by shutter click. But in the case
where swipe happens immediately after shutter click, when draw()
is called to draw the animation, the camera is already swiped away,
which causes camera screen nail not being drawn correctly.

This CL checks for whether camera is still full screen before the
animation is drawn, and skips the animation for non-full screen
cases.

Change-Id: I98456042db4080404fd233aed66e0f5dbf8ce960
om/android/camera/CameraScreenNail.java
37197ed44aff0c5dcdfeaebbd8abb8dfcda6316d 12-Oct-2012 Doris Liu <tianliu@google.com> am c7874c2e: Merge "Fix camera switcher animation in landscape" into gb-ub-photos-arches

* commit 'c7874c2e44a18815f745c39663b0240083ab2c4f':
Fix camera switcher animation in landscape
c7874c2e44a18815f745c39663b0240083ab2c4f 12-Oct-2012 Doris Liu <tianliu@google.com> Merge "Fix camera switcher animation in landscape" into gb-ub-photos-arches
6478e5e71f631781e5c0e3f30560da4ca74901bb 12-Oct-2012 Doris Liu <tianliu@google.com> Fix camera switcher animation in landscape

Bug: 7314455
Change-Id: I4a02fbf1e2845df7063bd0f11d7bf2e57fac04b5
om/android/camera/ui/CameraSwitcher.java
d32fa21881acd6cb328764bc8796d97b9b92fe33 12-Oct-2012 Michael Kolb <kolby@google.com> am 6ab108ba: Merge "Animate menu icons on fade in" into gb-ub-photos-arches

* commit '6ab108ba8fae536ba9087793107cd742223a02c1':
Animate menu icons on fade in
6ab108ba8fae536ba9087793107cd742223a02c1 12-Oct-2012 Michael Kolb <kolby@google.com> Merge "Animate menu icons on fade in" into gb-ub-photos-arches
7feb060e24b2b5fed416d075facc6e2c8fce23e9 12-Oct-2012 Michael Kolb <kolby@google.com> Animate menu icons on fade in

Bug: 7238158

Change-Id: Ic1eb7c95d104f42fbbcdaa28663d9284c3595049
om/android/camera/ui/PieRenderer.java
28b83c47a1967d04f472819e4562f2432254c0c7 12-Oct-2012 Bart Sears <bsears@google.com> am 0efe977c: Merge "Fix blurry pictures when taking a burst of pictures." into gb-ub-photos-arches

* commit '0efe977c47d078722d0d11a15e40a3b45032f472':
Fix blurry pictures when taking a burst of pictures.
0efe977c47d078722d0d11a15e40a3b45032f472 12-Oct-2012 Bart Sears <bsears@google.com> Merge "Fix blurry pictures when taking a burst of pictures." into gb-ub-photos-arches
3d5172f826dfad10418ab405fc5528d5b5de3320 12-Oct-2012 Michael Kolb <kolby@google.com> am 19e17529: Merge "Show zoom ratio" into gb-ub-photos-arches

* commit '19e175290fdf7c6f067244cff1b3847465c9d816':
Show zoom ratio
19e175290fdf7c6f067244cff1b3847465c9d816 12-Oct-2012 Michael Kolb <kolby@google.com> Merge "Show zoom ratio" into gb-ub-photos-arches
0505273644c4c3aaf908bcda54c6d576a3ebfae8 11-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix blurry pictures when taking a burst of pictures.

Do not call cancelAutoFocus when taking a burst of pictures because
it will reset the focus distance.

bug:7318298
Change-Id: I94e2ab04a464c3d57c2d97df910a38dd8111e9cf
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
5ed54678384a922550428bb7ba1a3f2475c70bd3 12-Oct-2012 Michael Kolb <kolby@google.com> Show zoom ratio

Bug: 7257941

Change-Id: I9177e8d5a480bc952e73c7ff04656e1520f34805
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/ZoomRenderer.java
d7e2557e66f44f605192e9c82cfebae3f4f01d55 12-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 8ed91ce2: Fix corrupted panorama on second run.

* commit '8ed91ce2179d82e80437339fd17da7a3a8366b29':
Fix corrupted panorama on second run.
8ed91ce2179d82e80437339fd17da7a3a8366b29 12-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix corrupted panorama on second run.

Orginally frame align (main thread) does not wait for glReadPixels
(GL thread). So the first frame may be from an old frame in the
last capture. Synchronizing frame align and glReadPixels to fix
this. This should also improve the stitching quality.

bug:7333076

Change-Id: I5e479261a5103efe34c6ec265e5821d5b4e5aecc
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/PanoramaActivity.java
om/android/camera/PanoramaModule.java
0622aad9de1a24ef21c760879643763f4748d8f7 12-Oct-2012 Doris Liu <tianliu@google.com> am 666e42dd: Fix monkey crash in CameraScreenNail.animateSlide

* commit '666e42dde58024ce0b3f68fc6344e31e68054dd6':
Fix monkey crash in CameraScreenNail.animateSlide
666e42dde58024ce0b3f68fc6344e31e68054dd6 12-Oct-2012 Doris Liu <tianliu@google.com> Fix monkey crash in CameraScreenNail.animateSlide

Bug: 7315307

We finally hunted down the fail path. Monkey has crashed the app by
1) double tap shutter button 2) immediately swipe to gallery
3) wait for the first picture taken and the second flash animation skipped
4) swipe back to camera.

This CL ignores the animateSlide() call when the flash animation was skipped.

Change-Id: I8cdcf09cd4b6573213d364f3cdf5d12426d2abd5
om/android/camera/CameraScreenNail.java
55f313eb05ead11d7fb8ec3e21b7046d1142151e 12-Oct-2012 Michael Kolb <kolby@google.com> am b4003e72: Merge "New lightcycle assets" into gb-ub-photos-arches

* commit 'b4003e7235c3e796a29158b84ad59b3e18233615':
New lightcycle assets
ebf2df0f2696dd287a8235cf4e7c1cac0103a3de 12-Oct-2012 Michael Kolb <kolby@google.com> New lightcycle assets

Bug: 7331839

Change-Id: I30b6c6f7da98600719e3e30a695564e6e2920e06
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
81f16b6746d7fe3875340a179621c5accdc68895 11-Oct-2012 Michael Kolb <kolby@google.com> am bd592c2f: Cross fade menu/submenu

* commit 'bd592c2f2dce4fd6a580cc8bb2fb29c449748801':
Cross fade menu/submenu
bd592c2f2dce4fd6a580cc8bb2fb29c449748801 11-Oct-2012 Michael Kolb <kolby@google.com> Cross fade menu/submenu

Bug: 7265322

Change-Id: Iab50406c032f9a7e768556939f7df9cf4dd5f50c
om/android/camera/ui/PieRenderer.java
558b972429289f38e330b4e81cb56760db6bf929 11-Oct-2012 Michael Kolb <kolby@google.com> am 8ebe8a7f: Merge "New assets for camera" into gb-ub-photos-arches

* commit '8ebe8a7f6ba082481c67e7c934118bb6cde221a5':
New assets for camera
8ebe8a7f6ba082481c67e7c934118bb6cde221a5 11-Oct-2012 Michael Kolb <kolby@google.com> Merge "New assets for camera" into gb-ub-photos-arches
b10a484473aa635174ee9eeebcfb6c8281608f21 11-Oct-2012 Wu-cheng Li <wuchengli@google.com> am b7e4d024: Fix "Too fast" warning is not displayed in panorama capture.

* commit 'b7e4d024214b85e8570ad0d8ce03472887364bee':
Fix "Too fast" warning is not displayed in panorama capture.
b7e4d024214b85e8570ad0d8ce03472887364bee 09-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix "Too fast" warning is not displayed in panorama capture.

If the frame rate is too low and the camera motion is fast,
the frame to frame motion estimation may fail -- leading to
incorrect translation estimates. Originally "Too fast" is
showed when degrees per second exceeds the threshold. But
different devices have different frame rate. Also, if
degrees per second is low but there are not enough frames,
the stitched panorama is still blurry. Now "Too fast" is
showed when degrees per frame is too high. This is more
accurate.

bug:7165018

Change-Id: I082e9f612becb9aaf5f453694914fb24b7e6ffa9
om/android/camera/MosaicFrameProcessor.java
om/android/camera/PanoramaModule.java
f16332047e1c7627c20cdf847520a51f2a89d7b0 11-Oct-2012 Michael Kolb <kolby@google.com> New assets for camera

Bug: 7320839

Added switcher dropdown icon
Changed to new launcher icon

Change-Id: I6d25ca3e572a7ed8498209b409bdcaa26f14ec46
om/android/camera/ui/CameraSwitcher.java
fa90dbd1aefa867ba9ea226be80ae8a2499a04ee 11-Oct-2012 Doris Liu <tianliu@google.com> am 30f75fdc: Fix NPE in setDisplayOrientation

* commit '30f75fdc8d1cd80ec088c9f5e4e7ffbaf91c813c':
Fix NPE in setDisplayOrientation
30f75fdc8d1cd80ec088c9f5e4e7ffbaf91c813c 11-Oct-2012 Doris Liu <tianliu@google.com> Fix NPE in setDisplayOrientation

Bug: 7325977
Change-Id: Ic0bd40343912dd1d0a701e11d5c69ed9825bf9b5
om/android/camera/PhotoModule.java
71a057e991b0930075f834a14929bfb59193de39 11-Oct-2012 Doris Liu <tianliu@google.com> am 6dae2685: Merge "Fix monkey crash" into gb-ub-photos-arches

* commit '6dae2685bc6e05dd48025566d0ef89a6a4b347e2':
Fix monkey crash
6dae2685bc6e05dd48025566d0ef89a6a4b347e2 11-Oct-2012 Doris Liu <tianliu@google.com> Merge "Fix monkey crash" into gb-ub-photos-arches
e0fdab2ccab303a66188569ab8d5ce0c07dcd4c3 11-Oct-2012 John Reck <jreck@google.com> am 23f36aca: Merge "Rotation "just works" if you aren\'t pano" into gb-ub-photos-arches

* commit '23f36acaacbc6e4b58bad8c47d32a5f40c94d7ba':
Rotation "just works" if you aren't pano
b757930a43743fa6cbf3f9271cb068be7ffd4e45 10-Oct-2012 Doris Liu <tianliu@google.com> Fix monkey crash

Bug: 7315307

Monkey swipes to gallery after shutter button is clicked AND before auto focus
is finished. As a result, when the picture is taken, it's already in gallery.
This CL skips the snapshot animations if camera view is no longer full screen.

Change-Id: I413ce02222034d781227efb904e4550a6b3067e1
om/android/camera/PhotoModule.java
b662638bf3d3a3edde4f21d0e4cf55a3d416656e 10-Oct-2012 John Reck <jreck@google.com> Rotation "just works" if you aren't pano

Bug: 7314702
Turns out hardware camera and lightcycle both have the same
behavior requirements wrt rotation, so pretending lightcycle
isn't a panorama will "just work"

Change-Id: I460af4a7a5aa5b51cc95c05672042dff10a11dba
om/android/camera/CameraActivity.java
om/android/camera/CameraScreenNail.java
086cb4f59b727b7a4c5474c596aea0521c8f7c65 10-Oct-2012 Michael Kolb <kolby@google.com> am c48931f8: Merge "Cancel activity touch handling when zooming" into gb-ub-photos-arches

* commit 'c48931f8bde45edc5e31e63532126d27a4a9628d':
Cancel activity touch handling when zooming
aeccb7a572e22ca5efdec031668c6fa6a33dff17 10-Oct-2012 Michael Kolb <kolby@google.com> Cancel activity touch handling when zooming

Bug: 7320904

Change-Id: I51c4ea6febc425540cb0d226e312f627f33f6a7d
om/android/camera/PreviewGestures.java
f6e5e6f504d72c48766b34e1d2abc1efe13aa2bf 10-Oct-2012 John Reck <jreck@google.com> am d8a81bc3: Merge "Support flipped pano preview display" into gb-ub-photos-arches

* commit 'd8a81bc324a7c37c79f3a2612141939db7658a9f':
Support flipped pano preview display
d8a81bc324a7c37c79f3a2612141939db7658a9f 10-Oct-2012 John Reck <jreck@google.com> Merge "Support flipped pano preview display" into gb-ub-photos-arches
dc56e543d39b366c3e360c7752d7ac94141c3885 10-Oct-2012 John Reck <jreck@google.com> Support flipped pano preview display

Bug: 7314703

Change-Id: Ibb4ce3eb4d92d3e2540c280622a7164e5027a57a
om/android/camera/PanoramaModule.java
20794857b9855fb7e4b0b7cb28aff5bc0b5147c8 10-Oct-2012 Michael Kolb <kolby@google.com> am 82a8def7: Merge "Fix pie touch handling" into gb-ub-photos-arches

* commit '82a8def7a1eebcc03fc6b35d9134c11a4406214d':
Fix pie touch handling
82a8def7a1eebcc03fc6b35d9134c11a4406214d 10-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix pie touch handling" into gb-ub-photos-arches
e3cf61f8f7d27348fb7d6c7f86fedd1fadecb48e 08-Oct-2012 Michael Kolb <kolby@google.com> Fix pie touch handling

Bug: 7301736

Detect tap and distinguish from swipe
Resume in swipe mode if moved
Don't select menu item if it opened through tap

Change-Id: Id04f45d6d773d67e6a7983716b39678b43aec73b
om/android/camera/ui/PieRenderer.java
bf3bbc1c95b583e0118c8432746350b89676e351 10-Oct-2012 Bart Sears <bsears@google.com> am cd5ab929: Merge "Fix occasional one-way swiping in filmstrip" into gb-ub-photos-arches

* commit 'cd5ab929c8b2aed555f93fb8911bb679dc767a6a':
Fix occasional one-way swiping in filmstrip
80b2c5f9b86ef65987db5ab3f3f0389df122d891 10-Oct-2012 Bart Sears <bsears@google.com> am 5ec2790d: Merge "Update display rotation in onOrientationChanged" into gb-ub-photos-arches

* commit '5ec2790d9cf77a6de42a758df9b7ba2a8a7f33b9':
Update display rotation in onOrientationChanged
cd5ab929c8b2aed555f93fb8911bb679dc767a6a 10-Oct-2012 Bart Sears <bsears@google.com> Merge "Fix occasional one-way swiping in filmstrip" into gb-ub-photos-arches
3851712c5a250c6764c894b99984e262a8f206a4 10-Oct-2012 John Reck <jreck@google.com> Update display rotation in onOrientationChanged

Bug: 7314703

Change-Id: Ic298077ee6cf5fef872cd0c4efae52c305e970e5
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
f6b8682b922d57ebc865ba78aa17d3fbc72b8227 10-Oct-2012 John Reck <jreck@google.com> am a5993f9b: Merge "Do a relayout after changing camera frame" into gb-ub-photos-arches

* commit 'a5993f9b6557d6c26eddc2db1c88778c8d2fbb56':
Do a relayout after changing camera frame
a5993f9b6557d6c26eddc2db1c88778c8d2fbb56 10-Oct-2012 John Reck <jreck@google.com> Merge "Do a relayout after changing camera frame" into gb-ub-photos-arches
27e6caa9dfdb349adb676b57716ab93f5bf7494f 10-Oct-2012 John Reck <jreck@google.com> Do a relayout after changing camera frame

Bug: 7311572

Change-Id: Ie87b55c25f68af66f41f44062be702a217854cb4
om/android/camera/ActivityBase.java
801d4f29ef2974501df14010e9ac5344d2fa8fa9 10-Oct-2012 Doris Liu <tianliu@google.com> Fix occasional one-way swiping in filmstrip

Bug: 7319028

Only enable gesture handling when camera app view is showing

Change-Id: I86b7df14ef9c09744d05eb46d0775cf487bbe53d
om/android/camera/PhotoModule.java
d89060145843eef1fc2cc0788f06802a8af0f005 10-Oct-2012 Chris Craik <ccraik@google.com> am 1de083f8: Avoid framework shape-cache thrashing in arc drawing

* commit '1de083f82907552ec6a92eaece0dc396e260d49e':
Avoid framework shape-cache thrashing in arc drawing
1de083f82907552ec6a92eaece0dc396e260d49e 10-Oct-2012 Chris Craik <ccraik@google.com> Avoid framework shape-cache thrashing in arc drawing

bug:7317890

Rotate arcs instead of creating different arcs each frame.

Change-Id: I7aa3a7b13b7238b2667465fa3b984358cc9f50ae
om/android/camera/ui/PieRenderer.java
db5e8fd5db9be26596a044ff6de134982d306dd4 09-Oct-2012 Michael Kolb <kolby@google.com> am 8a66eb64: Fix menu button in capture mode

* commit '8a66eb641fbc210130c1257cf713a95f571d609b':
Fix menu button in capture mode
8a66eb641fbc210130c1257cf713a95f571d609b 09-Oct-2012 Michael Kolb <kolby@google.com> Fix menu button in capture mode

Bug: 7314456

Change-Id: If5288e9a3e0acecfd3b21cdb79c4d1b0b607c48d
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
680a09a82efde7c4274e224acc4125b514b8a35f 09-Oct-2012 Bart Sears <bsears@google.com> am add7835a: Merge "Fix NPE if location is changed before camera is opened." into gb-ub-photos-arches

* commit 'add7835a60c99b32694d98c3f43b8b48b75e4c22':
Fix NPE if location is changed before camera is opened.
add7835a60c99b32694d98c3f43b8b48b75e4c22 09-Oct-2012 Bart Sears <bsears@google.com> Merge "Fix NPE if location is changed before camera is opened." into gb-ub-photos-arches
1b65e083b11d50a65f0dc89d72c377d79eed963f 09-Oct-2012 Michael Kolb <kolby@google.com> am 5c5e82ba: Merge "Fix pie after config change" into gb-ub-photos-arches

* commit '5c5e82ba97061c33aae2890e4a88e855d4383f66':
Fix pie after config change
5c5e82ba97061c33aae2890e4a88e855d4383f66 09-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix pie after config change" into gb-ub-photos-arches
6f54ad9e32b77db645f31c45b768af221e80e207 09-Oct-2012 Michael Kolb <kolby@google.com> Fix pie after config change

Bug: 7313088

Change-Id: I79865553be45afd8224bef0351cc681d5e786e92
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
86bee181a5b8ab7568ee27946e694a5acb1defd7 09-Oct-2012 Doris Liu <tianliu@google.com> am 4de11f3b: Lock orientation when stitching is in process

* commit '4de11f3b5d5a83c23822c13b8c2c80872a375878':
Lock orientation when stitching is in process
4de11f3b5d5a83c23822c13b8c2c80872a375878 09-Oct-2012 Doris Liu <tianliu@google.com> Lock orientation when stitching is in process

Bug: 7313392
Change-Id: I1eb3e5c9dc799a4ab38c2853cf216e580c32fdd7
om/android/camera/PanoramaModule.java
eebbf302dfa981b83a1f445eee6e8674f9309acc 09-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE if location is changed before camera is opened.

bug:7310333
Change-Id: I350ed7b8147ef6b763c6d536b5775d8d7417d6ae
om/android/camera/PhotoModule.java
ac6c248066b83d9886a4d965a7c7524e1f0a4f00 09-Oct-2012 Angus Kong <shkong@google.com> am c5777bb0: Show review UI for image capture intent.

* commit 'c5777bb0d17b3b633e67fec972229b717bc51993':
Show review UI for image capture intent.
c5777bb0d17b3b633e67fec972229b717bc51993 09-Oct-2012 Angus Kong <shkong@google.com> Show review UI for image capture intent.

The review UI should be shown after orientation changed if it's an image
capture intent.

bug:7312584
Change-Id: I1a8d80faea049b70bdd9dc76167e86b1a6ca1fbc
om/android/camera/PhotoModule.java
765018a307f6bbd646b418f3fd574f441b325096 09-Oct-2012 Michael Kolb <kolby@google.com> am 295c3f89: Hide indicators when reviewing captured image

* commit '295c3f89cd90545caf40a7dd9263805c0836625f':
Hide indicators when reviewing captured image
295c3f89cd90545caf40a7dd9263805c0836625f 09-Oct-2012 Michael Kolb <kolby@google.com> Hide indicators when reviewing captured image

Bug: 7308304

Change-Id: Id83ab48642605daf254325fb4dd5e77c7c1a3c5f
om/android/camera/PhotoModule.java
94bdc875b1c15ec9d05ce05b7c821f2c88c54564 09-Oct-2012 Michael Kolb <kolby@google.com> am b27064ec: Merge "Fix face detection circles" into gb-ub-photos-arches

* commit 'b27064eca9c488210944e31ec052745cef2b76f7':
Fix face detection circles
b27064eca9c488210944e31ec052745cef2b76f7 09-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix face detection circles" into gb-ub-photos-arches
b5b227a4b9137216b9e3ce39d0983bac5fdae525 09-Oct-2012 John Reck <jreck@google.com> am d1dccd2e: Only PhotoModule should use two-part animation

* commit 'd1dccd2ec153a8aaa66e82b387cb42bb784c5a3a':
Only PhotoModule should use two-part animation
41d49f0fa2c9c93869bacfd6e7f76299f482e40f 09-Oct-2012 Michael Kolb <kolby@google.com> Fix face detection circles

Bug: 7257939

Adjust to overscale size

Change-Id: Ida067ca154faac6651ab8d00ef4388f2491a76c9
om/android/camera/CameraActivity.java
om/android/camera/CameraScreenNail.java
om/android/camera/PhotoModule.java
om/android/camera/ui/FaceView.java
d1dccd2ec153a8aaa66e82b387cb42bb784c5a3a 09-Oct-2012 John Reck <jreck@google.com> Only PhotoModule should use two-part animation

Bug: 7311004

Change-Id: Ic8857336d55d6ab831368819d7fa25afcad9347f
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
om/android/camera/PhotoModule.java
a3676dee838f425fbee146b46ac0f7d757eba4d3 09-Oct-2012 John Reck <jreck@google.com> am 561af393: Hide pie render on switcher popup

* commit '561af39348f34db4d67bc954536d6f6cbf296054':
Hide pie render on switcher popup
561af39348f34db4d67bc954536d6f6cbf296054 09-Oct-2012 John Reck <jreck@google.com> Hide pie render on switcher popup

Bug: 7301188

Change-Id: Ic9b2ec1f3e83d14c39d07dbd57be2c973fbefa56
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
13a58772d5b97bd903af8d1aa3e95a739d3eec3d 09-Oct-2012 John Reck <jreck@google.com> am 70d41293: Split flash & slide animation into two pieces

* commit '70d41293e9dad8be7a1f2c556ff7c7334a60c8f5':
Split flash & slide animation into two pieces
70d41293e9dad8be7a1f2c556ff7c7334a60c8f5 08-Oct-2012 John Reck <jreck@google.com> Split flash & slide animation into two pieces

Bug: 7299092
Play the flash immediately on capture(), and delay the slide
until onPicture callback.

Change-Id: I81132a4083726381759e7c7aa949fda5f44d5765
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
om/android/camera/PhotoModule.java
e9366b305148b7580f839a9cfde5b2185e87ef11 09-Oct-2012 John Reck <jreck@google.com> am c9512090: Merge "Use framework orientation" into gb-ub-photos-arches

* commit 'c9512090d1026451680250e8ebbe210b3b652395':
Use framework orientation
c9512090d1026451680250e8ebbe210b3b652395 09-Oct-2012 John Reck <jreck@google.com> Merge "Use framework orientation" into gb-ub-photos-arches
032dea1d8406cde556ec0a441e4c90409edf9d63 08-Oct-2012 John Reck <jreck@google.com> Use framework orientation

Bug: 7292373

Change-Id: I1ec67db0bfe1fa0723f397c4361c9949bea30437
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
9128093fd7d0c452c7bfe604084a30445e016b7a 08-Oct-2012 Michael Kolb <kolby@google.com> am 6342be38: Start front/back animation from fullscreen

* commit '6342be380a34976c828d21c2a3c172630123846a':
Start front/back animation from fullscreen
6342be380a34976c828d21c2a3c172630123846a 08-Oct-2012 Michael Kolb <kolby@google.com> Start front/back animation from fullscreen

Bug: 7250391

Note: The animation itself is unchanged, the new camera animates
in from a smaller size to fullscreen.

Change-Id: I30e926bfb8f2bddb299a23318f9617652adfc30c
om/android/camera/CameraScreenNail.java
c52e839759b1822fd8bbe941e5122c4a29bf0b84 08-Oct-2012 Michael Kolb <kolby@google.com> am fd187ac6: Back key dismisses menu

* commit 'fd187ac6cfd6129882ae0bcea1034f4d18fcdff8':
Back key dismisses menu
fd187ac6cfd6129882ae0bcea1034f4d18fcdff8 08-Oct-2012 Michael Kolb <kolby@google.com> Back key dismisses menu

Bug: 7302010

Change-Id: I527401fabb8c56374c985a388df9af8f6e469574
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/PieRenderer.java
e64229a555f95269ffd4e453161f4f85a0891b31 08-Oct-2012 Michael Kolb <kolby@google.com> am 5e5c154c: Merge "Hide face detection circles while menu is open" into gb-ub-photos-arches

* commit '5e5c154c9a8461cd228404173ededbfcc8bd9c02':
Hide face detection circles while menu is open
5e5c154c9a8461cd228404173ededbfcc8bd9c02 08-Oct-2012 Michael Kolb <kolby@google.com> Merge "Hide face detection circles while menu is open" into gb-ub-photos-arches
4bde82830d2ccee5a8b19cfd99404d85b3fd481e 08-Oct-2012 Michael Kolb <kolby@google.com> am 9d91b995: Merge "Hide Camera UI in film strip" into gb-ub-photos-arches

* commit '9d91b995d46cfed49c0e87da867cc2db05f93adb':
Hide Camera UI in film strip
9d91b995d46cfed49c0e87da867cc2db05f93adb 08-Oct-2012 Michael Kolb <kolby@google.com> Merge "Hide Camera UI in film strip" into gb-ub-photos-arches
8dbb2a65ef1b0404c169e8fada6c0d0f154dd08f 08-Oct-2012 Michael Kolb <kolby@google.com> Hide face detection circles while menu is open

Bug: 7302729

Instead of starting/stopping the face detection (which can leave
it in a bad state if the monkeys or Sarah find it), just don't render
the circles.

Change-Id: Ib21f355b64036e282a4a7a73dc187fd7ca81dc73
om/android/camera/PhotoModule.java
om/android/camera/ui/FaceView.java
d22f66822372bb12bf4c2fe4d892dbeaf9a6592e 08-Oct-2012 Michael Kolb <kolby@google.com> am 9010cd6d: Merge "Hide switcher during video recording" into gb-ub-photos-arches

* commit '9010cd6d9fb60a1a5e57d1e78023d13a83a260f7':
Hide switcher during video recording
9010cd6d9fb60a1a5e57d1e78023d13a83a260f7 08-Oct-2012 Michael Kolb <kolby@google.com> Merge "Hide switcher during video recording" into gb-ub-photos-arches
812fcbcb099b5ff7b9f9ae8bb4219d57dc29c70c 08-Oct-2012 Michael Kolb <kolby@google.com> Hide Camera UI in film strip

Bug: 7303433

Change-Id: I2cb9be4f0cac928793c730e1d84d3ed0673c2554
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
5aa515dee9207edf15a17651b98a0ccbd1381736 08-Oct-2012 Doris Liu <tianliu@google.com> am 21bb0682: Changing Lightcyle to photosphere panorama in accessibility

* commit '21bb06827d9fec3554ee97c8a2c7b2f00dda7778':
Changing Lightcyle to photosphere panorama in accessibility
db3148cdc650ae64eacadeb9d1d5f659cbdabfc3 08-Oct-2012 Doris Liu <tianliu@google.com> am f74f3941: Merge "Add content description for accessibity in camera" into gb-ub-photos-arches

* commit 'f74f394163fb3266622f7a8e09a9792ad7c76b22':
Add content description for accessibity in camera
21bb06827d9fec3554ee97c8a2c7b2f00dda7778 08-Oct-2012 Doris Liu <tianliu@google.com> Changing Lightcyle to photosphere panorama in accessibility

Bug: 7264879
Change-Id: Ia13d03e3d7eb2ad06307cf371a9770a388a92e0b
om/android/camera/ui/CameraSwitcher.java
f74f394163fb3266622f7a8e09a9792ad7c76b22 08-Oct-2012 Doris Liu <tianliu@google.com> Merge "Add content description for accessibity in camera" into gb-ub-photos-arches
d9a36946b24f4ccd697aa0139aa978c962eb95e1 06-Oct-2012 Doris Liu <tianliu@google.com> Add content description for accessibity in camera

Bug: 7264879

Adding content descriptions for the Mode switcher (and the different cameras
that come up in the pop-up), the shutter button, and the Menu button

Change-Id: Ic805e446a2f91b77a1963653265dddee3410d17e
om/android/camera/ui/CameraSwitcher.java
46b602f080aaf39a365962c69ea39b917cce248e 07-Oct-2012 Michael Kolb <kolby@google.com> Hide switcher during video recording

Bug: 7301580

Change-Id: If0a339b53268bdb128c240f6c46f49c3a817d57d
om/android/camera/VideoModule.java
17c2abcbb3843f9fe0d2e3533ff2a481b4c2710f 07-Oct-2012 Doris Liu <tianliu@google.com> am 5a2674d2: Merge "Make time lapse show time interval with correct units" into gb-ub-photos-arches

* commit '5a2674d2463770c7a29d64da10de23936861c31c':
Make time lapse show time interval with correct units
5a2674d2463770c7a29d64da10de23936861c31c 07-Oct-2012 Doris Liu <tianliu@google.com> Merge "Make time lapse show time interval with correct units" into gb-ub-photos-arches
8afac931f3966761e9ce6de6f792fa372a3cdef3 07-Oct-2012 George Mount <mount@google.com> am 04594c35: Merge "Don\'t reuse the screen nail from LightCycle\'s capture." into gb-ub-photos-arches

* commit '04594c35d7dbbb42a139209e6f9572c02cbe39b3':
Don't reuse the screen nail from LightCycle's capture.
04594c35d7dbbb42a139209e6f9572c02cbe39b3 07-Oct-2012 George Mount <mount@google.com> Merge "Don't reuse the screen nail from LightCycle's capture." into gb-ub-photos-arches
e1394085cca586c49dcff332b28d4c5d1aa43b8d 07-Oct-2012 Doris Liu <tianliu@google.com> Make time lapse show time interval with correct units

Bug: 7300369
Change-Id: If25b398382c936de7479081efee8facc2ec4e71e
om/android/camera/ui/TimeIntervalPopup.java
9a4b58dbf402cf0565e718803d2b18d9c0c7b9dc 07-Oct-2012 George Mount <mount@google.com> Don't reuse the screen nail from LightCycle's capture.

Bug 7301201

Change-Id: I50fc4e6c4796ddb6b7b290fe6adba81853c63e61
om/android/camera/ActivityBase.java
om/android/camera/CameraActivity.java
f998d67acca120fb2556c7663ea399a929d973cd 07-Oct-2012 Michael Kolb <kolby@google.com> am 2b2e0831: Hold menu selection for 300 ms

* commit '2b2e0831c0494ea45fe2d57869a2dc09cefae19e':
Hold menu selection for 300 ms
2b2e0831c0494ea45fe2d57869a2dc09cefae19e 07-Oct-2012 Michael Kolb <kolby@google.com> Hold menu selection for 300 ms

Bug: 7238773

Change-Id: I0ac6c9eeae743167e8606da9cc2b803cf9e98f3a
om/android/camera/ui/PieRenderer.java
a4326f097ecfb8111a7f13e7771e2ecd00b8df11 07-Oct-2012 Michael Kolb <kolby@google.com> am 8e6490c7: Only show HDR menu option if it is supported

* commit '8e6490c77d7f6b581dce3a12b60438a0d629d6eb':
Only show HDR menu option if it is supported
72d6f08eccaf954368b1b2a557dbe22bfa2b8b71 07-Oct-2012 Michael Kolb <kolby@google.com> am 1293ddd1: Merge "Fade in menu" into gb-ub-photos-arches

* commit '1293ddd17dc61929b1cd9c6bfb5a29c67f70c9d1':
Fade in menu
20c556aad25ded8656d98a6b07e0fd173dd43d47 07-Oct-2012 Michael Kolb <kolby@google.com> am dfea3e5f: Merge "Add HDR support to menu" into gb-ub-photos-arches

* commit 'dfea3e5fa9bc44715b37f1215dd07ab2f2117681':
Add HDR support to menu
f82a053583900d5a75c1c17577022e64ae3e6455 07-Oct-2012 Michael Kolb <kolby@google.com> am b9a25e6e: Merge "Remove early initialization of switcher popup" into gb-ub-photos-arches

* commit 'b9a25e6e4d3056455bce9352aca38014fc97ae7a':
Remove early initialization of switcher popup
90c2714a23f6e6f39f5b6e16f1dd3093f80cc021 07-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 92447c2d: Merge "Keep the camera when switching modules." into gb-ub-photos-arches

* commit '92447c2d42f399c71287decfed8f486c71640907':
Keep the camera when switching modules.
ae4ca300c875a5ac67c24c48733a88e138a31b48 07-Oct-2012 Michael Kolb <kolby@google.com> am 4f146348: Remove separator line

* commit '4f146348f669a6c88b599f63a2601b5d11f3fa46':
Remove separator line
5d46908dc610e79fc09015167b1021b5e8cceece 07-Oct-2012 Michael Kolb <kolby@google.com> am 19aa40f8: Merge "Change menu button to indicators" into gb-ub-photos-arches

* commit '19aa40f8a6959b69f394a6247be375dd36413352':
Change menu button to indicators
2ab5cccd2e2ce2b23dea3d1d0c717b00ea8e4c4e 07-Oct-2012 John Reck <jreck@google.com> am 1f6fd1f2: Don\'t play capture animation until onPicture callback

* commit '1f6fd1f2a393f2d5808a908c6ef9b3a1542368b7':
Don't play capture animation until onPicture callback
09942fb541f9cd49f46f4bbdbf9588be0a7d22af 07-Oct-2012 John Reck <jreck@google.com> am e3a8e523: Merge "Animate the view switcher popup" into gb-ub-photos-arches

* commit 'e3a8e523187cf5466711adf0f69bb7b2ea07478f':
Animate the view switcher popup
2facf7a9a2338c3a6cfc7f56b91ed2bf136bb5d9 07-Oct-2012 Michael Kolb <kolby@google.com> am 449badb7: Update photo and video menu

* commit '449badb77342ee5d0ee2852b3cdd5386e456e461':
Update photo and video menu
759ec0b086344b2741f7a6bd74916071aa9b9045 07-Oct-2012 Michael Kolb <kolby@google.com> am da04f24a: New assets

* commit 'da04f24a205d92c72c32d7768f0d3b4b1f93512d':
New assets
e5ff82702241d857b85af5d3f72ab76d7110615a 07-Oct-2012 Michael Kolb <kolby@google.com> am 065aeb6d: Merge "Show menu when menu button is clicked" into gb-ub-photos-arches

* commit '065aeb6d89abcad44cc90ab5be0fd50c21c25e71':
Show menu when menu button is clicked
2508b556b5d813824ab5d4ff7cf489f0d85eb8b2 07-Oct-2012 Wu-cheng Li <wuchengli@google.com> am e8683798: Merge "Add enableShutterSound method to CameraProxy." into gb-ub-photos-arches

* commit 'e86837983ae08ec25fd49bce83dbce598fd00098':
Add enableShutterSound method to CameraProxy.
51280e86af583b0da5079383714aab0382517db7 07-Oct-2012 Doris Liu <tianliu@google.com> am 9aea5402: Merge "Remove "Restore defaults" option from camera and video camera" into gb-ub-photos-arches

* commit '9aea54021361008a3515b73cdbf5f3387a067232':
Remove "Restore defaults" option from camera and video camera
ebe34f219876c4c45424f0a7bf88c8616573f62f 07-Oct-2012 Michael Kolb <kolby@google.com> am 69853ec0: Hide menu during video recording

* commit '69853ec0cefd7efae87db0f81947f8789c42249d':
Hide menu during video recording
8e6490c77d7f6b581dce3a12b60438a0d629d6eb 07-Oct-2012 Michael Kolb <kolby@google.com> Only show HDR menu option if it is supported

Bug: 7301726

Change-Id: Ief55cb4b4b568db17aa1a72a414dd25583489dc7
om/android/camera/PhotoController.java
1293ddd17dc61929b1cd9c6bfb5a29c67f70c9d1 07-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fade in menu" into gb-ub-photos-arches
1a9a41b66187eac7ff59f22a50de0d9d9403e4ce 07-Oct-2012 Michael Kolb <kolby@google.com> Fade in menu

Bug: 7300768

Also disabled face detection while menu is up (a regression)
Added super.draw call
Change-Id: I7f552e5548811b45d426577ca9a7ecb5b75970fd
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
dfea3e5fa9bc44715b37f1215dd07ab2f2117681 07-Oct-2012 Michael Kolb <kolby@google.com> Merge "Add HDR support to menu" into gb-ub-photos-arches
66cccc081bddcccff17971943d21369207af2888 07-Oct-2012 Michael Kolb <kolby@google.com> Remove early initialization of switcher popup

Bug: 7301558

Popup can only be initialized after icon ids have been set

Change-Id: I6ceb1b9a9d9a2b5365a308b663f96d9a654655fc
om/android/camera/ui/CameraSwitcher.java
e1fa2543424be206ed29efa5f0ebcaff3766ed99 07-Oct-2012 Michael Kolb <kolby@google.com> Add HDR support to menu

Bug: 7300829

Add HDR menu option and update indicators accordingly

Change-Id: I0fc0cb3c753bfef55509b3fb99e5817c42c68a44
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
92447c2d42f399c71287decfed8f486c71640907 07-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Keep the camera when switching modules." into gb-ub-photos-arches
4f146348f669a6c88b599f63a2601b5d11f3fa46 07-Oct-2012 Michael Kolb <kolby@google.com> Remove separator line

Bug: 7299793

Change-Id: I56ca04cef32f7e5ae7366bd94329741178b44aeb
om/android/camera/CameraActivity.java
19aa40f8a6959b69f394a6247be375dd36413352 07-Oct-2012 Michael Kolb <kolby@google.com> Merge "Change menu button to indicators" into gb-ub-photos-arches
1a753f543b84b99b33e1209acfe39cdf2b12297a 07-Oct-2012 Michael Kolb <kolby@google.com> Change menu button to indicators

Bug: 7300737

Change-Id: I0316282f094c12c887547049b2a52aa9cef8ee83
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
1f6fd1f2a393f2d5808a908c6ef9b3a1542368b7 07-Oct-2012 John Reck <jreck@google.com> Don't play capture animation until onPicture callback

Bug: 7299092
In HDR mode the span between capture() and onPicture is very long,
which results in the capture animation finishing long before the
capture is finished. Delay starting the animation until the capture
is finished to avoid this

Change-Id: I53aed1a6a039f91e12bcaa241aefca8ad07abbe5
om/android/camera/PhotoModule.java
e3a8e523187cf5466711adf0f69bb7b2ea07478f 07-Oct-2012 John Reck <jreck@google.com> Merge "Animate the view switcher popup" into gb-ub-photos-arches
ecf756f3d43e50a27a09c7b8df30b250ceec0279 07-Oct-2012 John Reck <jreck@google.com> Animate the view switcher popup

Bug: 7300696

Change-Id: Ia82c855420abfbc86598467b42aac2fb5a810f6f
om/android/camera/ui/CameraSwitcher.java
449badb77342ee5d0ee2852b3cdd5386e456e461 07-Oct-2012 Michael Kolb <kolby@google.com> Update photo and video menu

Bug: 7300829

Change-Id: I6c107297bfea59868cad06b1479aaad2dc058fa6
Note: still missing HDR item
om/android/camera/PhotoController.java
om/android/camera/VideoController.java
da04f24a205d92c72c32d7768f0d3b4b1f93512d 06-Oct-2012 Michael Kolb <kolby@google.com> New assets

Bug: 7283381

Change-Id: I183687f4702e9bc8c5dade550906ee4cadda5415
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
065aeb6d89abcad44cc90ab5be0fd50c21c25e71 06-Oct-2012 Michael Kolb <kolby@google.com> Merge "Show menu when menu button is clicked" into gb-ub-photos-arches
e86837983ae08ec25fd49bce83dbce598fd00098 06-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add enableShutterSound method to CameraProxy." into gb-ub-photos-arches
9aea54021361008a3515b73cdbf5f3387a067232 06-Oct-2012 Doris Liu <tianliu@google.com> Merge "Remove "Restore defaults" option from camera and video camera" into gb-ub-photos-arches
d028bb06a5ec6c23c82195f099ac7b24983ac4a4 06-Oct-2012 Michael Kolb <kolby@google.com> Show menu when menu button is clicked

Bug: 7293821

Change-Id: Idd86f3a733cffa4a8eaf249cb295550c778ad657
om/android/camera/ui/PieRenderer.java
c0c5d69598061725bd5a4828a87796c25b515b68 06-Oct-2012 Wu-cheng Li <wuchengli@google.com> Add enableShutterSound method to CameraProxy.

bug:7208909

Change-Id: I71c8de87e12128fee9d4e2b71ff89a5caa1da356
om/android/camera/CameraManager.java
69853ec0cefd7efae87db0f81947f8789c42249d 06-Oct-2012 Michael Kolb <kolby@google.com> Hide menu during video recording

Bug: 7289070

Change-Id: Iad59e2e181db223ea1c6eb8dcc10363a90583e75
om/android/camera/VideoModule.java
om/android/camera/ui/PieRenderer.java
57abb9e7d8c88de1431b1af75b2871bee3e09e42 06-Oct-2012 Doris Liu <tianliu@google.com> Remove "Restore defaults" option from camera and video camera

Bug: 7298919
Change-Id: Id1cfc50f8fbae0433fb506789fd63e5254716574
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/VideoController.java
om/android/camera/VideoModule.java
om/android/camera/ui/MoreSettingPopup.java
9dc260a59c79560ef452cdec2c03bd460d7235bf 06-Oct-2012 John Reck <jreck@google.com> am 839557ce: Merge "Add filtering to face detection state changes" into gb-ub-photos-arches

* commit '839557ceb23e8fad889896150b61f00b35d97761':
Add filtering to face detection state changes
839557ceb23e8fad889896150b61f00b35d97761 06-Oct-2012 John Reck <jreck@google.com> Merge "Add filtering to face detection state changes" into gb-ub-photos-arches
3a731120640e15405d7bb0593dafe721c0430850 06-Oct-2012 Doris Liu <tianliu@google.com> am 349870d1: Merge "Gray out the flash setting when a scene other than Auto is selected" into gb-ub-photos-arches

* commit '349870d149dac8c59a5fd3e6106c3cdce5627e78':
Gray out the flash setting when a scene other than Auto is selected
349870d149dac8c59a5fd3e6106c3cdce5627e78 06-Oct-2012 Doris Liu <tianliu@google.com> Merge "Gray out the flash setting when a scene other than Auto is selected" into gb-ub-photos-arches
3cccc4e63eb678944c3d7fe1238fb4a051e51035 06-Oct-2012 Doris Liu <tianliu@google.com> Gray out the flash setting when a scene other than Auto is selected

Bug: 7273190
Change-Id: If6823f844f2c238933171b42c7166cd9888c3a9e
om/android/camera/ui/PieItem.java
446ac948d8689b4918556629aebb68e0f0a1b68f 06-Oct-2012 Michael Kolb <kolby@google.com> am f48f2f73: Merge "Hide separator line in Filmstrip" into gb-ub-photos-arches

* commit 'f48f2f7356d1ba00fc109e99d0f1224a8ec3c87d':
Hide separator line in Filmstrip
630d255bdeeb1a13a71b0ecda0a38d6546c351e2 06-Oct-2012 John Reck <jreck@google.com> Add filtering to face detection state changes

Bug: 7239738

Change-Id: I73f7207cf74b522050f410d5729f33c959c7b83b
om/android/camera/FocusOverlayManager.java
om/android/camera/ui/FaceView.java
dc752de315de5aa9cf7c7088f872fd9ad75134ad 06-Oct-2012 Michael Kolb <kolby@google.com> Hide separator line in Filmstrip

Bug: 7273673

Change-Id: If6382f6e84042befdcdd105a5a08520a17c76bb1
om/android/camera/CameraActivity.java
21ddcafbd14d1edc98e149c122230051a035e76e 05-Oct-2012 Michael Kolb <kolby@google.com> am fe44832a: Don\'t take picture while autofocus is not finished

* commit 'fe44832abc2e9fb937ac5bd9c65e103397992e8c':
Don't take picture while autofocus is not finished
fe44832abc2e9fb937ac5bd9c65e103397992e8c 05-Oct-2012 Michael Kolb <kolby@google.com> Don't take picture while autofocus is not finished

Bug: 7241774

Let the FocusManager handle focus state, but don't render
the focus ring during zoom.

Change-Id: Id64a363900ff707e9508d89c4c4ab1e530688250
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
9e33819d89023b838b789ee8b9dd2850f77b572f 05-Oct-2012 Doris Liu <tianliu@google.com> am 73f96311: Merge "Disable white balance when scene mode is non-auto" into gb-ub-photos-arches

* commit '73f963111e9723d962cba0ba73e84d7a4bfa1fa0':
Disable white balance when scene mode is non-auto
73f963111e9723d962cba0ba73e84d7a4bfa1fa0 05-Oct-2012 Doris Liu <tianliu@google.com> Merge "Disable white balance when scene mode is non-auto" into gb-ub-photos-arches
1a5fe9618b89f69ab69d23fa0abfd57db9979984 05-Oct-2012 Michael Kolb <kolby@google.com> am 2f662da5: Merge "Fix menu layout after orientation change Remove dots around focus ring" into gb-ub-photos-arches

* commit '2f662da5f1ade2bcb83ebe1be23f770d9a1f5e75':
Fix menu layout after orientation change Remove dots around focus ring
ccd32dfd9fe67daff7a428c4fc8fb5e67cfef906 05-Oct-2012 Doris Liu <tianliu@google.com> Disable white balance when scene mode is non-auto

Bug: 7286464
Change-Id: Ifa8b56c060a5c1894091f0f2074263b5cec7e1d9
om/android/camera/PhotoController.java
om/android/camera/VideoController.java
om/android/camera/VideoModule.java
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/InLineSettingMenu.java
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/MoreSettingPopup.java
om/android/camera/ui/TimeIntervalPopup.java
16f9b35fce4a46d3e6f72962670f2e28d291793c 05-Oct-2012 Michael Kolb <kolby@google.com> Fix menu layout after orientation change
Remove dots around focus ring

Bug: 7207228
Bug: 7284012

Change-Id: I02bbaa2bc618612acf0087d5a87ac5b7ef85d42e
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
487c884795f5733e033660cff07381884aebccdc 05-Oct-2012 Michael Kolb <kolby@google.com> am 80e86649: Merge "Fix Gallery swipe UI" into gb-ub-photos-arches

* commit '80e866490c124b25b53fb540af21521697a6763e':
Fix Gallery swipe UI
80e866490c124b25b53fb540af21521697a6763e 05-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix Gallery swipe UI" into gb-ub-photos-arches
84a0709b01c0ff96818698ad63e209a864c2fb5b 05-Oct-2012 Michael Kolb <kolby@google.com> am 9667bf4a: Raise Monkey shield

* commit '9667bf4a16d01c58a5b91eebede8df13e95f592d':
Raise Monkey shield
89fd143a6213f69ee34b225686ebb3c63531833f 05-Oct-2012 Michael Kolb <kolby@google.com> Fix Gallery swipe UI

Bug: 7282516

Don't show the camera UI if popup dismissal
is trigegred by full screen change

Change-Id: Ifd4be8cd29291c88fb09e0efaebe4c3ad0235655
om/android/camera/PhotoModule.java
9667bf4a16d01c58a5b91eebede8df13e95f592d 05-Oct-2012 Michael Kolb <kolby@google.com> Raise Monkey shield

Bug: 7284221
Bug: 7284043
Bug: 7281110

Change-Id: I3566abd24e6bafa35036889291c40fe86e6fe542
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/VideoController.java
78e0258fa404435f842f9c3eb1761a252aece218 04-Oct-2012 George Mount <mount@google.com> am 713a8d32: Merge "Blank out image capture after animation has started." into gb-ub-photos-arches

* commit '713a8d32b805e98061f4dedf40e709c571e019ae':
Blank out image capture after animation has started.
713a8d32b805e98061f4dedf40e709c571e019ae 04-Oct-2012 George Mount <mount@google.com> Merge "Blank out image capture after animation has started." into gb-ub-photos-arches
999ed95fc38b6493a826e7b721cf6c04abb0465a 04-Oct-2012 Doris Liu <tianliu@google.com> am ce2d4ff8: Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches

* commit 'ce2d4ff860ec4552d6032cf3f7386a00f1cd1a19':
Change order of cameras in camera switcher
ce2d4ff860ec4552d6032cf3f7386a00f1cd1a19 04-Oct-2012 Doris Liu <tianliu@google.com> Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches
b1be74d6833cd55429cc5c34885eddf613d08302 04-Oct-2012 Doris Liu <tianliu@google.com> Change order of cameras in camera switcher

Bug: 7284010
Change-Id: I1276aa2e1db349f3e91da34da9ebdca253b6b3b4
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
a434b750338f85960d824a0c3f8d8210b8928323 04-Oct-2012 Jason Noguchi <jnoguchi@google.com> am 0e98d5db: Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches

* commit '0e98d5db1b4f472ceaaa9460565514b5899e988f':
Adding accessor methods for latency vars and fixing camera latency tests.
0e98d5db1b4f472ceaaa9460565514b5899e988f 04-Oct-2012 Jason Noguchi <jnoguchi@google.com> Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches
9f0a3bb503886397f222aa24ce8b7ff0f98d8147 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 15e6bb55: Merge "Log for debugging runtime exception taking picture" into gb-ub-photos-arches

* commit '15e6bb550ccd40f5b31c93b414cc24543f6a64bb':
Log for debugging runtime exception taking picture
15e6bb550ccd40f5b31c93b414cc24543f6a64bb 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Log for debugging runtime exception taking picture" into gb-ub-photos-arches
dd5a6f95999ec217453fc2d1caa2856e33d122af 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> Log for debugging runtime exception taking picture

Bug: 7241774
Change-Id: Ia7cb61e12f18f3054a8f85206cda51b4aa70b9f2
om/android/camera/CameraManager.java
om/android/camera/PhotoModule.java
d282a28c60ca8f4ee82d519b12e8b0b057b294d4 03-Oct-2012 George Mount <mount@google.com> Blank out image capture after animation has started.

Bug 7280817

Change-Id: I192da2836b80e396317e9e9676bea660df2cf558
om/android/camera/ActivityBase.java
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/CameraScreenNail.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
6f236b17ab7f0dbf2f8fe8251186410a8e76311c 04-Oct-2012 Chih-Chung Chang <chihchung@google.com> Don't switch module if the activity is paused.

Bug: 6829498
Change-Id: I4f4ff355124c08d184595ef38482ae7182145383
om/android/camera/CameraActivity.java
8e56d15a3e8d08abe11c0c017ee9db865159d154 04-Oct-2012 Wu-cheng Li <wuchengli@google.com> am c0f19dfc: Merge "Fix corrupt panorama UI after orientation change." into gb-ub-photos-arches

* commit 'c0f19dfcaaf99decff762bcf4a261ea489226bca':
Fix corrupt panorama UI after orientation change.
c0f19dfcaaf99decff762bcf4a261ea489226bca 04-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix corrupt panorama UI after orientation change." into gb-ub-photos-arches
6c80b4dcf588513ce163f7db51a5bc38c66e4485 04-Oct-2012 Doris Liu <tianliu@google.com> am f0469206: Adding second-level popup for camera settings

* commit 'f04692066fc7087560248b003c49e0377c056edf':
Adding second-level popup for camera settings
f04692066fc7087560248b003c49e0377c056edf 03-Oct-2012 Doris Liu <tianliu@google.com> Adding second-level popup for camera settings

Bug: 7232358
Change-Id: I01a5295481c6589bf513a3f96a39e2f8872a7955
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/VideoController.java
om/android/camera/VideoModule.java
om/android/camera/ui/InLineSettingMenu.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/ListPrefSettingPopup.java
om/android/camera/ui/MoreSettingPopup.java
om/android/camera/ui/TimeIntervalPopup.java
806e575a804e02ca0861c4b28a50887e54830592 03-Oct-2012 Jason Noguchi <jnoguchi@google.com> Adding accessor methods for latency vars and fixing camera latency tests.

Change-Id: I302c3010537584a8b1ce9ed31d2bdfbc6d77400b
om/android/camera/CameraActivity.java
3e2973e04691bee337de26d16490c11ba7861ef8 03-Oct-2012 Michael Kolb <kolby@google.com> am 019cd2a9: Hide event blocker when hiding switcher

* commit '019cd2a91262707cf4f435f255d433666bc71706':
Hide event blocker when hiding switcher
019cd2a91262707cf4f435f255d433666bc71706 03-Oct-2012 Michael Kolb <kolby@google.com> Hide event blocker when hiding switcher

Bug: 7280812

Change-Id: I3c6f668512fc6cddc4f9c54a4ef44ff2e59734d9
om/android/camera/CameraActivity.java
5ea2d739a98e6c85e42a2fd30989272009e048bc 03-Oct-2012 Michael Kolb <kolby@google.com> am 63e79531: Remove menu fade at beginning

* commit '63e79531bd35bd5bc1fc11cbc1f93acb6b9c7b0b':
Remove menu fade at beginning
63e79531bd35bd5bc1fc11cbc1f93acb6b9c7b0b 03-Oct-2012 Michael Kolb <kolby@google.com> Remove menu fade at beginning

Bug: 7280472

Change-Id: Id3fb9c8ba17ce16a69bef769cd14b3ac248cf598
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
9ee9a24ac0b1f9a4fcfc6b32ecfed7dde3206cee 03-Oct-2012 George Mount <mount@google.com> am 22135091: Merge "Change LightCycle assets." into gb-ub-photos-arches

* commit '221350917dbc60a59a0c14b413d89dbd7e3ade37':
Change LightCycle assets.
221350917dbc60a59a0c14b413d89dbd7e3ade37 03-Oct-2012 George Mount <mount@google.com> Merge "Change LightCycle assets." into gb-ub-photos-arches
a656da7ce6a2a1537cb45936bcd03bf56a9be628 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 71d90387: Merge "Add logs for debugging runtime exception taking picture" into gb-ub-photos-arches

* commit '71d903876ee4c6c4c775ed9e42905685a53591db':
Add logs for debugging runtime exception taking picture
71d903876ee4c6c4c775ed9e42905685a53591db 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Add logs for debugging runtime exception taking picture" into gb-ub-photos-arches
15e6cbf5f2f1e01e40bc0eb57ac0e370094b14e0 03-Oct-2012 Michael Kolb <kolby@google.com> am d560a87e: Hide menu when button is pressed second time

* commit 'd560a87ef69c81e0b313898f0d673c57d89ff740':
Hide menu when button is pressed second time
d560a87ef69c81e0b313898f0d673c57d89ff740 03-Oct-2012 Michael Kolb <kolby@google.com> Hide menu when button is pressed second time

Bug: 7274074

Change-Id: I225148ee18c4e41d1b87d323e51b69f3ab279a1a
om/android/camera/ui/PieRenderer.java
5c7a93d0c29cfd9480817ec8a1c83795199b13ed 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> Add logs for debugging runtime exception taking picture

Bug: 7241774
Change-Id: I7c60fd91b4779bb3f3cf4e3de20d916cd22bdba6
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
115c1fb4631551fb7bd24629f4700ae12baf0588 03-Oct-2012 Michael Kolb <kolby@google.com> am 92cdbe67: Merge "A regression in VideoModule" into gb-ub-photos-arches

* commit '92cdbe675cd7c9c53cdf00f32bc3db4e8b2af25e':
A regression in VideoModule
92cdbe675cd7c9c53cdf00f32bc3db4e8b2af25e 03-Oct-2012 Michael Kolb <kolby@google.com> Merge "A regression in VideoModule" into gb-ub-photos-arches
9d51864d4dfbe71c46531f472364b3483890464b 03-Oct-2012 George Mount <mount@google.com> Change LightCycle assets.

Bug 7279463

Change-Id: I202a0ed79db548199c8f26086dcbff3e134e06a6
om/android/camera/CameraActivity.java
f04622662acfd284c6d7026caf8ec457856c9e80 03-Oct-2012 Michael Kolb <kolby@google.com> A regression in VideoModule

Bug: 7274074

Show menu on button press in video module

Change-Id: I876fe4952ebe0d34f301a48ae88a85bf3c143201
om/android/camera/VideoModule.java
ebe841c5fc6fbeb2c54c053fce7b0a5173818f32 03-Oct-2012 Michael Kolb <kolby@google.com> am b1b7574b: Don\'t draw menu items on tap to focus

* commit 'b1b7574bf6dd7b0a7bd3b5fb0a0f2f9631450710':
Don't draw menu items on tap to focus
b1b7574bf6dd7b0a7bd3b5fb0a0f2f9631450710 03-Oct-2012 Michael Kolb <kolby@google.com> Don't draw menu items on tap to focus

Bug: 7274074

Change-Id: I09984b00a20fc7b724bb238fe53111b52243c5f4
om/android/camera/ui/PieRenderer.java
c0904a7d8df88b649289a0fe11ba1ee261ba1304 03-Oct-2012 Michael Kolb <kolby@google.com> am 876aade7: Merge "Completely redo UI" into gb-ub-photos-arches

* commit '876aade725d376815eb227a4fa0a0295fe33a5e8':
Completely redo UI
876aade725d376815eb227a4fa0a0295fe33a5e8 03-Oct-2012 Michael Kolb <kolby@google.com> Merge "Completely redo UI" into gb-ub-photos-arches
1305baf9421fc78fa4c6077f100f2023dc966ffd 03-Oct-2012 Michael Kolb <kolby@google.com> am d2025741: Don\'t allow swipe to menu during video recording

* commit 'd202574157ef3f9e655bbadc6fe87a5638ecb690':
Don't allow swipe to menu during video recording
d202574157ef3f9e655bbadc6fe87a5638ecb690 03-Oct-2012 Michael Kolb <kolby@google.com> Don't allow swipe to menu during video recording

Bug: 7276804

Change-Id: I45cc94b27037dc0d510403e4e32c2e407c6bef32
om/android/camera/PreviewGestures.java
a5e23d9eb2bc96e7da4c021df2e11c1c43d379cd 03-Oct-2012 Michael Kolb <kolby@google.com> Completely redo UI

Bug: 7274074

Change-Id: Ia406151f9c72030780ef5a290d20c0f2b4b5b11b
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/ScrollerView.java
3125574902f989e58e57425700e66a0e9bca0744 03-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix corrupt panorama UI after orientation change.

bug:7266946
Change-Id: I2e3fd00fce800a7aea61043d7db9df4a65dcc07b
om/android/camera/PanoramaModule.java
f33fc45cc2aa5c7888e7a8aa8a9e49bc960237d7 03-Oct-2012 Chih-Chung Chang <chihchung@google.com> Add log to debug the double-open bug 6829498.

Change-Id: Ie70172477e0be6c980cdeb9d8f7c8974fb18e187
om/android/camera/CameraHolder.java
f99fd501c9cbff7617129af36707d1e22952aa31 03-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix thread anti-pattern.

Do not start a thread and join immediately.

bug:7275076
Change-Id: I158016787e728c2a27cee18304ad42161bc60105
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
3155f08eb3997a86e21043ac701eda9e3b6a6f60 03-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix NPE in focus indicator update" into gb-ub-photos-arches
0185ee6471d7584bf74c0f15e1ccf1376a01c7c5 03-Oct-2012 Michael Kolb <kolby@google.com> Merge "Enable tapping on menu" into gb-ub-photos-arches
d95f2b5ba4b47af1d8f4485b08ef79506780ad9b 03-Oct-2012 Wu-cheng Li <wuchengli@google.com> Camera button intent should launch new UI.

bug:7274248
Change-Id: Ideea4270d54e0b7c4d544b866a5a142663fafe37
om/android/camera/CameraButtonIntentReceiver.java
75d08dd0ebeee3ec43fdd48ce9e18dcef07d3b6b 03-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add setPreviewCallback in CameraProxy." into gb-ub-photos-arches
f46fea16ab8391c701859ed5d5fea757f6843d5a 03-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix ANR in VideoModule.getThumbnail." into gb-ub-photos-arches
a2c4440795c9b41e1fa5343d9b99157c7730e8f0 02-Oct-2012 Doris Liu <tianliu@google.com> Fix issues for reset-to-default dialog box

Bug: 7267740
Bug: 7267540

Refine the back behavior for popups and dialog boxes.

Change-Id: I86f01cc9156f023d3f84de94e5d02e830cbf144e
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
om/android/camera/RotateDialogController.java
om/android/camera/VideoModule.java
a19abf2acafd437607dacae269658f34217cc9c4 03-Oct-2012 Michael Kolb <kolby@google.com> Fix NPE in focus indicator update

Bug: 7273945

Only the Monkeys know how the preference group can be null
with a valid focus indicator.

Change-Id: I3ce9459cc037cf90456983dcbea14a66b7f3bbc2
om/android/camera/PhotoModule.java
55f0d13040df45c75704df9d633b444cb36f2465 02-Oct-2012 Michael Kolb <kolby@google.com> Enable tapping on menu

Bug: 7267773

Change-Id: Id104ffc57c317def203fc99ad344e8332a2cbe97
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
om/android/camera/ui/PieRenderer.java
3ae48a6193e2bd70b8bab793ff4699ff6a502e7a 03-Oct-2012 John Reck <jreck@google.com> Merge "Only move one module on fling" into gb-ub-photos-arches
1da18852b3cddf3e2f288636a9ef9d8d002f496b 02-Oct-2012 John Reck <jreck@google.com> Only move one module on fling

Bug: 7265427

Change-Id: If5d6d8c1ada58df44d3f0a0d25e5febe721f69fd
om/android/camera/ui/CameraSwitcher.java
0c6cca8886e813fb533bcdbc6d738bc9f50d717b 02-Oct-2012 George Mount <mount@google.com> Ensure ScreenNail orientation matches LightCycle draw orientation.

Bug 7271538

Change-Id: I016653dd58c6c2f545a93877f48c2db318c378cd
om/android/camera/CameraScreenNail.java
ea7e3512c0177bc53d5ab506416fe9d3d1f5df84 02-Oct-2012 George Mount <mount@google.com> Merge "Fix Monkey NPE" into gb-ub-photos-arches
1b2443e3c9117729b02bf4319f50f86b3c89875e 02-Oct-2012 George Mount <mount@google.com> Merge "Enable swipe to Gallery in LightCycleView." into gb-ub-photos-arches
ba7bb98f7550adee1aa99419bda412948a413fb9 02-Oct-2012 Michael Kolb <kolby@google.com> Work around scale end/begin on move events

Bug: 7270484

Squeezing fingers together closely ends the scale gesture and
restarts it when fingers spread. Camera needs to keep the UI
visible during this transition

Change-Id: Ieb8922160ae5a907765a8f1d0952c1e3a2c16e07
om/android/camera/PreviewGestures.java
2ff430a16266c59549ebac205bead2e72638c53c 02-Oct-2012 George Mount <mount@google.com> Fix Monkey NPE

Bug 7269886

Change-Id: I3ff09868cba897d987327880d65684033a878d4c
om/android/camera/PhotoModule.java
1acc316227cf39a5c5eead6b307b8b3a76f5e284 02-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix ANR in VideoModule.getThumbnail.

New UI does not have small thumbnail. Remove all the code related
to small thumbnail.

bug:7270478
Change-Id: I1932497523d892a4edeea7e8746c416d66e87df5
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
ba6a355912c8f206140d85e393f7d1ab29f6b0fc 02-Oct-2012 Michael Kolb <kolby@google.com> Make Monkeys happy.

Bug: 7255114

Change-Id: I2974bf1329b5cddfd3ea37b0ee9d74be03b7247f
om/android/camera/PhotoModule.java
7433f98826972ea2379a693814362d3cf0cf2847 02-Oct-2012 Wu-cheng Li <wuchengli@google.com> Keep the camera when switching modules.

bug:7208909
Change-Id: I14c0df722ecab18c2e81908553212417bb6fd2a9
om/android/camera/CameraActivity.java
7e790a54e9940ac8a7e3e625bf9e30bb4cc726b2 02-Oct-2012 Wu-cheng Li <wuchengli@google.com> Add setPreviewCallback in CameraProxy.

bug:7207563

Change-Id: I9ae19cc9b8d990e68e5a6b16e46879d7e3d2cba1
om/android/camera/CameraManager.java
ad30bda0d0103bd8a93eb834c234341b1ab1e77f 28-Sep-2012 Wu-cheng Li <wuchengli@google.com> Put HDR as a separate setting in the overflow settings dialog.

bug:7222328
Change-Id: I7851f627caca01e2c31cb7b8bfb2bb08e51586a5
om/android/camera/CameraSettings.java
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/PieController.java
om/android/camera/Util.java
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/OtherSettingsPopup.java
999eb5f1da387786883150953930f88274ca9ffe 02-Oct-2012 Michael Kolb <kolby@google.com> Prevent menu and zoom showing at the same time

Bug: 7268366

Change-Id: I65e8ea7f40b512837b0f7a5e9a8661448bf904ee
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
673da081181c72352d57c9bf97badb2929370685 27-Sep-2012 Michael Kolb <kolby@google.com> Focus ring UX changes

Bug: 7239341
Bug: 7266263
Bug: 7265327

Keep menu items until focus is locked or failed
Change focus dial orientation and animation
Change focus fail dial color
Allow menu selection when finger past menu item

Change-Id: I97ddbfb2522c5fa10f7e2df6bf4246eec02978be
om/android/camera/ui/PieRenderer.java
9147e9e5e764e0b179a317283550ab02721fff1a 02-Oct-2012 Michael Kolb <kolby@google.com> Merge "Switch to zoom mode when zoom gesture starts" into gb-ub-photos-arches
e506ca46fc7f22e2196487ecceea94534c971171 02-Oct-2012 Michael Kolb <kolby@google.com> Switch to zoom mode when zoom gesture starts

Bug: 7265719

Change-Id: Ib3c2e8cc13a0f3cb1b830a6fac5868fddca1549c
om/android/camera/PreviewGestures.java
b1f798564f595dbff387382e794e9587a55a793d 02-Oct-2012 Michael Kolb <kolby@google.com> Don't play sound on focus

Bug: 7265722

Change-Id: Idaf41839e48737c32b4c8ae3a97f5d3f3afe4dc6
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
e14d9149a501183d3b785f4f4aa484c4b85192d1 02-Oct-2012 George Mount <mount@google.com> Enable swipe to Gallery in LightCycleView.

Bug 7212420

Change-Id: Iaee8c4ddbd429f4c731e64082d73908dfd03e4a7
om/android/camera/ActivityBase.java
f1f3d8f514fc8e30632ca0935bf030d2b7b7262b 02-Oct-2012 John Reck <jreck@google.com> Add first run setup for location preference

Bug: 6306754

Change-Id: I118a2d255bcbdfd954e2e4a332175f4c610e0572
om/android/camera/PhotoModule.java
om/android/camera/RecordLocationPreference.java
9a6a288c152a924cc9f514e41f6fb19326095e07 02-Oct-2012 John Reck <jreck@google.com> Merge "Verify we are receiving a callback for the current ST" into gb-ub-photos-arches
a75966002946f0f83df427c55694e688a611ed54 02-Oct-2012 John Reck <jreck@google.com> Verify we are receiving a callback for the current ST

Bug: 7217305
Calling updateTexImage before the first onFrameAvailable call
will result in white being drawn. mFirstFrameArrived is supposed to
guard against this, however it didn't make sure that it is the current
SurfaceTexture that has a new frame. This can happen during the mode switching
as we might receive an onFrameAvailable for the old, recycled surface texture

Change-Id: I3f471ffff22b0c14a5cc06713329fa05e5bf3f6e
om/android/camera/CameraScreenNail.java
9dea0f8cacc6e58b3a078e45435af61fe48e33b9 01-Oct-2012 Michael Kolb <kolby@google.com> Use capture animation for video snapshot

Bug: 7248448

Change-Id: I09cde30bd3b397650425bf5aa307e90fbae466d1
om/android/camera/VideoModule.java
f7a3cc7bdee1712815f953e038a522ecd93458a9 01-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix focus ring size" into gb-ub-photos-arches
eede360bc53b9eb7192b7117447622d6d7a5d220 01-Oct-2012 Michael Kolb <kolby@google.com> Fix focus ring size

Bug: 7224845

Adjust focus ring to menu size

Change-Id: I267451949cb2833e4075a6058e0e78b6fc9bbd18
om/android/camera/ui/PieRenderer.java
f39357a1c18ed8dc767cbc4033ea99a73cfd3da1 01-Oct-2012 Michael Kolb <kolby@google.com> Enable swipe gestures for radial menu

Bug: 7245886

Change-Id: I9c146de47496adea6135e1358c2fe5c0b2130172
om/android/camera/PreviewGestures.java
bc918cd870e8bbbb7def7433d17518d663806d6d 01-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Remove camera settings title" into gb-ub-photos-arches
156ffb091ba019d79afef1e0c961d2da0f210088 01-Oct-2012 Michael Kolb <kolby@google.com> Merge "Show menu for longer" into gb-ub-photos-arches
b986d1e51d776706cb3603a9c386772da6d7cf48 30-Sep-2012 Michael Kolb <kolby@google.com> Show menu for longer

Bug: 7225794

Make sure it doesn't get cleared halfway through the fade animation
Increase fade duration to 1.5s
Change-Id: Ib357aa960a8dc5999d8253f28e6a30ba29aac2b4
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
c367b15e24f2f992f3eb2be746038021ce89365d 30-Sep-2012 Michael Kolb <kolby@google.com> Merge "Fix zoom renderer ui" into gb-ub-photos-arches
ba2d830138e01473a4883b2f3a12f8cd443e3fb7 30-Sep-2012 Doris Liu <tianliu@google.com> Merge "Fix settings popup orientation issue" into gb-ub-photos-arches
0f1cc66c395becb393ccd99d92475329bc6bdef5 30-Sep-2012 Michael Kolb <kolby@google.com> Fix zoom renderer ui

Bug: 7250952

Show zoom ring as soon as zoom gesture is getected
Draw min/max rings according to UX
Note: still missing zoom factor indicator in the center,
which will be a separate bug

Change-Id: If4e4707080219316633d422abd9cb1ada85c7f72
om/android/camera/PreviewGestures.java
om/android/camera/ui/ZoomRenderer.java
3ffcb0cb161c4f1e345d2ed99b3f1d9cffa1fc16 30-Sep-2012 Michael Kolb <kolby@google.com> Merge "Completely disable focus callbacks when leaving preview" into gb-ub-photos-arches
3ce75c9a73de62e311beb79bdc8b5a2e7a096a81 30-Sep-2012 Doris Liu <tianliu@google.com> Fix settings popup orientation issue

Bug: 7238919

Also rotate settings popup in VideoModule when phone is rotated.

Change-Id: I9a4a8e04b68d2ed0d03c279dbef4ae2c6c76fb9b
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
82ee836f814740198b193e7aa105fdbb7dc8711e 30-Sep-2012 Michael Kolb <kolby@google.com> Completely disable focus callbacks when leaving preview

Bug: 7255882

Change-Id: I912ed9c411d390997ef3374f16b5dac7f173b551
om/android/camera/PhotoModule.java
09c86199fe8d0f050d0d1b1373a7773bcdeabd0a 30-Sep-2012 Michael Kolb <kolby@google.com> Merge "Set switcher position directly to start module" into gb-ub-photos-arches
1a52c53f05fc40537736a4e4e96d090bb7be55dd 30-Sep-2012 Mangesh Ghiware <mghiware@google.com> Merge "Fix NPE in PreviewGestures" into gb-ub-photos-arches
9aca4d711c0c738e8630ca88db0d394d28862480 30-Sep-2012 Michael Kolb <kolby@google.com> Set switcher position directly to start module

Bug: 7250392

Change-Id: I3dde8070840d4fd0dd557031e11b287791cde20d
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
om/android/camera/ui/ScrollerView.java
b30f0c4cb5aa6eec6dccc879bfc9d6a4c3fd0ecc 30-Sep-2012 Mangesh Ghiware <mghiware@google.com> Fix NPE in PreviewGestures

Bug: 7235908
Change-Id: Ie5c701d02cbfc26682b06f67b842ff830b06ecb3
om/android/camera/PreviewGestures.java
e5b482c0f585575d5e0893d1a062161ec6a83758 30-Sep-2012 Michael Kolb <kolby@google.com> Merge "Make sure settings dialog gets initialized" into gb-ub-photos-arches
db31f0e5561bdf3ac2c3c8a2319d3d5e54a3a63a 30-Sep-2012 Doris Liu <tianliu@google.com> Merge "Show camera switcher after pano stitching is finished" into gb-ub-photos-arches
64f517b966a681afbf580f84ddff67435d9ca975 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> Remove camera settings title

Bug: 7146126

Also, left align "Restore defaults"

Change-Id: Id5f0829f07132cb9dcd79317405a835feccd85ba
om/android/camera/PieController.java
aaf27677831ac31d7a55e6faf173a64d6e0c3021 30-Sep-2012 Michael Kolb <kolby@google.com> Make sure settings dialog gets initialized

Bug: 7255893

Change-Id: I7cf98597e26cca74d9e75ca54d5944e870896d21
om/android/camera/PhotoController.java
b69cbda2db42937b2920a497f34e67c8332eb1bd 29-Sep-2012 Doris Liu <tianliu@google.com> Fix initializing FocusOverlayManager in onConfigurationChanged

Bug: 7249241

This CL fixes the bug where shutter button stops working after onConfigurationChanged
is called. The cause for this issue is that FocusOverlayManager was not fully initialized
in onConfigurationChanged.

Change-Id: I4751c3ae1e3492e142760289ab3dff0e6d1c812c
om/android/camera/PhotoModule.java
725aec5162fc18330b3a915b6e7a0488bbae2fec 30-Sep-2012 Doris Liu <tianliu@google.com> Show camera switcher after pano stitching is finished

Bug: 7256505

Also hide the shutter button during stitching.

Change-Id: Ic5aa4fb4905fdbb0a89559ccca217e6c3caa71bb
om/android/camera/PanoramaModule.java
471c997edfddccfa0762fa720c82cc95777584e8 29-Sep-2012 John Reck <jreck@google.com> Fix creating the RenderOverlay in onConfigurationChanged

Bug: 7256402

Change-Id: I42bd5307b051c010a84e1e748f392e4cd29b2023
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
78711c990e57ce7c6228c5446cfb6902f2a47cb6 29-Sep-2012 Doris Liu <tianliu@google.com> Rotate camera modes icons when phone is rotated

Bug: 7174120

Extract the orientation event listeners from photo module and video module
to cameraActivity. When orientation changes, cameraActivity gets onOrientationChanged()
callback, handles the necessary layout changes, and then current active module gets
onOrientationChanged() callback.

Change-Id: I6d32f025e033460f23c8dd2a7e439a2467fbf036
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
aded2c9d965b0b25737a61710edc8dbc110eed6a 28-Sep-2012 Michael Kolb <kolby@google.com> Merge "Change pie highlight color" into gb-ub-photos-arches
e7ff2e945d1a13e4766d55a4679afa83ea9088c3 28-Sep-2012 Michael Kolb <kolby@google.com> Change pie highlight color

Bug: 7252736

Change-Id: I6907808e9bdbe665668532dcb81522856f4d682f
om/android/camera/ui/PieRenderer.java
a82ad5a26428ae584bed4fdb1d4fa4b99fd783f5 28-Sep-2012 Michael Kolb <kolby@google.com> Add renderers again after config change

Bug: 7250440

Change-Id: I7965dcf22637d440486530e47cd201a81f8d2232
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
1cf29b911c1d8035c6862994df3cc8d4e40f31ba 28-Sep-2012 Michael Kolb <kolby@google.com> Fix swipe to Gallery in different orientations

Bug: 7245761

Change-Id: Ifd315a87a09ff239052899e441a929863c1c6207
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
ac575473a88d12273f03e0abf2e624ca7cbaddbe 28-Sep-2012 Michael Kolb <kolby@google.com> Adjust capture animation to fullscreen

Bug: 7248430

Change-Id: I8e7cbd23f4e29ed9a8cf2691f7160f06c7e85c8e
om/android/camera/CameraScreenNail.java
d867ac51170831bf4e6021453fdc4468e10087c7 27-Sep-2012 Michael Kolb <kolby@google.com> Asset drop and layout adjustments

Bug: 7228487
Bug: 7231814
Bug: 7230994

Added/replaced assets
Increased pie menu size and slice background under options
Aligned layouts according to UX spec

Change-Id: I08ef00f0b917f2222603937dd8a15a3194565d2b
om/android/camera/CameraActivity.java
om/android/camera/ui/PieRenderer.java
9713c56dfe1c298ab0c2c75d324dc69395d1c809 18-Sep-2012 Michael Kolb <kolby@google.com> Enable full screen preview

Bug: 7191461

Overscale preview texture to fill screen
Minor problem with face detection indicators
will be fixed later.
Change-Id: I5a93048564d69fe05f5a7aa7d6506dec8517e8ea
om/android/camera/CameraActivity.java
om/android/camera/CameraScreenNail.java
om/android/camera/PhotoModule.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/Util.java
om/android/camera/VideoModule.java
b8c5a15af9e8f1adb1849072a6f5a1830887b43e 27-Sep-2012 Michael Kolb <kolby@google.com> Fix focus ring on first tap

Bug: 7245857

Change-Id: I04e429e10bf5226204dcfb5800199fa56ce9597d
om/android/camera/FocusOverlayManager.java
om/android/camera/ui/PieRenderer.java
240babb4e82c18b1361f3796de9c37e87e5396f9 27-Sep-2012 Bart Sears <bsears@google.com> Merge "Re-enable touch after video recording" into gb-ub-photos-arches
42e5d98096a1bc32660d08f4e984023df8cd147b 27-Sep-2012 Michael Kolb <kolby@google.com> Re-enable touch after video recording

Bug: 7243052

Change-Id: I004519ae1abe409cac315de3c4cc52a01069094c
om/android/camera/PreviewGestures.java
dc34241571886cd9bb16a3befced810d04531780 27-Sep-2012 Doris Liu <tianliu@google.com> Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
bcaf81f9e730309f8a07d02d130b431eb036a1b3 25-Sep-2012 Doris Liu <tianliu@google.com> Keep Camera buttons at the same absolute position

Changes:
1) Reload camera switcher, shutter button when onConfigurationChanged is called
2) In PanoramaModule, only show switcher in preview

Bug: 7216070
Change-Id: I7c19875e910fe5a54de42edebffec2567eca1f39
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
6f51b6d8ac0bf871c1268f742cf004f9c2477d03 27-Sep-2012 Michael Kolb <kolby@google.com> Adjust capture animation

Bug: 6636901

Change-Id: I84ffb72f7c2c35228015043ec108d70585a1998f
om/android/camera/CaptureAnimManager.java
c6c417b64aa061a98b3b8aa31d5cf1f92f452b93 27-Sep-2012 Doris Liu <tianliu@google.com> Merge "Revert "Keep Camera buttons at the same absolute position"" into gb-ub-photos-arches
ccfae4fd53e838653f3a967de7776380c102b893 27-Sep-2012 Doris Liu <tianliu@google.com> Revert "Keep Camera buttons at the same absolute position"

This reverts commit 5b8dcddcc2019037e8691c605bfcecbbae316aeb

Change-Id: I0eac812293f9322e33d60df97ead29e88619156e
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
55c6500b5088312d304cfb5f4b015de611142d1d 27-Sep-2012 Doris Liu <tianliu@google.com> Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
9d8583fc0e14477466ed0e9f69f40ea2863c393f 27-Sep-2012 Michael Kolb <kolby@google.com> Update other settings popup when prefs change

Bug: 7223928

Change-Id: I2a5c81ec3ea160c801d7ab460b03d6ee34f51cba
om/android/camera/PhotoController.java
om/android/camera/VideoController.java
5b8dcddcc2019037e8691c605bfcecbbae316aeb 25-Sep-2012 Doris Liu <tianliu@google.com> Keep Camera buttons at the same absolute position

Changes:
1) Reload camera switcher, shutter button when onConfigurationChanged is called
2) In PanoramaModule, only show switcher in preview

Bug: 7216070
Change-Id: I678811aebd074f5d63edc3a2a4c9f6e7a8c9f883
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
3ea4672947aa314b47781cf5aa4b8d28ea9d2bc7 27-Sep-2012 Michael Kolb <kolby@google.com> Merge "Briefly show pie items when tap to focus, dots for cont AF" into gb-ub-photos-arches
8dd9204b22c6832003654d3e1b7c55fd58d49bfb 27-Sep-2012 John Reck <jreck@google.com> Merge "Play animation before switching modes" into gb-ub-photos-arches
a0dd52298b55357a711663180677efa39d35e5ab 26-Sep-2012 Michael Kolb <kolby@google.com> Briefly show pie items when tap to focus, dots for cont AF

Bug: 7239341

also fixes part1 of

Bug: 7225794

Change-Id: I4764ac1cee1c8af7976930d3bf1988c65c5f09ab
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
6c14557369a1f0ebdc7565439484b5c1b13eecf4 27-Sep-2012 John Reck <jreck@google.com> Play animation before switching modes

Bug: 7239564
Mode switching is way too expensive on the UI thread to handle both
animating and switching, re-order it to animate then switch (similar to snap)

Change-Id: Ida1fad8725bf531e401621c12538c91223977078
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
8433d827e91a5e62ecdea8b4c31d10f9599cd431 26-Sep-2012 Michael Kolb <kolby@google.com> Change capture animation to a simple hold & slide.

Bug: 6636901

Implement capture animation according to UX spec.
Briefly flash review, hold review for 200ms, then slide
out decelerating for 600 ms
Change-Id: Ic7e938e3a761dae9f8b990f04978722422c5e65b
om/android/camera/CaptureAnimManager.java
1404be918ef3e5e5150c13c5a89a66b83a816846 26-Sep-2012 Michael Kolb <kolby@google.com> Fix Monkey NPE

Bug: 7236863

Change-Id: Ifcd2dbbb57027da69a6e38c2f9935aeafbacb647
om/android/camera/ui/PieRenderer.java
8042e7045f3e11dd49d40eebe603eb5fe12d711a 26-Sep-2012 Michael Kolb <kolby@google.com> Merge focus ring and radial menu

Bug: 7233185

Both items get rendered together, and their individual states depend
on each other, so it made sense to merge them.
Show dots while focusing
Adjust initial fade animation

Change-Id: Ic3acbb3c052928e270416063c79d9a5a1ba6d417
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/PieRenderer.java
2d7a31b03e91be90cd04a5d5953d1bc53acbd4c9 25-Sep-2012 Michael Kolb <kolby@google.com> Merge "Fix focus touch and enable buttons" into gb-ub-photos-arches
8afe041f3dda5d632deaffb90d8819d92a0c6846 25-Sep-2012 Doris Liu <tianliu@google.com> Merge "Making back button exit camera" into gb-ub-photos-arches
571a6f842d972e4ac5eccfd16ed639b6779ebf98 25-Sep-2012 Michael Kolb <kolby@google.com> Fix focus touch and enable buttons

Bug: 7227829
Bug: 7225629
Bug: 7225010
Bug: 7198111

Instead of dispatching directly to FocusOverlayManager call the
module's onSingleTapUp method to perform necessary checks.
Add review buttons as touch targets.

Change-Id: Ida57a1cb7fd165eb84308785f572f9955e41c007
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
13b282660b6ebd74ae1700fdfb74d295aa411e9f 25-Sep-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix background replacement crash in jelly-bean." into gb-ub-photos-arches
02b33f194e61b2216534d1b95b6cf7c2a5763df1 25-Sep-2012 Wu-cheng Li <wuchengli@google.com> Fix background replacement crash in jelly-bean.

"Background" filter does not have "context" input port in
jelly bean.

bug:7106963
Change-Id: I0ec20b14ed1046ce691c30e1eeebf0389949a565
om/android/camera/EffectsRecorder.java
696abdc5b34a876b72501a372d17fed37baaba4a 25-Sep-2012 Bart Sears <bsears@google.com> Merge "Briefly show and fade out menu at start" into gb-ub-photos-arches
c605826581f2ef1640828af82dbf26a70d4c7c78 25-Sep-2012 Michael Kolb <kolby@google.com> Briefly show and fade out menu at start

Bug: 7225794

Change-Id: I46adff871da57796721c6e4e8741514db1876427
om/android/camera/PhotoModule.java
om/android/camera/ui/PieRenderer.java
53b11253fde509b01851ba022d9178c7c6f13dde 25-Sep-2012 Wu-cheng Li <wuchengli@google.com> Show correct UI in secure image capture mode.

bug:7225688
Change-Id: I43e801e22192834d56521e0ca686a8932b57c059
om/android/camera/ActivityBase.java
om/android/camera/PhotoModule.java
ad639dff251233032734106afe4fe51a52be3721 25-Sep-2012 Michael Kolb <kolby@google.com> Remove unnecessary invalidate calls in renderers

Bug: 7224688

This doesn't fix the bug, but removes one of the possible sources.

Change-Id: I706dac6047b7120ae58c6276ee2d011f33ccab22
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/OverlayRenderer.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
om/android/camera/ui/ZoomRenderer.java
a521253223897b099995e0af08982b4236ce5861 25-Sep-2012 Michael Kolb <kolby@google.com> Fine tuning radial menu / touch

Bug: 7206203

Change-Id: I19f8069ef65f752486fc86616d80f4aa38f41222
om/android/camera/ui/PieRenderer.java
64f033efe1b4c00b1e532a352f28f91a28055514 24-Sep-2012 Michael Kolb <kolby@google.com> Handle swipe gesture in PreviewGestures

Bug: 7215450

Change-Id: If2d8a1631f8c72104deaaea4c1fb3af580e7a901
om/android/camera/PreviewGestures.java
7a6696dbdd858e07319b3981a405c575460fde3b 24-Sep-2012 Michael Kolb <kolby@google.com> Touch handling cleanup.

Bug: 7215450

Change-Id: I8421218c7ba2f47aea342233b6ca18bc7b2c2e36
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
4d628bcbaf4e6f2330dc9619f2129770863666dc 21-Sep-2012 Michael Kolb <kolby@google.com> Enable zoom in new UI

Bug: 7215450

Added Zoom renderer to PhotoModule and VideoModule
Introduced a gesture handler to handle interactions on the preview
and disambiguate gestures
Modified touch handling in CameraActivity and all the modules to work with
gesture handler

Change-Id: I427ddb61ad7b14588bcdbe67339aa295e05ac0e0
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/PreviewGestures.java
om/android/camera/VideoModule.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
om/android/camera/ui/ZoomRenderer.java
8e887b3911f3c182011c20d709832755d96a5959 22-Sep-2012 Doris Liu <tianliu@google.com> Making back button exit camera

Bug: 7208910

The bug is that whenever createCameraScreenNail was called, a new activity state
was added to the activity stack. But the activity states never got removed from
the stack until onDestroy is called (i.e. the end of cameraActivity). When back
button is pressed, the top state in the stack got removed and since there
were more than one activity states in the stack, the new top state was resumed,
which is why back button didn't make camera exit.

Instead of always adding a new activity state to the stack, this CL only adds
the state when the stack is empty. Otherwise, it switches the top state to the new state.
It requires changing switchState function in StateManager.java from being only
accessible within com.android.gallery3d.app to public.

This is part 2 of 2 in fixing the bug.

Change-Id: I1809e0250c9560235d5d4933c2878491f643b357
om/android/camera/ActivityBase.java
0e84832ac9dcb95c6964250071e116186363b8cf 21-Sep-2012 Michael Kolb <kolby@google.com> Merge "Use circles for face detection" into gb-ub-photos-arches
b51975aa2a6d002c8822de51c06fe5a887f89adc 21-Sep-2012 Doris Liu <tianliu@google.com> Merge "Fix for camera switcher stuck in the middle" into gb-ub-photos-arches
ad473ad832901d06606b44cf074afce3035cb419 21-Sep-2012 Doris Liu <tianliu@google.com> Fix for camera switcher stuck in the middle

Bug: 7200263
Change-Id: I79e2ad761bbfc1cba586b3cae8b45d39045a3be3
om/android/camera/ui/ScrollerView.java
918c02ec856ea0e24fb9e57abace7f42120b5987 21-Sep-2012 Michael Kolb <kolby@google.com> Use circles for face detection

Bug: 7211279

Change-Id: I727a77015615bcd9c203af42bc7e3652d2af7389
Note: this will also affect the old app.
om/android/camera/ui/FaceView.java
c3bba50fa419b472698be35059033dcd5642c444 21-Sep-2012 Doris Liu <tianliu@google.com> Merge "Fix back button behavior in image capture mode" into gb-ub-photos-arches
ce51afce8c74f2c68e386b2a8f35c4be6772b760 21-Sep-2012 Wu-cheng Li <wuchengli@google.com> Add the support for secure image capture intent.

bug:7141738

Change-Id: I9ed369ef674412ff0bb0665670fc07500d3a304b
om/android/camera/ActivityBase.java
om/android/camera/PhotoModule.java
c78f050d61fe40c395d070c6b9e8b388b561496c 21-Sep-2012 Doris Liu <tianliu@google.com> Fix back button behavior in image capture mode

In image capture mode, back button should:
1) if there is any popup, dismiss them, 2) otherwise, get out of image capture

Bug: 7202907
Change-Id: I1853ea7c42a6fe8f10346faddb49353f24b87227
om/android/camera/PhotoModule.java
fdb79c492940d46b27702b0be71903f99af7e34f 20-Sep-2012 Michael Kolb <kolby@google.com> Asset update for shutter; fix for capture

Bug: 7175404

Change-Id: Ibb0ba3946866b1bb4d36c1a15e481002c09ccfdb
om/android/camera/CameraActivity.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
4fbacb32936d38908a4b15d8716cfbee899fd9fe 20-Sep-2012 Doris Liu <tianliu@google.com> Merge "Add VideoController to VideoModule" into gb-ub-photos-arches
7717d2f0fc0e1393971cab44b3bba8a0f1297835 19-Sep-2012 Wu-cheng Li <wuchengli@google.com> Reduce latency when camera is started from secure lock screen.

When camera is started from secure lock screen for the first
time after screen on, the activity gets
onCreate->onResume->onPause->onResume. To reduce the latency,
keep the camera for a short time so it does not need to be
opened again.

The activity is started while the lock screen is shown, so it
must be started and paused because it is not visible. Then the
lock screen is removed and now it is visible so can be resumed
again. This is, as defined, how things are supposed to happen.

bug:7110256

Change-Id: I6a36aeffce32c5e17d267b6fe591fe8c65668b9c
om/android/camera/ActivityBase.java
om/android/camera/CameraHolder.java
om/android/camera/PhotoModule.java
33af07933620f622c5922ce56189ec7d25bd55d7 20-Sep-2012 Michael Kolb <kolby@google.com> Add VideoController to VideoModule

Bug: 7198600

Change-Id: I6bdab5ad173a0a9ca705ad031555304c98ada3b9
om/android/camera/VideoController.java
om/android/camera/VideoModule.java
9a9839308e02be69a805faf2d09e0410ebd79d78 20-Sep-2012 Alex Ray <aray@google.com> Merge "Revert: Do not let recent apps capture camera screen shots." into gb-ub-photos-arches
5162b3d1c814b5204bbb3458a3e3d879f8977875 20-Sep-2012 Pin Ting <pinting@google.com> Merge "Fix record button issue in ICS on HTC Sensation." into gb-ub-photos-arches
b1e872236a38312c03dfb4ebeeaea6f2b1e88129 19-Sep-2012 Pin Ting <pinting@google.com> Fix record button issue in ICS on HTC Sensation.

On HTC Sensation, SurfaceView.setVisibility(View.VISIBLE) doesn't
make it in time to trigger call to surfaceCreated(), thus the
surface view is not ready.
The new implementation keeps mPreviewSurfaceView always visible
and shrinks to one pixel when the recording is done.

Bug:7087333
Change-Id: I4cdceb50c89fe16adbd0e0dd0f71118a034ef88f
om/android/camera/VideoCamera.java
2d3af28f91481d7f3887cb0bb9c5d06375baf787 19-Sep-2012 Michael Kolb <kolby@google.com> Add other settings popup to menu

Bug: 7170039

Added popup to other settings menu item
Included scene mode and whitebalance in popup

Change-Id: I9f7a07211b8548a028d5fb02eb28251fc5823fea
om/android/camera/CameraActivity.java
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/PieController.java
om/android/camera/ui/PieRenderer.java
9f8b479c44e8fafda688ac0fab9882584a94d55f 19-Sep-2012 Michael Kolb <kolby@google.com> Fix back button anomaly when menu is opened

Bug: 7191226

Send a cancel event to the activity dispatching to reset
Gallery's touch handler

Change-Id: I9231c390ccae4cca02da0e02d400cb3425daa15b
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
30abd4ec39e8791ad1189fb42df09e45cd157fc8 19-Sep-2012 Michael Kolb <kolby@google.com> Fix shutter in capture mode

Bug: 7193509

Minor touch regression.

Change-Id: I620b416c60469965d7aedeb9904feb30980b7ff4
om/android/camera/CameraActivity.java
0f78c8811ea8a7464d4bf62053e62c4fae8fe6d0 19-Sep-2012 Alex Ray <aray@google.com> Revert: Do not let recent apps capture camera screen shots.

Bug: 7191713
Change-Id: I62f95f6917da07a735a05723b40745c1d8f79c38
om/android/camera/ActivityBase.java
b209d4309d7291b0fdbe33e741315001eb5be726 19-Sep-2012 Michael Kolb <kolby@google.com> Merge "Another attempt at fixing switcher/shutter interaction" into gb-ub-photos-arches
6be9dc906b09247441880a83962ecf48ca861a9a 19-Sep-2012 Michael Kolb <kolby@google.com> Merge "Sanity check focus areas. Again." into gb-ub-photos-arches
51671bf45006f22cfeef7295fa33fe808ae0de4a 19-Sep-2012 Michael Kolb <kolby@google.com> Sanity check focus areas. Again.

Bug: 7153452

Change-Id: Ia3b4c168f0f28e62eba727e32ef1145395549eb4
om/android/camera/FocusOverlayManager.java
8566e6d534634965a53b536571008bad882b969d 18-Sep-2012 Michael Kolb <kolby@google.com> Another attempt at fixing switcher/shutter interaction

Bug: 7188964

Snap back after ortho movement. Dispatch to shutter or switcher
based on gesture.

Change-Id: I224fddc86f0fb63c960219dad4625bf88367e600
om/android/camera/CameraActivity.java
om/android/camera/ui/CameraSwitcher.java
om/android/camera/ui/ScrollerView.java
4e95086ee391fa81af00aa48b37261b19d2dc51e 18-Sep-2012 Doris Liu <tianliu@google.com> Merge "Adjust videoModule layout for configuration changes" into gb-ub-photos-arches
b2bdc1e7eafd403f432aae323f965bdc298c0931 18-Sep-2012 Doris Liu <tianliu@google.com> Adjust videoModule layout for configuration changes

camera_app_root had been changed from LinearLayout to RelativeLayout, but videoModule still casted the camera_app_root to LinearLayout, which caused ClassCastException. This CL fixed the issue.

Bug: 7151459
Change-Id: I04922d043415c5d6720db96871b58b2b71f20d29
om/android/camera/VideoModule.java
b5b59b88683823d70faac7b3454519d53c51180b 17-Sep-2012 Michael Kolb <kolby@google.com> Position pie options

Bug: 7170039

Fix setting item positions according to UX spec

Change-Id: I013f6dc06fd1267442ae9bc7f216ba519cf1383f
om/android/camera/CameraActivity.java
om/android/camera/PhotoController.java
om/android/camera/PhotoModule.java
om/android/camera/PieController.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/PieItem.java
om/android/camera/ui/PieRenderer.java
652ba2f095a93dfae9e255c7a4f4032a8d05f7ec 18-Sep-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add an activity for secure camera." into gb-ub-photos-arches
623cb339185cbab100fb05c5d9ab3c8c795e5339 17-Sep-2012 Ruben Brunk <rubenbrunk@google.com> Fixed switch text cutoff for greek language option.

Bug: 5508723

Should work for all long language text in the Camera switch ui.

Change-Id: Icdae50535ffce0c124ce616ad7ca67eec4338689
om/android/camera/ui/Switch.java
230d04303c38d39a6aabe4e1314ef2c3cdd1f7e7 17-Sep-2012 Michael Kolb <kolby@google.com> Merge "Use correct focus area size" into gb-ub-photos-arches
15e0d3b07902a5f398e101312495125a3d5a0384 17-Sep-2012 Michael Kolb <kolby@google.com> Prevent NPE in touch handler

Bug: 7172861

Monkey proofing; activities receive events before they're initialized and after they're paused.

Change-Id: Icc678c94f951cebb78389da00fcd0294a604d66b
om/android/camera/PhotoModule.java
112868c2cfb3a5d2356dcdde6082ce4567faeeab 17-Sep-2012 Michael Kolb <kolby@google.com> Use correct focus area size

Bug: 7153452

Change-Id: I2d233b8f68eb89a12ad5ff02319410168e682f89
om/android/camera/ui/FocusRenderer.java
75f54271636111aed9d3d8e3cd0947d2e1f11d49 17-Sep-2012 Michael Kolb <kolby@google.com> Wait for Focus manager initialized

Bug: 7175401

Change-Id: I3a57b9f95b77cf65dcbcadeace362854a2f8bb18
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
ba01e4bfd79769ad9b48dfc66167ab812a31e325 17-Sep-2012 Michael Kolb <kolby@google.com> Merge "Dispatch touch events to activity, not views" into gb-ub-photos-arches
318c5608119b83b156164e972ff4388aca36b602 17-Sep-2012 Wu-cheng Li <wuchengli@google.com> Add an activity for secure camera.

Add an activity for secure camera only. So it can have a different
task affinity from others. This makes sure non-secure camera
activity is not started in secure lock screen.

bug:7148152
Change-Id: I090714eb758998a2bb2e440f996feca612c6ac3e
om/android/camera/SecureCameraActivity.java
5da800f7a1427066a310a41964d780924c1f1a10 17-Sep-2012 Michael Kolb <kolby@google.com> Dispatch touch events to activity, not views

Bug: 7173464

CameraActivity needs to dispatch to super activity not
view group.
Also, no dispatching to hidden views.

Change-Id: Ic531467bc7cc5aaf3b75672b574386f990ed8741
om/android/camera/CameraActivity.java
om/android/camera/ShutterButton.java
om/android/camera/ui/CameraSwitcher.java
435a730c5ffedb395797e158413c64288cd7f1c1 15-Sep-2012 Doris Liu <tianliu@google.com> Adding support in new camera for video capture

With this change, the VIDEO_CAPTURE intent will be handled by the new camera.
Bug: 7174617

Change-Id: Ibf2c4141aa096a4474b45486e03321f721f74393
om/android/camera/CameraActivity.java
om/android/camera/VideoModule.java
1afe0c0498e41463cb2e19d3975462793c5bfa03 14-Sep-2012 Michael Kolb <kolby@google.com> Merge "Add new radial menu for camera" into gb-ub-photos-arches
1373b98135b2854578111dd535e24d39c8853f14 11-Sep-2012 Michael Kolb <kolby@google.com> Add new radial menu for camera

Bug: 7170039

Adds new radial menu
Adds camera picker, flash, exposure control to radial menu

Change-Id: Ifd9710360ed12bcb97bfeb67c4d0ec6e986ed74a
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/PieController.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/OverlayRenderer.java
om/android/camera/ui/PieItem.java
om/android/camera/ui/PieRenderer.java
om/android/camera/ui/RenderOverlay.java
b232fdf0a6e2b488e74c0ad505c4eddc3cfb78e0 14-Sep-2012 George Mount <mount@google.com> Merge "Hook up the shutter button to lightcycle "done"" into gb-ub-photos-arches
90ef46f0248437fbcb2c80c8a65239f4da32b039 14-Sep-2012 Michael Kolb <kolby@google.com> Support capture intent

Bug: 7166362

Change-Id: Id477525f14144638e59c53366050f431a39c4596
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
cfbf201b06095591a2ae91af2aa4b97a9c4ae9a5 14-Sep-2012 George Mount <mount@google.com> Hook up the shutter button to lightcycle "done"

Change-Id: If2b5cce55008a0bd825845a9e3fe037542653c92
om/android/camera/ActivityBase.java
om/android/camera/CameraActivity.java
b20535012f5b54e5b3cfa9576c25996bb5f8b9f3 14-Sep-2012 Mangesh Ghiware <mghiware@google.com> Launch in video mode if started with video camera intent.

Bug: 7167758
Change-Id: I6d6436deb1898eaa62d21933d852920cb857c596
om/android/camera/CameraActivity.java
01725fad5b5b881ccbdb95ff6e6cd4ac3ec720e0 13-Sep-2012 Wu-cheng Li <wuchengli@google.com> Merge "Avoid sending messages if the activity is finishing." into gb-ub-photos-arches
7114364044191d10505145df38d406cbb63dcdba 13-Sep-2012 Michael Kolb <kolby@google.com> Fix shutter button

Bug: 7157664

Properly dispatch events to both switcher and shutter.

Change-Id: I747e4ddb96a54d317510f88c465dea6316004318
om/android/camera/CameraActivity.java
38a6c24485d36651b93d5935bfbaf3cd367885e7 12-Sep-2012 Michael Kolb <kolby@google.com> Fix focus touch coordinates & NPE

Bug: 7150502

Correct focus position for different orientations
Ensure FocusOverlayManager is properly initialized

Change-Id: I07735f9f9b1b6fcff9baf8c3ea50d4cc757c4ab2
om/android/camera/FocusOverlayManager.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/RenderOverlay.java
om/android/camera/ui/RotateLayout.java
fe269902ba8522e01baa9be45755779f050c1d6c 11-Sep-2012 Wu-cheng Li <wuchengli@google.com> Avoid sending messages if the activity is finishing.

The messages has references to activities. Do not send
the messages if the activity is finishing. So the
activity can be garbage collected sooner.

bug:7107047
Change-Id: I23248445cd7d87617ebfce54c5bf8d0465b0d21a
om/android/camera/Camera.java
om/android/camera/PhotoModule.java
om/android/camera/VideoCamera.java
om/android/camera/VideoModule.java
ad2031cd71422115983bccef779851debc9d47dc 12-Sep-2012 Michael Kolb <kolby@google.com> Hide switcher UI when sliding to Gallery

Bug: 7148966

Change-Id: I8ca7bfcee8613d2b52c7c1b922901a1fcc1a70cb
om/android/camera/CameraActivity.java
9f846cfc5e782a56d218c33b284c1b5b21b7aecc 11-Sep-2012 Michael Kolb <kolby@google.com> Update shutter for panorama

Bug: 7146436

Change-Id: If1b287ffec27121a78233aac45a8a50162ddde01
om/android/camera/PanoramaModule.java
230a4772485dd6044958ba1215e6445a29b0f845 11-Sep-2012 George Mount <mount@google.com> Merge "Change LightCycle switcher icon so that you can differentiate it." into gb-ub-photos-arches
e26b8a8d5b7582f04ab2c4dd0c01a5926bcdc16c 11-Sep-2012 George Mount <mount@google.com> Change LightCycle switcher icon so that you can differentiate it.

Change-Id: I70951e20175e75435e10045cbd1a91e78792a3e4
om/android/camera/CameraActivity.java
9bcfa5739bc3e9b60176cfdeafb172d1b4249b25 11-Sep-2012 Michael Kolb <kolby@google.com> Remove video controls form new UI

Bug: 7146590

Also, use new shutter button assets.

Change-Id: I6d960eb4da2f8a2b7b08b33397c26a41f428a55f
om/android/camera/CameraActivity.java
om/android/camera/VideoModule.java
8bcec4f62bace9782b9226674bdc9fcf4eb2f62d 11-Sep-2012 George Mount <mount@google.com> Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
566f11c903ceae2e53c645f8d630bb1331faf890 11-Sep-2012 Michael Kolb <kolby@google.com> New shutter button

Bug: 7142696

Moved shutter button behind switcher
Added some preliminary resources for photo shutter
Fixed some touch handling issues between switcher and shutter

Change-Id: Id5ce4065b06c2a3059a44f48a378a9b0b782847e
om/android/camera/CameraActivity.java
om/android/camera/PhotoModule.java
om/android/camera/ui/ScrollerView.java
b6a61092b2d72b1501f5145b4b31d9018353a844 11-Sep-2012 Michael Kolb <kolby@google.com> Fix new camera switcher

Bug: 7141461

Change-Id: I8495e2dae231d48cb33b94c5023597500ba2df14
om/android/camera/ui/CameraSwitcher.java
00fea1c7ee987877f7218bfb9a217f4b7f0e90e4 10-Sep-2012 George Mount <mount@google.com> Separate build for AOSP and Google panorama modules.

Change-Id: If2c87ca2b22408a26c99ff467f93bbd709849eb5
om/android/camera/CameraActivity.java
ce1d8396924bf4ca9be076cfdf9594c4d33ebd9b 08-Sep-2012 Michael Kolb <kolby@google.com> Add old panorama module

Bug: 7138809

Direct conversion of old panorama activity
Hiding switcher during panorama and video recording
Limited amount of switching between pano and other modes
due to memory leak

Change-Id: Id079b258d4b6eaaf000281bf86cd43633ea1528a
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/PanoramaModule.java
om/android/camera/PhotoModule.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
df0dca9dd26b95a424a5712f16a43413a3e8ebe1 08-Sep-2012 Michael Kolb <kolby@google.com> New scroll view for camera switcher (horizontal/vertical)

Bug: 7136910

Removed the GestureDetector

Change-Id: I95150b40d4afed77c82497d77c9eeabbff574f23
om/android/camera/ui/CameraSwitcher.java
om/android/camera/ui/GestureDetector.java
om/android/camera/ui/ScrollerView.java
b19c713286b7beed376ec6c4390e7272a80aa5b9 06-Sep-2012 Michael Kolb <kolby@google.com> Adding render overlay and focus indicator

create a new render layer as a RotateLayout
add focus renderer and overlay focus manager
remove IndicatorBar

Change-Id: Id5aad03cc2c9760e0449ec16f0d64fae244d10f4
om/android/camera/CameraActivity.java
om/android/camera/FocusOverlayManager.java
om/android/camera/PhotoModule.java
om/android/camera/ui/FocusRenderer.java
om/android/camera/ui/OverlayRenderer.java
om/android/camera/ui/RenderOverlay.java
d3a252bb71d119cbaeff55aeaa27dd1f8adadba2 05-Sep-2012 Michael Kolb <kolby@google.com> New Camera UI

Introduce camera modules
Add photo and video module
Create new camera activity
Doesn't touch current Camera functionality

Change-Id: Ia88b8ad69d7d03f900acbe33dcc96e469f46a5ed
om/android/camera/ActivityBase.java
om/android/camera/CameraActivity.java
om/android/camera/CameraModule.java
om/android/camera/PhotoModule.java
om/android/camera/VideoModule.java
om/android/camera/ui/CameraSwitcher.java
om/android/camera/ui/GestureDetector.java
c1f6c073113e20fd0dbeae6d26dcc651c9049fd7 06-Sep-2012 Wu-cheng Li <wuchengli@google.com> Do not load the thumbnail in secure camera mode.

Do not load the thumbnail from the file or media store
in secure camera mode.

bug:7053266

Change-Id: If3f59607b7484e53435325620469a9542fcb5d11
om/android/camera/ActivityBase.java
d80b2cd48dd5958a0e9f370ce28c483b3a1dd166 06-Sep-2012 Wu-cheng Li <wuchengli@google.com> Finish the activity when screen turns off in secure mode.

When camera is started from the secure lock screen and the
screen turns off, finish the activity. Otherwise the camera
will be still on top of the lock screen when the screen turns
on. This also makes sure pictures taken in the last use will
not be shown when the camera is started from the lock screen
again.

bug:7053266
Change-Id: Id3df2a7787e43d993f55ed70374d6722e4bfd040
om/android/camera/ActivityBase.java
3ddad2b0eb468abd8b9a64e302102d9055038db5 05-Sep-2012 Wu-cheng Li <wuchengli@google.com> Clear mParameters reference in CameraManager.

Parameters has reference to the activity. It may
leak activities. Make sure mParameters is cleared
as soon as possible.

bug:7107047

Change-Id: I4abf778cbd3d2c66a5737e1269de22bcb05029ed
om/android/camera/CameraManager.java
68f342f3104a7b41e679c8bb51728d0a1e98e9d3 05-Sep-2012 George Mount <mount@google.com> Change lightcycle call to be in Gallery's package

Bug 7076869

Change-Id: I744e975e45efbf3dc63e3a43522e820ee7135308
om/android/camera/MenuHelper.java
c74adc18a2f8d304aec9355c316f1d1142e05839 05-Sep-2012 Angus Kong <shkong@google.com> Merge "Update LightCycleHelper path." into gb-ub-photos-arches
40a379d7a07ca7f8f7619c6214e6d185b1ed667d 04-Sep-2012 Angus Kong <shkong@google.com> Update LightCycleHelper path.

Class LightCycleHelper is moved to package com.android.gallery3d.util.

bug:7076779
Change-Id: I25572bc6a31c2da36f9bae9cfec64008a29bbbab
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
59585c89a3f85ea92c06426e5f6cc6038f91e308 05-Sep-2012 Wu-cheng Li <wuchengli@google.com> Filter out faces with confidence value < 50.

This avoids false positives on display.

bug:7108023
Change-Id: I0e6b63e614a56270462d6d58816ce913ef1361a4
om/android/camera/ui/FaceView.java
3984a817e9a37a51aa6c6a07f62cb745379a8755 31-Aug-2012 Doris Liu <tianliu@google.com> New UI for time lapse video interval selection.

Adding spinners for selecting time interval

Bug: 5484588

Change-Id: I80543bc17a8bf230861d9cc1fb8e563ab0ff4cb2
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/TimeIntervalPopup.java
a3a675ea5f5a2a13a7cdfa875589bc58e5fc0d55 31-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Change HDR to a scene mode." into gb-ub-photos-arches
39a796b1c7e5bb579d139dda89029d656cc135f8 29-Aug-2012 Wu-cheng Li <wuchengli@google.com> Change HDR to a scene mode.

bug:7054776

Change-Id: I6c4c3c020e82b5c2a7102568de7adaff2a8e1982
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/Util.java
27948cf06f3a8947e455d97f29bdd4bfd2caaeaa 31-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix camera cannot be started from secure lock screen." into gb-ub-photos-arches
507cbf2df642994a7fa367f5c96634b1a423d6be 30-Aug-2012 Ahbong Chang <cwahbong@google.com> Do not use FLAG_SECURE on Gingerbread.

Setting the flag causes the white screen and flickering on
Gingerbread, so we do not set it.

Bug: 7023285
Change-Id: I3629f0aa826420e50e28b3fd5a6894dd310ee275
om/android/camera/ActivityBase.java
a69fb3ed52ca847962c154233b9ff0865c8c628b 30-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix camera cannot be started from secure lock screen.

- Let Gallery control FLAG_SHOW_WHEN_LOCKED.
- Do not finish the activity in onPause. The activity may get
onResume->onPause->onResume in a row. It happens when the
screen is just turned on and users swipe to the camera.

bug:5955016

Change-Id: I4b4c48f871bbafd16e7ea5d2da2a10c8e764f21f
om/android/camera/ActivityBase.java
abf5fb435c5fb28cc997d5cf80c3033cbb07b409 29-Aug-2012 Wu-cheng Li <wuchengli@google.com> Check if lightcycle panorama exists in mode picker.

bug:6912297

Change-Id: I3b08dd286cb9de2c28391b825510a50ad63f7e78
om/android/camera/ModePicker.java
c37bf0d648ae6678db79b58fe76e5719fb4e0419 28-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE in CameraSettings.

bug:7054776
Change-Id: Iee9370aab6c4f042df6ef79077cdf4985ff402db
om/android/camera/CameraSettings.java
66cfac8e6a6ad37ee12bc6d267cb40759a72d673 28-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add camera HDR setting UI." into gb-ub-photos-arches
ff7db3b0b57e49f8a990b9ad8a77fdc9c39cf774 28-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use Switch widget to show any on/off preference in other settings." into gb-ub-photos-arches
88e9e4f88caeddac4343638eb72684c70ef3d797 22-Aug-2012 Wu-cheng Li <wuchengli@google.com> Add support for camera launched from secure lock screen.

bug:5955016

Change-Id: Id3dffc947b9a6be20576c3ccf717a54b473488d9
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
cc3c021b5fd09a5cbfb24a86f20cbfcfbf436556 25-Aug-2012 Angus Kong <shkong@google.com> Send extra with intent to LightCycle.

1. When sending an intent to LightCycle, also send the
directory where we want the pictures to be stored in.
2. Common code for LightCycle in Camrea and Gallery are
refactored out.

bug:6912297
Change-Id: I69689f207a80eace016571a359d7c0e15a5bd84c
om/android/camera/MenuHelper.java
54188f4fc2cd74ec29a5a89eeb23adb40f56b39b 27-Aug-2012 Wu-Cheng Li <wuchengli@google.com> Merge "Filter out the picture sizes that have the same entry." into gb-ub-photos-arches
63d92f7a1ff8210e271767f57dc49c9d0b1f4d31 22-Aug-2012 Ahbong Chang <cwahbong@google.com> Filter out the picture sizes that have the same entry.

Bug: 7022819
Change-Id: I8f9e0c17d5b039047c9fc636a7a13c6942b0d15e
om/android/camera/CameraSettings.java
om/android/camera/ListPreference.java
9a0e6f63064c7dc00f3b8b469f3263333d3f5e16 25-Aug-2012 Wu-cheng Li <wuchengli@google.com> Add camera HDR setting UI.

bug:7054776
Change-Id: Id62c1a031c1d95e09da2a8703b017532ca4d7a80
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/Util.java
1d52e4026a0ec08f9d7eb3ffb9f267dc504d0b1a 25-Aug-2012 Wu-cheng Li <wuchengli@google.com> Use Switch widget to show any on/off preference in other settings.

Do not hardcode which preference to use Switch widget.

bug:7054776

Change-Id: Ic0c5ec11de6df450932536b9a87d7bf33aa322a9
om/android/camera/ui/OtherSettingsPopup.java
1aefe92e77546aba79cf5fb635d5e631f7bf6f16 23-Aug-2012 Angus Kong <shkong@google.com> Jump to LightCycle capture activity for Panorama.

bug:6912297
Change-Id: Ic04753926d2ac38da212321b2e08aed825dd8166
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
f4d418b4027eeda0baab71e942341d4fed38153d 22-Aug-2012 Wu-Cheng Li <wuchengli@google.com> Merge "Disable title bar on gingerbread." into gb-ub-photos-arches
394076fcefbe61033d203da977416ffde86bd8ba 22-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix recording timer is not invalidated sometimes.

The invalidate area is wrong when rotate layouts are not in
the natural orientation. Add a workaround to invalidate the
entire area.

Also use new view transfomation properties for API level
>= 11 because the workaround in API level 10 is ugly and
not efficient.

bug:6982696
Change-Id: I9417a386d1b4c5ac6ded336c90c4c11f9b99ffaa
om/android/camera/ui/RotateLayout.java
ae8b4eecd123aae8593b620b9e0783a03a907a98 21-Aug-2012 Ahbong Chang <cwahbong@google.com> Disable title bar on gingerbread.

Bug: 6982707
Change-Id: Ie9014622171da365c55f19ed7341b638ea51a0dc
om/android/camera/ActivityBase.java
c389b2cb51fbd6bd9735bd3818ba6e0abf0ade42 07-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> send the Context down to filter framework

bug:6837809

Change-Id: I88e0141908fc8420a9270f959dd30132573bb5ac
om/android/camera/EffectsRecorder.java
cca44aef3bc5810ae9e8c8a84e0236c12e833b25 21-Aug-2012 Wu-cheng Li <wuchengli@google.com> Do not start preview in jpeg callback before ICS.

Camera HAL of some devices have a bug. Starting preview
immediately after taking a picture will fail. Wait some
time before starting the preview.

bug:6996830

Change-Id: I1fa5dc0d048985bfcbc9b61f5228a258528a616b
om/android/camera/Camera.java
a96d8603560c2131d1555df82b8f64c6eb06909c 19-Aug-2012 Wu-cheng Li <wuchengli@google.com> Rotate the camera screen nail correctly in gingerbread.

bug:6927809

Change-Id: I6f694f44f5443e6a20e14c2aea91437bed5a3402
om/android/camera/ActivityBase.java
93c582e3d9a696b0821724b03fa985266d0dc878 19-Aug-2012 Wu-cheng Li <wuchengli@google.com> Improve the performance of swiping in gingerbread.

Avoid starting and stopping preview when swiping.
Set the size of the surface view to (1,1) instead.

bug:6927809

Change-Id: I14eaec3902ddc1d203702836cfa76240d2fec861
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/PreviewSurfaceView.java
1742d24613ad2a784f8413c73784726ed73ba1d5 15-Aug-2012 Angus Kong <shkong@google.com> Use SurfaceView for camcorder before API level 11.

bug:6927809
Change-Id: Ic76cea3009389a54a6b3924dd0c54aabfb7e84a7
om/android/camera/VideoCamera.java
6d97da28b3c1763114cee2f4890f83973e5414f9 16-Aug-2012 George Mount <mount@google.com> Clear activity result when launching from lock screen.

Bug 6710029
When the screen is locked during video play, the activity result
from that play will be triggered immediately when unlocking to
camera. The result must be destroyed on unlock so that the resume
goes to the camera rather than to the video display.

Change-Id: Iad79ab12c9d5e140b43f347ade0a5fb33b1cce98
om/android/camera/Camera.java
ea05d60a0915f6236ef51653cf6d98ea0163c6ed 17-Aug-2012 Wu-cheng Li <wuchengli@google.com> EffectsRecorder should not access the camera directly.

All camera access should be done in CameraManager.

Change-Id: I297e99eae36b564779f84ee40d0a31c05bc104d1
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
6266510aaa30184172aa1236bd4f88121db99288 16-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE in starting preview.

SurfaceView is initialized in main thread and camera start up
thread uses it. If camera thread uses it first, it will NPE.

bug:6927809

Change-Id: I1dbb892b9ef1a2bd0410b6c2664c1411e0f5c030
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
195f07f83be795b2dfc0cdd12636a2eb4afedd86 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Put a placeholder image in viewfinder during swipe in API level 10.

bug:6927809

Change-Id: Ib882115c56d1927d039d7fbca7e0ed7bb24ee813
om/android/camera/ActivityBase.java
om/android/camera/StaticBitmapScreenNail.java
01578657c109bcf72572c28782f0bef23330409f 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Set SURFACE_TYPE_PUSH_BUFFERS as surface holder type." into gb-ub-photos-arches
d6149c7c0d63f3f1d5a29f979ae6911018745873 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Revert the code that has been accidentally removed.

Change-Id: Ia636c83448ed9c98402e042cc450885647b2c1fe
om/android/camera/ui/AbstractIndicatorButton.java
b598db1dcba5910e7c8fee424ddfc4f833403c29 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Set SURFACE_TYPE_PUSH_BUFFERS as surface holder type.

Without this, CameraService has "overlay create failed"
error in gingerbread.

bug:6927809

Change-Id: Ic927a378bc7be3f15600debb23c76aa9a23d6d31
om/android/camera/PreviewFrameLayout.java
1a7efa6e0ed5b0bec6002b3addd4f9968f0ec5d7 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Do not use holo theme before API level 11.

bug:6982707
Change-Id: I7afc9b8564c7dd047a7e54c7385d2312aabe660f
om/android/camera/ui/AbstractIndicatorButton.java
0454f6a8dff47643a72fcdb668bd0b5100e4cec7 31-Jul-2012 Angus Kong <shkong@google.com> Use SurfaceView for MediaRecorder when API < 16.

Before API Level 16, we need to provide a SurfaceView to MediaRecorder
for preview when recording.

bug:6839752
Change-Id: I9e98e51517833b3cf92dd4ccbb8db33a80ab7288
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
23c60d96c6090fbbec8eceb9e347a5d56070f7a3 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Guard SurfaceTexture.release with TargetApi." into gb-ub-photos-arches
8eecba9e267a52e43a854f80a0b7c22bd083d28e 10-Aug-2012 Wu-Cheng Li <wuchengli@google.com> Merge "Do not use API in level 11." into gb-ub-photos-arches
c347dd2cccb6cbad8caa8404eae1c0ae17204156 09-Aug-2012 Ahbong Chang <cwahbong@google.com> Do not use API in level 11.

Util:
Copy the implementation of AlertDialog.Builder.setIconAttribute()
in the framework.

EffectSettingPopup:
Effect recording is only used in honeycomb and above, so we can simply
add TargetApi for method reloadPreference().

FaceView:
It is only used when face detection is supported, so we can simply add
TargetApi for the class.

InLineSettingXXX:
Move the implementation of onPopulateAccessibilityEvent() into
dispatchPopulateAccessibilityEvent().

Bug: 6927726
Change-Id: I06205914f246b31e37a0c5c549c4cae8d5b11303
om/android/camera/Util.java
om/android/camera/ui/EffectSettingPopup.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingSwitch.java
1baf539a75dd8c987ad496330160ba4e2d87473a 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Guard SurfaceTexture.release with TargetApi.

bug:6927809
Change-Id: I201ad3cb6c68fa01106279b776e79357a3d66540
om/android/camera/MosaicPreviewRenderer.java
c82461e017eed0c8bf73a646d782be3bb4f8d817 08-Aug-2012 Wu-cheng Li <wuchengli@google.com> Guard the usa of surface surface with TargetApi.

bug:6927809

Change-Id: Idc165ec73b734d8a8995c18484ff5a9bee1dfb59
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraManager.java
om/android/camera/CameraScreenNail.java
om/android/camera/EffectsRecorder.java
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
ce2afff1d9e78ee9bda0854ae5e29e3eab3bcfc3 09-Aug-2012 Wu-Cheng Li <wuchengli@google.com> Merge "Settings menu now highlights the current setting." into gb-ub-photos-arches
c237ea8d4a7d73c12eaeedcf66d837e61cbae46f 06-Aug-2012 Ahbong Chang <cwahbong@google.com> Settings menu now highlights the current setting.

We changed the state of current setting from "activated" to
"selected" in a previous changelist. Class ListView uses
state "checked", not "selected". We change the state of
current setting to "checked" and implement Checkable for
setting_item, so its checked state will toggle correctly
when the ListView invokes setItemChecked().

Bug: 6927174
Change-Id: Ic03914a4ef2723226125f5185ec7b3311df472f9
om/android/camera/ui/CheckedLinearLayout.java
21b795ea11b2d1498520fc8246cd4352892fdeaf 08-Aug-2012 Pin Ting <pinting@google.com> Don't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11.

Bug:6927815
Change-Id: I40b5f9bb8180a49f731cfb2b13319232dbe76f87
om/android/camera/VideoCamera.java
552b348a565ff0d2371c0c5779d45068c3f8f6e5 08-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use surface view for camera preview before honeycomb." into gb-ub-photos-arches
8e3ccacccd2b128734322877561b8b78a70e103b 06-Aug-2012 Wu-cheng Li <wuchengli@google.com> Use surface view for camera preview before honeycomb.

This change only modifies Camera class.

bug:6927809

Change-Id: Ide669a60d30be5ffaab5b72d510c1ed3dab08647
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraManager.java
a5e54c81ee1254faccdcdfb2a29b9d4c9340fb9f 08-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "Gracefully handle double release of camera" into gb-ub-photos-arches
8951c953085ba8fe83770612ae4f42d32091fa18 08-Aug-2012 Pin Ting <pinting@google.com> Merge "Don't use QUALITY_xxxP and hasProfile prior to API level 11." into gb-ub-photos-arches
c0ef4802f17a76045b1d32586b963fe90bb5460f 03-Aug-2012 Bobby Georgescu <georgescu@google.com> Gracefully handle double release of camera

Bug: 6829498
Change-Id: If221fc0f1db9ade889112b97a7015c5e692e4df0
om/android/camera/CameraHolder.java
0792585067b84904746f6673a7faa4f08652dc39 08-Aug-2012 Pin Ting <pinting@google.com> Merge "Hide effect recording UI in ICS api level." into gb-ub-photos-arches
5d08d2998fb809b4443d31d60ec38b12cda97be4 31-Jul-2012 Pin Ting <pinting@google.com> Don't use QUALITY_xxxP and hasProfile prior to API level 11.

Bug:6900688
Change-Id: I3c849e9705c53b44872fdf11b3e2db8f821a6c13
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
8145371c52a62fbebbc20685bf0901ce50495e21 08-Aug-2012 Pin Ting <pinting@google.com> Hide effect recording UI in ICS api level.

Bug:6913179
Change-Id: Ic7536e34a355226024cbc445701d20ea9dd3d7e7
om/android/camera/CameraSettings.java
cce55282e5ae2414811f2e416961f318f553c400 07-Aug-2012 Ahbong Chang <cwahbong@google.com> Handle touch event correctly in rotate layout.

The coordinate of the touch event did not transform when screen is
rotated. Now it should be handled correctly.

Bug: 6943189
Change-Id: I99f2b087ace3482ee20d44422cbbb63a5d418ace
om/android/camera/ui/RotateLayout.java
2e6df147d54efb9c076647cb0fa3728322bdd16a 03-Aug-2012 Pin Ting <pinting@google.com> Guard use of new API in Switch.java.

Bug:6927185
Change-Id: Icb76e83e8884b6cc57a0638d055258fe4b5829c8
om/android/camera/ui/Switch.java
3e1cbc8404a8ffe5cf6fae032363ef6c0ff78d54 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Only use mFaceView if it exists.

Change-Id: If31cf4a9c6676b2bccabc8a409524f9faf4abf76
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
1d56cd8c518ae1ee8a8396a877c1c59e3e63980b 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Merge "Don't touch Views at CameraStartupThread." into gb-ub-photos-arches
0e5ddc3a4b38dcb31724c594decf3ba164511381 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Don't touch Views at CameraStartupThread.

Change-Id: I16619163fa176d96c9e9dd8ea96462145aeb0cc7
om/android/camera/Camera.java
df90c922da29c6c4fa2de721e3cff19461c51715 26-Jul-2012 Ahbong Chang <cwahbong@google.com> Do not use getMaxNumFocusArea and getMaxNumMeteringArea.

Bug: 6912171
Change-Id: Ied12f241da9287b398e33a6b841a761441bf3b1e
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
cfa5ce94e6e67d046f52365374670c625eb037c1 01-Aug-2012 Ahbong Chang <cwahbong@google.com> Only inflate the faceViewStub if it extsts.

Change-Id: Ic4c8d3325120834006120f012739a1b7356d21ab
om/android/camera/PreviewFrameLayout.java
29c6b08eea023aa834e66802b6171b8d33b2b7d8 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Do not use faceView if face detection is not supported.

Change-Id: Icd31a282fdaaec4834ef4abb1cf73268e5744a40
om/android/camera/PreviewFrameLayout.java
71c0aa3fcd1cc2f9c8a429888d57ea414f643061 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Do not implement FaceDetectionListener for Camera class." into gb-ub-photos-arches
64b4d91828416c9cab4542366c21da6c3247cbcc 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Do not implement FaceDetectionListener for Camera class.

Bug:6707152
Change-Id: I550de7d40d6f56f39b7ebe1bd9b7c4d4f5b07ae5
om/android/camera/Camera.java
125f0db794c068c180301ca71223289ad2a9fec9 31-Jul-2012 Angus Kong <shkong@google.com> Merge "Avoid use of focus/metering areas before API 14." into gb-ub-photos-arches
aa916c3e7c909f356dac549ed8af67fe7e97569c 24-Jul-2012 Angus Kong <shkong@google.com> Avoid use of focus/metering areas before API 14.

bug:6881073
Change-Id: I0dc053e38ce04f19329ad2ed40bd749041910553
om/android/camera/FocusManager.java
f7fd774eab80f9b16d3a963ecd0a5d5cfaf8d551 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Use ListView.setAdapter() instead of AbsListView.setAdapter()" into gb-ub-photos-arches
2382c1c83756de7e108d05b19229486292f2cc18 30-Jul-2012 Pin Ting <pinting@google.com> Merge "Fix RTE when switching camera during effects recording." into gb-ub-photos-arches
bbe2bd724edfff08045c2ab78dbe38252e62bd9d 30-Jul-2012 Wu-cheng Li <wuchengli@google.com> Fix RTE when switching camera during effects recording.

Bug:6840486
Change-Id: If528ba1b0791b4c4dbaaa612bab922edd05d7c5b
om/android/camera/EffectsRecorder.java
430c1edc4ec62096b62972a4f16db79e9b313c96 30-Jul-2012 Pin Ting <pinting@google.com> Merge "Remove dependency on android.widget.Switch." into gb-ub-photos-arches
f74d3c31baac5fdfbceeb3bd9b251e382da6a984 30-Jul-2012 Ahbong Chang <cwahbong@google.com> Use ListView.setAdapter() instead of AbsListView.setAdapter()

Bug: 6897654
Change-Id: I99c775587b033d1784f3a641a908508a1d267207
om/android/camera/ui/BasicSettingPopup.java
af83b02b1d78576b685a116767d62df824fd285f 12-Jul-2012 Pin Ting <pinting@google.com> Remove dependency on android.widget.Switch.

Bug:6706782
Change-Id: Ib7c177c7d790b086ca1d879903d7769da50fa0a5
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/Switch.java
0517e6002175d792941965e3ab721b37c2f85bf1 27-Jul-2012 Angus Kong <shkong@google.com> Fix zoom UI disappearing when recording.

bug:6886341
Change-Id: I78665ca5cf2d23f7ed59a2a8da0d52074d079ce1
om/android/camera/VideoCamera.java
9aca812219971956eca9c502c1be97f21368f25e 20-Jul-2012 Angus Kong <shkong@google.com> Disable zoom when recording before API level 14.

bug:6838676
Change-Id: I3e3d08513d08ea44536dec5c326d7b0d5f541a20
om/android/camera/VideoCamera.java
dac1bb32531f7f4d49622bd38c82dde9333c38ac 24-Jul-2012 Ahbong Chang <cwahbong@google.com> Clean up the code.

Remove unused imports.
Remove unused private methods.
Remove unused private fields.
Add @Override for the method overriding its super class.

Change-Id: I557ead47542ffbda6b6afb37535bb3593e891d80
om/android/camera/ActivityBase.java
om/android/camera/CaptureAnimManager.java
om/android/camera/MenuHelper.java
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/ControlPanelLayout.java
om/android/camera/ui/LayoutChangeHelper.java
b1429f97cd0f204daa7e1c2339e97a772851db2a 24-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Change the state of widgets when pushed." into gb-ub-photos-arches
a9081cd1f9727bb6bdaf406e8ef82bf451002c09 23-Jul-2012 Ahbong Chang <cwahbong@google.com> Add TargetApi for about face detection.

Change-Id: I8d66706ff00a32790cfaa83037fd86cb1aec246c
om/android/camera/CameraManager.java
844d5d3043103f968beb77a6aa857d5f904d8fcc 19-Jul-2012 Bobby Georgescu <georgescu@google.com> Shared space functionality to ActivityBase, fix for pano

Bug: 6618832
Change-Id: I2b7118c8320b4f2335d5150e88813401544a07f8
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
44e3eca86a4e1998a8d0444072590bf93adb732e 20-Jul-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix NPE generated by monkey in Camera" into gb-ub-photos-arches
d4412ad0d906e7e74bb054dff90b157c1541b8a6 20-Jul-2012 Bobby Georgescu <georgescu@google.com> Merge "Menu button in camera app only active when needed" into gb-ub-photos-arches
f44f5f8ad03983d602be757c699d3b7e617925e7 17-Jul-2012 Wu-cheng Li <wuchengli@google.com> Fix the crash when choosing pick your video in effects recording.

In pick your video case, mEffectType is not EFFECTS_NONE and
mEffectsRecorder is null in onPause.

bug:6826528
Change-Id: Ia5abe7068173f974a4c57823011b2f0e1aff3f7e
om/android/camera/VideoCamera.java
3d1c0e401028ac2f70f1308874866d578f53ef71 20-Jul-2012 Ahbong Chang <cwahbong@google.com> Change the state of widgets when pushed.

State "activated" is introduced in API level 11. So we use state
"selected" instead.

Bug: 6845334
Change-Id: I7fbbaf59f6c0ab84000517f65d1f47a68f1c1a8b
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
3c0382d477b08af956e023f337f9482e73c93b45 20-Jul-2012 Chih-Chung Chang <chihchung@google.com> Merge "Only make time lapse recording available on and after Honeycomb." into gb-ub-photos-arches
4d87c63960afaf337f0ee38f94255536105ac7ac 20-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Use old API to implement RotateLayout." into gb-ub-photos-arches
5eddabb2790173fd451dbfb49824c05e4fba0501 20-Jul-2012 Chih-Chung Chang <chihchung@google.com> Only make time lapse recording available on and after Honeycomb.

Change-Id: Iea03c78c067c10602f312977eda730b60298d0d8
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
ada86b7979942a532c99be9852da82e09512fa22 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Use old API to implement RotateLayout.

Opearating on canvas directly inside dispatchDraw() instead of using
high level methods like setPivotX, setPivotY, setTranslationX,
setTranslationY, and setRotation.

Bug: 6844485
Change-Id: If4fcca39c8e8623296dc1a3ace77a1e6fd3a34b7
om/android/camera/ui/RotateLayout.java
0703fec905d13cff403955fdffdd99b1ce17113f 18-Jul-2012 Bobby Georgescu <georgescu@google.com> Menu button in camera app only active when needed

Bug: 6819025
Change-Id: Iaa394fe634aa1483f262c7074cf72a8d8a95283d
om/android/camera/ActivityBase.java
2749a308e288a68724ea41929246e3292554e832 17-Jul-2012 Bobby Georgescu <georgescu@google.com> Fix NPE generated by monkey in Camera

Bug: 6748625
Change-Id: Ic53f8806a110935c4e22331ddce46397c3f09c61
om/android/camera/Camera.java
3e1a567a5bb605d22d6d0ab410682c9256d97e1c 19-Jul-2012 Angus Kong <shkong@google.com> Merge "Don't use View.addOnLayoutChangeListener." into gb-ub-photos-arches
525667ff4b93a577298085fe45660a2d15b0bd06 17-Jul-2012 Angus Kong <shkong@google.com> Don't use View.addOnLayoutChangeListener.

bug:6831469
Change-Id: I9a46f70c1564194c9fbf4ccfb19e731fe0981201
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/LayoutChangeHelper.java
om/android/camera/ui/LayoutChangeNotifier.java
om/android/camera/ui/LayoutNotifyView.java
6396b571e1162a79e2fa1ab780dae6a168e91a1d 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Remove unnecessary actions." into gb-ub-photos-arches
80c6b13c61c7dd16f7bbf1044bb0a54ff4c0be9e 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Remove unnecessary actions.

Remove setScaleX and setScaleY from FocusIndicatorRotateLayout.clear().
The scale will always be right when the scale animation of the layout
starts, and the layout only shows after starting the animation, so we
do not need to set the scale in clear().

Bug: 6837719
Change-Id: I84016d83989e90497379997cf70287ed0439d5e4
om/android/camera/ui/FocusIndicatorRotateLayout.java
b93700d10d3bf0658d5c8e3c7efbcf11eaaa9279 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Remove an usused private method." into gb-ub-photos-arches
13e66e911ba39bb1176ac0178187b9f1779a9f90 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Remove an usused private method.

Change-Id: I6edbbe84d07a85468af1729e4973e42452100ce7
om/android/camera/ui/FocusIndicatorRotateLayout.java
1ef16a9f27750541217233fa0a20371a532785df 19-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Hide panorama UI on gingerbread." into gb-ub-photos-arches
9de635a3a9060bbe5c79c04310cf66b06a9801db 13-Jul-2012 Ahbong Chang <cwahbong@google.com> Hide panorama UI on gingerbread.

Bug: 6816669
Change-Id: Ic5e77bff24452fa1d7075ea766d85745ea4312f1
om/android/camera/ModePicker.java
10bec48e17fadbd2bff744ba758e4782b64e0e2d 17-Jul-2012 Ahbong Chang <cwahbong@google.com> Use older api to set alpha value of image.

Use ImageView.setAlpha(int) instead of View.setAlpha(float)

Bug: 6824233
Change-Id: I6643ed0c0bf153fc0ec219e5731a5111d5eec194
om/android/camera/ui/TwoStateImageView.java
967e964bba87acf4b6d1e9f66446fbd1a25a7b76 27-Jun-2012 Angus Kong <shkong@google.com> Avoid using MediaActionSound in old platforms.

bug:6698375
Change-Id: Ic9229383cab874aa372173dc844637930f06d453
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/PanoramaActivity.java
om/android/camera/SoundClips.java
fd45801cbdc968ddcd268158395ef7320b8fdf01 12-Jul-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use android.view.animation to replace ViewPropertyAnimator."
47a563b623a468f736779da7e21ef69665fc5b80 27-Jun-2012 Chih-Yu Huang <akahuang@google.com> Use android.view.animation to replace ViewPropertyAnimator.

bug:6698378

Change-Id: Icb02cac7b9e2e5ca4e4e8fdf8dfdf498a841913c
om/android/camera/ActivityBase.java
om/android/camera/ui/FocusIndicatorRotateLayout.java
f2229614847f060be34593757ca402ae62c7cc7d 11-Jul-2012 Ahbong Chang <cwahbong@google.com> Do not use ICS camera API in old platforms.

For the following methods, use Camera.Parameters.get() instead:
Camera.setFaceDetectionListener()
Camera.Parameters.isVideoSnapshorSupported()
Camera.Parameters.isAutoExposureLockSupported()
Camera.Parameters.isAutoWhiteBalanceLockSupported()

For the following method, uses Camera.Parameters.set() instead:
Camera.Parameters.setRecordingHint()

Call the following methods only when they exist:
Camera.startFaceDetection()
Camera.stopFaceDetection()
Camera.Parameters.getMaxNumDetectedFaces()

For Camera.Parameters.FOCUS_MODE_CONTINIOUS_PICTURE, use
Util.FOCUS_MODE_CONTINIOUS_PICTURE instead.

Bug: 6707152
Change-Id: I72a97e9c9bcc585692278492397fb4a04ff59555
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/PanoramaActivity.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
4c8e827c20e7c93f94880c42456715191c55d8d0 09-Jul-2012 Hung-ying Tyan <tyanh@google.com> Do not call DevicePolicyManager.getCameraDisabled() if it's not available

Bug: 6706695
Change-Id: I433ab790830c8d4031664ae66394af1dfa5aeec9
om/android/camera/Util.java
639fbb926ff8f46a3e926e8d290ae2fe60af56f9 04-Jul-2012 Chih-Chung Chang <chihchung@google.com> Remove unused Surface(SurfaceTexture) call.

Change-Id: I2b5e536b2a5e78c7227ebd29e866d4cdfa2f0ed6
om/android/camera/VideoCamera.java
3022fc1b6b1d666cbb2ee77c9ab1d7961200ab11 04-Jul-2012 Chih-Chung Chang <chihchung@google.com> Don't use AutoFocusMoveCallback on older platforms.

Change-Id: Ib27c9300d599f93282e2284bcd306eb9fb4e9708
om/android/camera/Camera.java
om/android/camera/CameraManager.java
00d84fb6488a22d530fd2c9b233743e6722ab419 29-Jun-2012 Wu-cheng Li <wuchengli@google.com> Merge "Do not use android.R.styleable because they are not public."
5f5957e9ce11fc8d4022319cbf30c8604104f3eb 29-Jun-2012 Wu-cheng Li <wuchengli@google.com> Do not use android.R.styleable because they are not public.

bug:6698428
Change-Id: I8a3ed38da5db67e9e3a41951b59ae5569c29a24a
om/android/camera/ui/ControlPanelLayout.java
7f0753739e843926a240c001c80ef7fa2f6a8296 28-Jun-2012 Owen Lin <owenlin@google.com> Don't use Build.VERSION_CODES.XXX

Since they won't be avaiable on old platforms.

bug: 6752318
Change-Id: Ia4996a123b1e002d40976d624335b8fc1a7d8186
om/android/camera/Util.java
a38cf0d7773414a653b6aa19d4d9f25a1d8c5461 29-Jun-2012 Owen Lin <owenlin@google.com> Merge "Don't use Display.getSize() before HC_MR2."
2a784618dd92de16be2228b570e7b15419248adc 28-Jun-2012 Pin Ting <pinting@google.com> Merge "Use reflection to make camera/gallery compile."
1b13d00d5a31e01d4adb2c16ea9564d5ea61e974 18-Jun-2012 Pin Ting <pinting@google.com> Use reflection to make camera/gallery compile.

The implementation uses Java reflection for effects recording
private APIs.

Bug:4965992

Change-Id: I5e92c06520f1235294531880ab8a825b97b26829
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
4a12eec56ad1c5a7e89168b205363a3ced7e26b6 27-Jun-2012 Owen Lin <owenlin@google.com> Don't use Display.getSize() before HC_MR2.

bug:6752651

Change-Id: I23354b01bb4117321de6b4a64bc2412ea35492d8
om/android/camera/Util.java
66145bb1065ac437ff543220f93586783c655226 27-Jun-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use MediaRecorder.setLocation only when api level >= ICS."
0fa9729d2c259faf758decc55663eb1883217a65 27-Jun-2012 Wu-cheng Li <wuchengli@google.com> Use MediaRecorder.setLocation only when api level >= ICS.

bug:6706691

Change-Id: I4433442fe2646a2b377a31b1fa800643cd4eddd8
om/android/camera/VideoCamera.java
f75f0f05491560f3be90a1cee05c1ecc90227d42 26-Jun-2012 Wu-cheng Li <wuchengli@google.com> Hardcode constants for new picture/video broadcasts.

bug:6706690
Change-Id: I55d5ba3348aa5d6ec745d503b5ad6df2382153e2
om/android/camera/Util.java
om/android/camera/VideoCamera.java
d256ea41672535a3b8d1bee14c7cc26108fbb488 27-Jun-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix silly face effect crashes with eglSwapBuffers error."
582d0e8e1c11f0ba80074c9822dcc27439214929 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> am e738d82d: am b2838c06: Update thumbnail if a picture is deleted in background.

* commit 'e738d82d7aa3cd744ced6e804ac55d642cd3c1dc':
Update thumbnail if a picture is deleted in background.
b2838c064ed33d8abd2e6dc7ea38659a3bb686f9 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> Update thumbnail if a picture is deleted in background.

Bug: 6712751
Change-Id: Ie6d7089ef8657c6501fe377594ef84c519840a96
om/android/camera/ActivityBase.java
om/android/camera/Thumbnail.java
547792995a5d58cb3e9f01c6536baa7f7baff0b1 26-Jun-2012 Wu-cheng Li <wuchengli@google.com> Fix silly face effect crashes with eglSwapBuffers error.

bug:6710142
Change-Id: I6b8eae0fb3c06d8c1b24f5f7626153dec526f691
om/android/camera/VideoCamera.java
3bb49aa4fe545ca8a4b3ce00e5dd6f58e8e80dbd 26-Jun-2012 Owen Lin <owenlin@google.com> Merge "Use MeidaColumns.WIDTH only when it is available."
215c38b391c506948ee6113283c90fedc7eeefba 22-Jun-2012 Owen Lin <owenlin@google.com> Use MeidaColumns.WIDTH only when it is available.

bug: 6698720
Change-Id: Ie90f506f048fe37b6c39de9d4720d69d0785efb3
om/android/camera/EffectsRecorder.java
om/android/camera/Storage.java
553eb23aad62641ec6dc9f5f8e0d89348cbf9194 21-Jun-2012 Wu-cheng Li <wuchengli@google.com> Use another way to get minimum width and height of views.

View.getMinimumWidth and getMiniumHeight were introduced in
API 16. Use Context.obtainStyledAttributes to get the values.

bug:6698428
Change-Id: I595348ed723212bd1706722dccd31295d61a53d8
om/android/camera/ui/ControlPanelLayout.java
b3377cb55e2251dfe4b93760fda8b1a3b0224a09 20-Jun-2012 Chih-Yu Huang <akahuang@google.com> Increase the size of the shutter button.

Increase the target size by adding some padding on it.
bug:6378630

Change-Id: I5e480b2fe59b77b935ab3d7ed1af08a70a8e9f11
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
9eadfd8f874b2f9b1c422f4fad403e4c6fbba9f7 19-Jun-2012 Wei Huang <weih@google.com> am 33215ac7: am cd1e0b75: Merge "Fix crash during camcorder zoom." into jb-dev

* commit '33215ac795d30193ef9b71dc1f9a23f1b47efd24':
Fix crash during camcorder zoom.
9d5c7b095a416f4d45c14981870529cc7a1abf09 19-Jun-2012 Wu-cheng Li <wuchengli@google.com> am b01834de: am 3b4b5990: Fix janky switch camera animation in effect recording.

* commit 'b01834de73ef9692f866e1dee3508d057fed65c1':
Fix janky switch camera animation in effect recording.
cd1e0b7566e4af03b2ac5c34c32500608a2984ce 19-Jun-2012 Wei Huang <weih@google.com> Merge "Fix crash during camcorder zoom." into jb-dev
3b4b59904a0f8ef2c2edf71fab593f77b31c4463 19-Jun-2012 Wu-cheng Li <wuchengli@google.com> Fix janky switch camera animation in effect recording.

There were two problems.
- When switching cameras, onFrameAvailable from the old
camera may already exist and the animation will start too
early.
- updateTexImage should be called even when the preview is
not displayed. Otherwise, the buffers will be full and
onFrameAvailable will not be called.

bug:6658107

Change-Id: Idc0c3c4a97675af965cef06d1607624e4c1c432e
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/SwitchAnimManager.java
om/android/camera/VideoCamera.java
27fcc3bea0048db4eb3e169c827dd7324e043374 19-Jun-2012 Wu-cheng Li <wuchengli@google.com> Fix crash during camcorder zoom.

Parameters may have been changed by media recorder when recording
starts. To reduce latency, we do not update mParameters during zoom.
Keep this up-to-date after recording starts. Otherwise, we may revert
the video size unexpectedly.

bug:6292058
Change-Id: Ic9230934c35702301cbf8e7caadd3f441af438b0
om/android/camera/VideoCamera.java
70ad8651d018b6d3ddea2e0bb7c8b12384059bf0 13-Jun-2012 Angus Kong <shkong@google.com> Avoid NPE if all cameras are facing the same.

bug:6643208
Change-Id: I846ed4fbe32fd459960b0ac6bdd574b7e823f385
om/android/camera/CameraSettings.java
bfe682ed315cceefc28baff52e2c00457be0eac2 31-May-2012 Wei Huang <weih@google.com> Merge "Turn off flash in Gallery." into jb-dev
d5e793b4a2116078fe32e9c69e3dcd5d01a3cebe 31-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix startFaceDetection failure." into jb-dev
c94cd4a5206b05541de0dc8a4821c64d0edba352 31-May-2012 Angus Kong <shkong@google.com> Turn off flash in Gallery.

bug:6581654
Change-Id: I316f73f9956a5cfe91f1f18c3a4658e13b243183
om/android/camera/ActivityBase.java
om/android/camera/VideoCamera.java
e9b4b396ae58e0b4cec968b34698da3225c94e90 31-May-2012 Wu-cheng Li <wuchengli@google.com> Fix startFaceDetection failure.

startFaceDetection should be called after preview is started.

bug:6584990
Change-Id: I81c03d67d86e5ce0987cccfe03e413f9df041c54
om/android/camera/Camera.java
d2d22993e038cbb1fe4cf7c8f2036e1ed2a5183e 30-May-2012 Wei Huang <weih@google.com> Merge "Fix incorrect sizes in camera switch animation." into jb-dev
59229a4a235517cf0728706db72a983141e12d19 30-May-2012 Wei Huang <weih@google.com> Merge "Show saving screen on configuration changed." into jb-dev
0008676a6bbbf633b82eabadf093446f77927544 30-May-2012 Wei Huang <weih@google.com> Merge "Hide focus indicator after taking a picture." into jb-dev
476cb307985f82b80879eb6b4c3a992f6029741c 30-May-2012 Wei Huang <weih@google.com> Merge "Set dialog orientation when configuration changed." into jb-dev
227f9c1abac9e0bbdd6950120983782beebd239c 29-May-2012 Angus Kong <shkong@google.com> Show saving screen on configuration changed.

bug:6563275
Change-Id: I33ec244a04287f8738bcec8b95840f8ef724f953
om/android/camera/PanoramaActivity.java
40d99c1258ef297c18bf0857860b326d517bf4aa 30-May-2012 Wu-cheng Li <wuchengli@google.com> Fix incorrect sizes in camera switch animation.

bug:5954954
Change-Id: I869df22e650e0cdc5488b96ed624883ac8ac398f
om/android/camera/ActivityBase.java
om/android/camera/CameraScreenNail.java
1d622592aec9105cf659af6b7cfb33bf057f3589 29-May-2012 Wei Huang <weih@google.com> Merge "No need to catch RuntimeException of setAutoFocusMoveCallback." into jb-dev
a37183279fe34fae053fb43dff3544dfd6df31fc 29-May-2012 Wu-cheng Li <wuchengli@google.com> No need to catch RuntimeException of setAutoFocusMoveCallback.

CTS guarantees autofocus move callback is supported if continuous
autofocus is supported.

bug:6568965

Change-Id: I878332acdbfe467e4fa525d1ab3d86ad25326eb6
om/android/camera/Camera.java
7b73b0eb7ee29a102ef92cc1ac0b8637f06560fc 28-May-2012 Angus Kong <shkong@google.com> Set dialog orientation when configuration changed.

bug:6566850
Change-Id: I9d4339e2afb968b41596c6d3b1acc64d4cdab1a8
om/android/camera/PanoramaActivity.java
fd65592fc86a088623ac257d8531ddfc1df20274 26-May-2012 Wu-cheng Li <wuchengli@google.com> Hide focus indicator after taking a picture.

bug:6563870
Change-Id: Ieaca283f088e3735f4d3e1c068c728991008ec35
om/android/camera/Camera.java
503c3be35efea51daf80e2b1c4d4d30666a58d41 26-May-2012 Wu-cheng Li <wuchengli@google.com> Fix the bug that face detection is not started in the beginning.

bug:6563735
Change-Id: Ia6c827c9209d13de3d0efa7386177a4d852f7002
om/android/camera/Camera.java
97ad4ce167f6808497928d3c8cb1102bad7abbfb 25-May-2012 Wu-cheng Li <wuchengli@google.com> Videos in effects should be saved on interruption.

bug:6516147

Change-Id: I617defd6fbcd4cb9cef13fc39cee551ff1755f98
om/android/camera/VideoCamera.java
1c8c7efc59cf3f3e5c048ec17b8e63262c2d1a62 25-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Cancel the camera start up thread in onPause()." into jb-dev
efbd93b4785e48c54779686ee39f03651d37372f 25-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPE in monkey tests." into jb-dev
162ae415e862b9a0ff35abcb6b0f3592c827d155 24-May-2012 Angus Kong <shkong@google.com> Cancel the camera start up thread in onPause().

bug:6542881
Change-Id: I602fdd9d280fcf239cb98d7aae3ff848fed6df4c
om/android/camera/Camera.java
55a1a95eab6116247e8720e5d0cf9837480821c4 24-May-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE in monkey tests.

bug:6555094
bug:6555247

Change-Id: I69f25d6f3973e2d1c0dc78d3f785a1fd80b68d93
om/android/camera/Camera.java
f60fe955cc90ce15dd17a9bf38057f704beaba3b 24-May-2012 Wu-cheng Li <wuchengli@google.com> Fix video thumbnail is not updated after recording.

bug:6554211
Change-Id: I031b122f39d08f357dc584a35644283347dd09bf
om/android/camera/VideoCamera.java
e40ee073f56796e0a1b1a2282a7b9f70c893b022 24-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix incorrect video orientation in effects recording." into jb-dev
403f759fa224243d6f90412c3324fdac609097e2 23-May-2012 Wu-cheng Li <wuchengli@google.com> Fix incorrect video orientation in effects recording.

bug:6535207
Change-Id: I08574bdf95bfa12a3b3a765f9d0b95918a77503e
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
162dabe4ce5eed5ea32a029f004f0dd63c37b0c4 24-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPE when pressing home during recording." into jb-dev
6fe07d95b0d307eae383721b46ead1f94fe302d6 24-May-2012 Angus Kong <shkong@google.com> Merge "Fix wrong aspect ratio in switch camera animation." into jb-dev
8129b9ffc0c9d764b474bdb1d08910fe6f352dd1 23-May-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE when pressing home during recording.

bug:6544408
Change-Id: I9560909ec8afa446d544e9688dd44ef566376646
om/android/camera/VideoCamera.java
2236b38acdd60214b931c01998d5cba8bbdf34cc 23-May-2012 Angus Kong <shkong@google.com> Use display rotation when displaying toasts.

bug:6540185
Change-Id: I3a8de15e0d45d7165e348c71b0cc6d2353f02b49
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
76507a9fd2581694942a662a57fbdd46d7a20036 22-May-2012 Wu-cheng Li <wuchengli@google.com> Fix wrong aspect ratio in switch camera animation.

bug:6539357

Change-Id: I8bcb8634d88a27d839fa6ccae102a0d94b5119fb
om/android/camera/ActivityBase.java
om/android/camera/CameraScreenNail.java
om/android/camera/SwitchAnimManager.java
c44c423cf1fa4ace68f5c441952e8d5d880327ae 23-May-2012 Wei Huang <weih@google.com> Merge "Shouldn't jump to camera preview after playing a video" into jb-dev
be6913e6d76142e82b50d056b2b8b9f7cfaa4379 23-May-2012 Chih-Chung Chang <chihchung@google.com> Shouldn't jump to camera preview after playing a video

This fixes the case playing a video from the VideoCamera activity.

Bug: 6429570
Change-Id: I02b0c0aeac2e237dd1d3460591929d65ab0e61bd
om/android/camera/VideoCamera.java
bded9dbaac65c63f03157b4d93eaf9ccb59b49ca 23-May-2012 Angus Kong <shkong@google.com> Restore focus indicator.

The focus indicator should be set to FocusManager again after changing
configuration.

bug:6538507
Change-Id: Icb9023bc95756632943b17d6727f4166fb9e7aec
om/android/camera/Camera.java
om/android/camera/FocusManager.java
8ddf6b2a6873c8b53c1038267ea88be6a6c85ef3 23-May-2012 Wei Huang <weih@google.com> Merge "Rename the image and video file to the final name when data is complete." into jb-dev
0be8b4c15c53cecbda0ea3c8159dc5741539ff53 23-May-2012 Wei Huang <weih@google.com> Merge "Add onConfigurationChanged for panorama mode." into jb-dev
0acd2e9e8ed49c1930fe4d60796ef14bc5328e34 23-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Change camera switch animation to always zoom in." into jb-dev
252da3c55a35c77fa4be4d51f79dac4aaf7cdb77 03-May-2012 Pin Ting <pinting@google.com> Add onConfigurationChanged for panorama mode.

Bug:6443692
Change-Id: Ife84c7a078e9b97e438f5ec1b35da5f3550cb500
om/android/camera/ActivityBase.java
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/PanoramaActivity.java
e8c7f9b282971cfefbbed0229af2602558bd3905 22-May-2012 Chih-Chung Chang <chihchung@google.com> Rename the image and video file to the final name when data is complete.

This avoids other apps reading incomplete data when we are still writing
data into the file.

Bug: 6496843
Change-Id: I92210095db791ab4e7a98c0901f87d33311355b4
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
24c1c15ef83608fd7a023fb5d8755f1747a5fef5 11-May-2012 Wu-cheng Li <wuchengli@google.com> Change camera switch animation to always zoom in.

bug:5954954

Change-Id: Ie2c2bc0c3c25a63dd0fc4b5f162b2ceff76475da
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/SwitchAnimManager.java
om/android/camera/VideoCamera.java
544ab64c8cf2a5ad70cd4c2f723b04f403989987 22-May-2012 Angus Kong <shkong@google.com> Merge "Quick capture should wait for effects recordings." into jb-dev
ac1dddf91ecae4ec5b7c88fe3c797bdea0bea929 22-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Make sure UI is disabled before preview is started." into jb-dev
d6da5a7ab3485547082345098454074939f1b7e8 22-May-2012 Wu-cheng Li <wuchengli@google.com> Make sure UI is disabled before preview is started.

bug:6534068
Change-Id: Iddfce143666e99b064a7c61f6a096a7dfec03f9b
om/android/camera/Camera.java
8d652860538ad9a59b3a54a13e286dfd99c17caa 22-May-2012 Pin Ting <pinting@google.com> Merge "Fix the mode picker animation position and speed in landscape." into jb-dev
eb8c46a973012c0ab29337da803741530f2bf085 22-May-2012 Angus Kong <shkong@google.com> Quick capture should wait for effects recordings.

Should return to caller after effects recording results is saved.

bug:6500915
Change-Id: I864c0fb6b355bcd567425d9c1cf9fe70fd9fdae4
om/android/camera/VideoCamera.java
69703dd35d382042ee840cf492f03daf3f348fa3 22-May-2012 Chih-Chung Chang <chihchung@google.com> Create a new file before inserting video into MediaProvider.

Bug: 6496843
Change-Id: I65306e11a2c435263d0d7ad0ad8fbe4ab4a1c822
om/android/camera/VideoCamera.java
1d7300d8b5637a5c538ce6dbc66d4dee141d43e8 17-May-2012 Pin Ting <pinting@google.com> Fix the mode picker animation position and speed in landscape.

Bug:6480482
Change-Id: I9b0dd9dd76872762121c72c9c14024a42c0c1e4c
om/android/camera/ModePicker.java
b4bd308a1244d2aa1e16a65d9e2e36a6b08f81ea 21-May-2012 Chih-Chung Chang <chihchung@google.com> Tweak the capture animation to 700ms.

Bug: 6529451

Change-Id: Ie5147fe52168899dce5de3d95aa8f42bc80210ab
om/android/camera/CaptureAnimManager.java
7604dd1da3f5c22b478b3004ff9d86c824a045d0 21-May-2012 Pannag Sanketi <psanketi@google.com> Merge "Fixing the weird preview size w/ effects on camera" into jb-dev
bc18ce3e7809a4fd7392b2e62a086ca070dc540a 07-May-2012 Pannag Sanketi <psanketi@google.com> Fixing the weird preview size w/ effects on camera

The aspect ratio sent from the camera app to the SurfaceTextureTarget
filter does not really matter now since the camera app handles
the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render
in "stretch" mode all the time even though the aspect ratio sent to the
filter might indicate otherwise. The filter still needs the correct
frame size for things other than determining aspect ratio.

Fix b/6430124

Change-Id: I8f63d47cafab05e29e7f2fd2801e359e6dd35691
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
cce0e94832a2c9471a47bc7da6a95d5d76b98f29 15-May-2012 Wu-cheng Li <wuchengli@google.com> Do not wait for camera open and preview start in onCreate/onResume.

This reduces the start-up time.

bug:6191393

Change-Id: Ica22be12867bccddde484ce0f01222644495e539
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ui/IndicatorControlWheel.java
ec118ff08b7cc515ecab533b42c6e2f0581107d4 18-May-2012 Pin Ting <pinting@google.com> Merge "Fix javadoc." into jb-dev
8dc2b940fa574e22839c70ed0ee6ad6e903c2932 18-May-2012 Pin Ting <pinting@google.com> Fix javadoc.

Change-Id: I300459764a7f84d73ffe4fdd5ecec221b3f4b118
om/android/camera/ShutterButton.java
om/android/camera/ui/ControlPanelLayout.java
e357d7e5448cfee97a321af91ce0cd412688e72b 18-May-2012 Chih-Chung Chang <chihchung@google.com> Call onActivityResult of Gallery.

Bug: 6429570
Change-Id: I49d35ed3c38b466a821d58956b4d127e93c631a6
om/android/camera/Camera.java
67d37c78a52c6a7962699a91e04eb30968d29a36 18-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Move lights-out mode handling to Gallery." into jb-dev
864ea406c99f890e1b24777a96a81b7ec3aceb50 18-May-2012 Angus Kong <shkong@google.com> Merge "Adjust front camera orientation in panorama." into jb-dev
f655efac0eee2853cc29724f0831ecd446516020 18-May-2012 Angus Kong <shkong@google.com> Merge "Do not show preview until a frame is available." into jb-dev
b6fd29430f5f349ff8172b543d49d5bb380f83d2 18-May-2012 Angus Kong <shkong@google.com> Adjust front camera orientation in panorama.

bug:6465095
Change-Id: Iedb33a8c4643dbfc22c83fe073ff22585e26275a
om/android/camera/PanoramaActivity.java
a3d2bab37e9c008e3b4c7e4ba93ba1fc40bd4b90 18-May-2012 Wu-cheng Li <wuchengli@google.com> Fix incorrect comments about orientation.

bug:6515548
Change-Id: I88d81f844f92464c8175f1ce64c608d13cda0b35
om/android/camera/Exif.java
om/android/camera/Storage.java
476cfec16c6388b59ba8fbe9846551174b383523 18-May-2012 Chih-Chung Chang <chihchung@google.com> Move lights-out mode handling to Gallery.

Bug: 6451200

Change-Id: Ib821e36dc75997471a9c3b5233cc30022c15851b
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
7b91d89f6f8a07dcdd630ff9b8b4413adcaee3fb 17-May-2012 Angus Kong <shkong@google.com> Do not show preview until a frame is available.

bug:6143435
Change-Id: I4d4c620500e8d0dbc95f24477a62a6bc49a2f174
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/PanoramaActivity.java
863e7a0094265822c2091256015a3d88958e872b 17-May-2012 Owen Lin <owenlin@google.com> Merge "Set the theme in onCreate()" into jb-dev
a029bd9976ebb618f321e8740c86b0f5d681d241 17-May-2012 Owen Lin <owenlin@google.com> Set the theme in onCreate()

So it won't reset the window backgroud, which has been removed in
AbstractGalleryActivity.onCreate().

bug: 6494653
Change-Id: I5b56ffcff7f62d02552fcae01851733626b07a21
om/android/camera/ActivityBase.java
37ea0aff9103c6837bfd0cc78f0a448168bdc397 17-May-2012 Angus Kong <shkong@google.com> Merge "Make panorama work in all orientations." into jb-dev
3edce30a390f5797fc8f92b85f2821868c70ef28 17-May-2012 Wu-cheng Li <wuchengli@google.com> Fix black screen when using camera.

bug:6511914

Change-Id: I739d6ee52c889fa3806aba95f3996ee91a289e88
om/android/camera/CameraScreenNail.java
05e0d1744d7325621170aff167cb65b7dfdf18f2 17-May-2012 Angus Kong <shkong@google.com> Make panorama work in all orientations.

bug:6305152
Change-Id: Ia38d03fecc32451c4940200ac9578c2dc3d832fe
om/android/camera/ActivityBase.java
om/android/camera/PanoramaActivity.java
0cd5c5c2734f01b7fd9f1a2624bbbdcbea33b1ce 17-May-2012 Pin Ting <pinting@google.com> Fix ClassCastException when using timelapse recording on Nakasi.

Bug:6507471
Change-Id: I7a3d2a233bba79b5aac4e2109e342d8b8de77389
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheelContainer.java
3839c28061f5513745b6f4f060586610089ce5bb 14-May-2012 Chih-Chung Chang <chihchung@google.com> Put width/height information into MediaProvider earlier.

Also reduce the capture animation time.

Bug: 6452217

Change-Id: Iba32610611d2eacc1e1b050fbf0e5b35bc0d01ea
om/android/camera/Camera.java
om/android/camera/CaptureAnimManager.java
om/android/camera/Storage.java
b896ced70e759d3e58e5019128dcd4c2fa05a8ee 16-May-2012 Wu-cheng Li <wuchengli@google.com> The screen nail should only be drawn after the first frame arrives.

Otherwise, the viewfinder will be all white when camrea starts.

bug:6505295

Change-Id: I77ce12db0959d5e863874c2b0c6fe5b1ee1c92f3
om/android/camera/CameraScreenNail.java
d20805f3162b8004cc840230bc8d9c864b114401 16-May-2012 Wu-cheng Li <wuchengli@google.com> Fix camera controls are not displayed when swiping back from photos.

The "transparent region" is not recomputed when a sibling of
SurfaceView changes visibility (unless it involves GONE). It's been
broken since 1.0. Call requestLayout to work around it.

bug:6467123

Change-Id: I741bf75c74862a7486f82d9b27dd8c8bf55dd701
om/android/camera/ActivityBase.java
2b73960560e7161aff5c38df3799148c7f538467 15-May-2012 Pin Ting <pinting@google.com> Merge "Fix zoom wheel layout and touched area mapping." into jb-dev
4fabf52f7e8b2419749f5cdc03925d5f8b1c0199 03-May-2012 Angus Kong <shkong@google.com> Enable swipe UI in panorama mode.

bug:6305152
Change-Id: I1dcb62e097053a748a9a53bf643656556f5192fd
om/android/camera/CameraScreenNail.java
om/android/camera/MosaicPreviewRenderer.java
om/android/camera/MosaicRenderer.java
om/android/camera/MosaicRendererSurfaceView.java
om/android/camera/MosaicRendererSurfaceViewRenderer.java
om/android/camera/PanoramaActivity.java
eb898059b382cce259208e38c3cdd75050adc6b2 14-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Call startPreview and setPreviewTexture in asynchronous." into jb-dev
2921239d121f488dd1fa03d6aa510c88c596445d 14-May-2012 Wu-cheng Li <wuchengli@google.com> Call startPreview and setPreviewTexture in asynchronous.

startPreview takes too much time. Make them asynchronous.
This should speed up the start-up time.

bug:6191393

Change-Id: Ib7b6bbcb1b86c48027a20868be006c7e097806ea
om/android/camera/Camera.java
om/android/camera/CameraManager.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
38a29fe77b338fc3f307f2c351a4316cf455d312 14-May-2012 Pannag Sanketi <psanketi@google.com> Merge "NullPointerException in Camera effects" into jb-dev
c7ed2380cdb7f38efa8230041918a9bd22108b20 14-May-2012 Pin Ting <pinting@google.com> Fix zoom wheel layout and touched area mapping.

Bug:638228
Change-Id: I8a50fe35b11c8e29a55b7b4e6ca74619ad4d3a9a
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/ZoomControlWheel.java
100eda18109781ed1ecdae404fe89e1cfe17731d 11-May-2012 Pannag Sanketi <psanketi@google.com> NullPointerException in Camera effects

Fix b/6480770
NPE on clearing camera effects. This is a regression of the earlier
bug fixes.

Change-Id: Ifc6aefc8491f416160fd008fa6e29cf8f6d3ac7a
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
bfc3f8587a854f23052e025d708a67f43e884771 11-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Handle the situation in which recording video failed." into jb-dev
765677bb9033d388a502f5d29bc9bdf420243386 11-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "The location of pressed state in the wheel is wrong on hdpi devices." into jb-dev
353d738565ba8b4ed4dfaa9fd7f847d399e8bfd2 11-May-2012 Wu-cheng Li <wuchengli@google.com> The location of pressed state in the wheel is wrong on hdpi devices.

The shutter button radius should be converted from dp to pixel.

bug:6382281

Change-Id: Ief4bfac056587005f3e68818a152945442410e11
om/android/camera/ui/IndicatorControlWheel.java
86b632739f4a58426955e28b509fde04ad0d7bb6 11-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Insert an image or video entry into MediaProvier earlier." into jb-dev
cd511956fe9b800b1abcc02934857f3f766e6367 10-May-2012 Chih-Chung Chang <chihchung@google.com> Insert an image or video entry into MediaProvier earlier.

So when the user switches to Gallery, it is already loaded.

Bug: 6452217
Change-Id: I975e3ac45b2313faed094803bf61a12dd251e1a6
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
19b70a7a6cada3f3c9131b3299710df24a798935 11-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Reduce the duration of switching camera animation." into jb-dev
a5d1407f942e3f66c311c45bdf484b5e79281a50 11-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Pictures should not be taken twice in image capture intent." into jb-dev
5c400bd6ced2e7f4ed4773acda1675cb26fb14f0 11-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix setParameters crash after switching camera is interrupted." into jb-dev
d97ddcbe7e765b45e68e157af7ac0c873a165aa9 09-May-2012 Wu-cheng Li <wuchengli@google.com> Fix setParameters crash after switching camera is interrupted.

If switching camera is interrupted by pressing home, discard
the switch.

bug:6461894

Change-Id: I29d2fa57fe354acd5d8b2730b76a75f52946ae89
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/CameraScreenNail.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
2a6bbfe3faa9dc6044c2708c531f0e39ee47d898 11-May-2012 Wu-cheng Li <wuchengli@google.com> Reduce the duration of switching camera animation.

bug:5954954
Change-Id: Id19a34a8de38383743ec39162c5ac039f3b5701d
om/android/camera/SwitchAnimManager.java
cf2c65866a4c472a1872d1c35a2ed9564d67e255 11-May-2012 Wu-cheng Li <wuchengli@google.com> Pictures should not be taken twice in image capture intent.

If the shutter button is tapped twice in image capture intent,
it should not take another picture after the first is taken.

bug:6465956
Change-Id: I8ca75b97d8a24a4ed9f4b8473913460a29f04002
om/android/camera/Camera.java
ed1d00e87a142be1740df128917d0b4599bd632f 10-May-2012 Pannag Sanketi <psanketi@google.com> Merge "Fix exception on interrupted activity w/ effects" into jb-dev
03f6971472316e7154dae96fa161951570b146b4 10-May-2012 Pin Ting <pinting@google.com> Merge "Fix accessibility support for camera app." into jb-dev
a502a0b57768ff2faec4349ba9b67fad6d5d004e 10-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Notify Gallery about ScreenNail size change." into jb-dev
a60436f0df6fc4189473b5ed27887edbba30312c 09-May-2012 Chih-Chung Chang <chihchung@google.com> Notify Gallery about ScreenNail size change.

Bug: 6355399
Change-Id: I5cedde724e339fd58c27c6c4bd3df80f5c3605a4
om/android/camera/ActivityBase.java
om/android/camera/VideoCamera.java
40cc1c311bc14b20c858414b04ee1c67766aa890 08-May-2012 Pannag Sanketi <psanketi@google.com> Fix exception on interrupted activity w/ effects

Fix b/5873421.
With effects on, there was an exception if the videocamera activity was
interrupted. This was due to the fact that the
video filedescriptor was being closed in onpause() whereas the
effectsrecorder needed that till later. So moved that closing the file
descriptor to the callback received from effectsrecorder. This also
needs the closeCamera() to be split into two parts: closing the camera
itself and closing the effects. Closing the effects is shifted
to the callback, too. Else, the effects are stopped and released in
the closeCamera() call, thus leaving no way to not close the file
descriptor in onPause(). Additionally, a method disconnectCamera is
added so that the effectsrecorder can handle a released camera when
shutting down.
Also, added a method to let the filter graph know that the underlying
surfacetexture will be disconnected in onPause().

Change-Id: Ic6aada9f7e816b320bf292aafd453efe6dc71073
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
164de13cb249aa9b8b6d940782a25b05dade287b 09-May-2012 akahuang <akahuang@google.com> Handle the situation in which recording video failed.

When recording video failed,
- send RESULT_CANCEL back in the intent mode.
- disable review buttons.
- do not start capture animation.

bug:6124035
Change-Id: I9efb4f4f39dd36e73f9a062dc3f18f918a6bdcdc
om/android/camera/VideoCamera.java
b05d7ebabe8b3d7275b93370f63dd4a5af7abda6 08-May-2012 Pin Ting <pinting@google.com> Fix accessibility support for camera app.

Bug:5991692
Change-Id: I26ac6d9075a1a8a757c48955b14d558dc498bf9f
om/android/camera/RotateDialogController.java
5469ddc2715243bbc3129aedb00b7095b14a25c7 09-May-2012 Pin Ting <pinting@google.com> Merge "Fix touch position index mapping in second level indicator bar." into jb-dev
914a28592040a8b876f5ed359b9db6e97d963c9f 09-May-2012 Pin Ting <pinting@google.com> Fix touch position index mapping in second level indicator bar.

Bug:6465729i
Change-Id: I0a0fb5c1c2cafd19dd7a7cf1c4ce6c684611dd2d
om/android/camera/ui/SecondLevelIndicatorControlBar.java
db52310fa849fe81f0e7755c854001cb57ed8475 09-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Indicator control should remove old indicators when switching cameras." into jb-dev
1a7521d918ebbf9c39e523a577cc561e67f33a08 08-May-2012 Wu-cheng Li <wuchengli@google.com> Indicator control should remove old indicators when switching cameras.

bug:6462645
Change-Id: I35177563d7a3ad4069190f7180536807d2f13b65
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlWheel.java
51c5e230ec0d995d3c9c9e664c367e727a8b9c3d 09-May-2012 Pin Ting <pinting@google.com> Merge "Fix indicator orientation when switching between camera/video." into jb-dev
fdd14163dc3c4bd2d6ec7824f4ca4da7954dce2f 08-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Change the frame provided to gallery to use current framework orientation." into jb-dev
f3c71bf38a4f0c529d076ef93b2fae3aa59dbf4e 08-May-2012 Chih-Chung Chang <chihchung@google.com> Change the frame provided to gallery to use current framework orientation.

Bug 6451117: Preview location is wrong after rotating the device quickly
Bug 6444303: The preview location is wrong when camera is started upside down on tablet

Change-Id: Id30c39a189615007978c7120bb2b4c77faae29c1
om/android/camera/ActivityBase.java
e6b26db98cf0ae511cf695c8e2573908d4c44766 04-May-2012 Wu-cheng Li <wuchengli@google.com> Add synchronization for CameraScreenNail.

CameraScreenNail methods are accessed by GL thread and main
thread. Super class SurfaceTextureScreenNail uses this to
synchronize. CameraScreenNail should use a separate lock.

bug:5954954

Change-Id: I83f1d314bca5d46f7b66a34c828eae62f54037d0
om/android/camera/CameraScreenNail.java
308f8dcb418702bb49cb203d6d99f05917eca3d4 08-May-2012 Pin Ting <pinting@google.com> Fix indicator orientation when switching between camera/video.

Bug:6450981
Change-Id: I0a57d2bfb4bb6c9b79a65c9cbd7722eeb3e6231b
om/android/camera/Camera.java
om/android/camera/IntentExtras.java
om/android/camera/MenuHelper.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
3ca123430e6f94afac31a882590ab950d34499c1 07-May-2012 Wu-cheng Li <wuchengli@google.com> Darken the preview as soon as switch camera icon is tapped.

- Back camera zooms out when switching from back to front.
- Separate zoom ratio of back and front cameras.

bug:5954954

Change-Id: I634f2a782f8fa59eb806b61e9615ea099da7886d
om/android/camera/CameraScreenNail.java
om/android/camera/SwitchAnimManager.java
a8a1b3cb1482fd27d32f608fdb5e72d243373f2c 07-May-2012 Wu-cheng Li <wuchengli@google.com> Revert "Add a lock to protect mAnimState."

This reverts commit 5b17dd19b4e7b1bb55bc26672d80876590a1f4a0
om/android/camera/CameraScreenNail.java
5b17dd19b4e7b1bb55bc26672d80876590a1f4a0 04-May-2012 Wu-cheng Li <wuchengli@google.com> Add a lock to protect mAnimState.

mAnimState is accessed by GL thread and main thread.

bug:5954954
Change-Id: I443c2426cf0f68253445c327ca1d2b2fa7fe57f1
om/android/camera/CameraScreenNail.java
a1fb83c0f18518013c3b1d4ab8c0f78a7bc0710f 02-May-2012 Wu-cheng Li <wuchengli@google.com> Add animation when switching between back and front cameras.

bug:5954954

Change-Id: I3e3894276b4bea4568e832eaf9e7963182b58269
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
om/android/camera/SwitchAnimManager.java
om/android/camera/VideoCamera.java
d03d34ac9f50857f38034749607ce07c161d5120 05-May-2012 Chih-Chung Chang <chihchung@google.com> Fix 6429662: Video snapshot doesn't work

Change-Id: Idff1f02e714f9b18c08c7ca89ca09db82819a7ab
om/android/camera/ActivityBase.java
om/android/camera/VideoCamera.java
94587ba00548013714f625029aacf69b95ed7320 04-May-2012 Pin Ting <pinting@google.com> Merge "Fix camera control disappear when restarted." into jb-dev
f108795408821e4b930c28a68f8a35972e621f4e 04-May-2012 Pin Ting <pinting@google.com> Fix camera control disappear when restarted.

This changelist fixes NPE in Camera.onConfigurationChanged()and
VideoCamera.onConfigurationChanged() by removing mCameraDevice
operation from setDisplayOrientation() and initializeZoom(). But the
camera control disappears when camera app is restarted. It's because
ActivityBase.onFullScreenChanged(boolean) is invoked three times with
the parameter value in this order true, false, true. The second
invocation leaves a pending action withEndAction(mHideCameraAppView),
which is executed in the third invocation of onFullScreenChanged(),
causing the camera control being hidden. The fix is to add
withEndAction(null).

Another bug is filed for that onFullScreenChanged() being invoked
three times, which causes the camera control flashes.

Bug:6438113
Change-Id: I36305eabe5d7092d681550a1d5772ec790eb1cbb
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
8dbd61396678c9a833e65e69624eef9cfe5f4898 04-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Do not restart activity when switching between cameras." into jb-dev
e60ac86412b640c6431ac57750f554dcbe6a1d3e 04-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Use activity-alias to disable camera icon dynamically." into jb-dev
7c2ad16e955d70f12b28b1572860e9f1cce89455 04-May-2012 Chih-Chung Chang <chihchung@google.com> Use activity-alias to disable camera icon dynamically.

Bug: 6438794

Change-Id: I15171868d1d20c90d69b5bd55f8e7b7a5bc18cac
om/android/camera/DisableCameraReceiver.java
d8aede8c8f7274c00358358d2de6a9ccd9f30fa9 02-May-2012 Wu-cheng Li <wuchengli@google.com> Do not restart activity when switching between cameras.

bug:5954954
Change-Id: I6ea44edd93910b84727623d43ada85d3534ffa95
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/IntentExtras.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
5332b201e37ae0bb8854636fac9e0dbee3bb37df 04-May-2012 Wu-cheng Li <wuchengli@google.com> RotatgeImageView should not have animation when it is disabled.

bug:5954954
Change-Id: Ie81143b4979f9d99d4c5a1ed82725fd06ddf4497
om/android/camera/ui/RotateImageView.java
b32f38e943814bfbcfc800126c6589e46bff35bd 03-May-2012 Chih-Chung Chang <chihchung@google.com> Fix action bar style.

Bug: 6408648
Change-Id: Id345022e7bf986638cb43c78e6d5bae1d2c3ace6
om/android/camera/ActivityBase.java
a039528021a46e95a21a16ce58aa22b23a7f5e2a 03-May-2012 Chih-Chung Chang <chihchung@google.com> Fix camera animation direction.

Bug: 6402581
Change-Id: Ifaa02a42be8c745fd34306b0913d78106a661a89
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/VideoCamera.java
a0b7c6b3c61b68db7f4eb33d81c886fb4e095f2c 30-Apr-2012 Pin Ting <pinting@google.com> Implement onConfigurationChanged for camera and camcorder activities.

When gallery is in foreground, rotating device will invoke camera
onConfigurationChanged in background. The camera layout will change
orientation and be ready when swiping from gallery to camera.

Bug:6304805
Change-Id: I5d0222d3eb062a7646679741a922130c3c13097e
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
e766ea3e51ace8b7d37caddeb7d265162bd38a90 02-May-2012 akahuang <akahuang@google.com> Merge "Remove priority indicator when setting is not supported." into jb-dev
5e35ab971d1e60ec8121c4899663b2f37d7c1ec3 02-May-2012 Owen Lin <owenlin@google.com> Merge "Use GLCanvas to copy texture." into jb-dev
e9e984765eec5bd2721162e5db6c7082215dc0fd 25-Apr-2012 akahuang <akahuang@google.com> Remove priority indicator when setting is not supported.

Add a camera test in which the setting doesn't support
scene mode, flash mode, white balance mode and focus mode.

bug:6393669
Change-Id: Ie01bdaf6f1c267bfffb49f3dc5c840945a1f405b
om/android/camera/Camera.java
e5a7c7c22c1d8eced943a745c68f80a9e6d44eb4 25-Apr-2012 Owen Lin <owenlin@google.com> Use GLCanvas to copy texture.

Change-Id: Iea354ff277442f90dd95d6b72b608e85b99da29c
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
17de506c16816a9874a5417be402345b9882e0a4 01-May-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE when preview is tapped in camcorder mode.

bug:6422423
Change-Id: Iabc31551ee1747865b976d5efcbd1a2391c17e24
om/android/camera/ActivityBase.java
143357ab64d28d21bd93da4a8dd60e3dff8a9d04 30-Apr-2012 Wu-cheng Li <wuchengli@google.com> Lock the orientation in panorama.

Panorama does not have swipe UI. Lock the orientation
before it has swipe UI.

bug:6305152
Change-Id: I47379ea04e0fed15658c91905c69064e08d8b332
om/android/camera/PanoramaActivity.java
78b7bc5fe8e47bc422daf3b4e83cc7b241b210fd 27-Apr-2012 Chih-Chung Chang <chihchung@google.com> Assorted swipe UI fixes.

- Use new full screen callback to display camera controls.
- Use natural orientation for camera preview texture.
- Tell PhotoPage the preview frame position instead of doing transform ourselves.

Bug 6401075: Able to scroll through the gallery pics while capturing video.

Change-Id: Ibd4921c88b870bd5ff11bf26b5bd465d6a3e2c7b
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/VideoCamera.java
a2dfa432572a7a1b72c88197c96cac47c68235a9 28-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE if pressing back immediately after start.

ActivityState can be finished before onPause. Do
not call getTopState after onResume.

bug:6395139

Change-Id: Ic38984c203906dd28931d44c45aa46d2073ff819
om/android/camera/Camera.java
29ba4c89c9618df3181ec94d9f7a59552756ed65 27-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPEs when camera fails to open." into jb-dev
d34907aef9fd401defc149d8e8921f961cbdf053 26-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix NPEs when camera fails to open.

bug:6393029
bug:6136088

Change-Id: I54e7808a8e8cf4db1a995faad314ea768753ab4f
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
901cdc595dee236eeb22fab8c40d6256535003e8 27-Apr-2012 Pannag Sanketi <psanketi@google.com> Merge "Fixing the broken goofy face / background effects" into jb-dev
d07b84a2904ca93887f7b1a79732a1c3562f9fe4 26-Apr-2012 Pannag Sanketi <psanketi@google.com> Fixing the broken goofy face / background effects

b:/6278826
The effects were broken due to the change in Camera app using
surfacetexture instead of a surface. Changed the filter graph to use the
appropriate filters for surfacetexture with needed changes.

There are still issues with the display aspect ratio when the
camera is swapped.

Change-Id: I39dfe22e2fff25e6b56327b7c98c5a8651041b9d
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
f3e91d3276142da3a2931a727f370e56f96b1f6f 26-Apr-2012 Wei Huang <weih@google.com> Merge "Fix second-level indicator bar logic." into jb-dev
72fe79a040df8f01b03a39bec2473f7b0de8228d 26-Apr-2012 Wu-cheng Li <wuchengli@google.com> Make sure action bar is not displayed when start.

bug:6402552

Change-Id: I32e074a585949fa176fe66e17e1c78a3ad66d227
om/android/camera/ActivityBase.java
e9ff724be7dca28d9ade8490dd461aa9221aaa7b 26-Apr-2012 Pin Ting <pinting@google.com> Fix second-level indicator bar logic.

Bug:6304805
Change-Id: I6144c14cb369e92c04de3f12d90efc8d8aa82a2b
om/android/camera/ui/SecondLevelIndicatorControlBar.java
196ff90893f16c3497a1e8d2786b8f4c6e13957e 26-Apr-2012 Wei Huang <weih@google.com> Merge "Support landscape/portrait layout for phone/tablet." into jb-dev
2eaabf9cca4528b01e414c384a039c10907c9d0b 18-Apr-2012 Pin Ting <pinting@google.com> Support landscape/portrait layout for phone/tablet.

Bug:6304805
Change-Id: I68966a5e7a571417536059ce5699e409722991c3
om/android/camera/ActivityBase.java
om/android/camera/ModePicker.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
24e4e6cc25b7628ef15eff703f70b2872575a4cc 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Show action bar after swiping to gallery.

- Also remove the original camera menu options.

bug:6363385
Change-Id: I38021a79a180d0f2f5b01bdde7f0f4d14da6f501
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/MenuHelper.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
71bf9ebe0f207c1af741e3b76d84dde1358faa1b 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix the crash when tapping thumbnail in panorama.

Swipe UI is not working in panorama yet. Send the intent
when the thumbnail is tapped in panorama.

bug:6313320

Change-Id: I6ab0dc0745b02350a5c87c0d9c8650791b1b19e7
om/android/camera/ActivityBase.java
om/android/camera/Util.java
fe96292cfe040de7b20bc2130d09e8a373f3c27f 24-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Disable camera activities if there is no back camera."
2a86dea8eb78891c364e5083d942c05e6019b5c6 24-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Add capture animation in switching to Gallery."
6a4a72b643929701c5d7c8b68b91d762c7277c20 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Make sure status bar is not displayed.

Gallery shows status bar in portrait. Add a method
to disable it.

bug:6378178
Change-Id: Iea3ebccf0aad3358a8cb82020526937cfc3b50a3
om/android/camera/ActivityBase.java
dbf0c4f2fbf366f764f421f70605205440c07fa2 24-Apr-2012 Chih-Chung Chang <chihchung@google.com> Disable camera activities if there is no back camera.

Bug: 6313793

Change-Id: I713407efe783fd90cc26cb4a14f30a21f8ed77cc
om/android/camera/DisableCameraReceiver.java
om/android/camera/Util.java
4143563bb21d888fce21d97efc6140806183340f 20-Apr-2012 Chih-Chung Chang <chihchung@google.com> Add capture animation in switching to Gallery.

Change-Id: I8a0600cf133ecd5acc5f1e4cc3251d123d571478
om/android/camera/ActivityBase.java
351b7a85f40c6a2bcb5fb0e7eeb61002c376bb29 11-Apr-2012 Angus Kong <shkong@google.com> Restore capture animation.

The capture animation is re-implemented in GL.

bug:5988937

Change-Id: I27e45b04cc486d6580f1e9f63ede95bdb746fec9
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/CaptureAnimManager.java
om/android/camera/VideoCamera.java
b130b9af898f597eb7506dd2f29f0961b858176d 19-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix incorrect width and height written to database.

The width and height of the actual jpeg may be opposite
to the width and height from Parameters.getPictureSize.
getRotation and exif orientation should be considered.

bug:6364158

Change-Id: I87769815a91093d8842c6e18ed7b2db9ff29b46b
om/android/camera/Camera.java
om/android/camera/Exif.java
om/android/camera/Storage.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
64f9e54b860d158f8317bce7d4e8b6af5cbcfbab 20-Apr-2012 Pin Ting <pinting@google.com> Misc fixes and clean-up.

- Use getResources().getConfiguration().orientation to replace
getRequestedOrientation().
- Remove unused code.
- Fix outdated comment.
- Fix typo in variable names and comments.
- Fix coding style.

Change-Id: I81166ae2e4e99693e973227b323eaee68f6631db
om/android/camera/ListPreference.java
om/android/camera/MosaicRendererSurfaceView.java
om/android/camera/PanoramaActivity.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/ControlPanelLayout.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
54261d1716017740e2869bc3d6c0d89965dda3f5 19-Apr-2012 Pin Ting <pinting@google.com> Merge "Remove unused classes and rename variable."
a432c550acb06d2fea9f1d1f33055d914e0ee2bd 19-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove use of hidden API.

- KeyguardManager: isKeyguardLocked and isKeyguardSecure.
- View: mPaddingLeft, mPaddingRight, mPaddingTop, and
mPaddingBottom.

bug:5029099
Change-Id: Icfdae4a6d463377827e1469e0a5645b5698c821d
om/android/camera/ActivityBase.java
om/android/camera/PreviewFrameLayout.java
7a54ffad3be4bd94365a1c70b719e41b573cc7fd 18-Apr-2012 Pin Ting <pinting@google.com> Remove unused classes and rename variable.

Change-Id: I4b49dc97818bc461223c9d32056ea37a4a1a4d83
om/android/camera/Util.java
om/android/camera/ui/OneRowGridView.java
om/android/camera/ui/RightAlignedHorizontalScrollView.java
ba9bb6f299a15589532547fd2666224751f06add 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix touch focus."
2632ab4ef6c7e1251e2c17fd5de1897f66aad1bd 18-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Rename pauseDraw() to recycle()."
bfaab736a344641a63170ebdcd9d5377779d3a15 17-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix touch focus.

Use PhotoPage listener to get the touch event.

bug:6313318

Change-Id: Ib36dfd4fa11779faca59604fb145344d5af9df30
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
67d66737e76e96bcf09879704e583b7456f763f2 18-Apr-2012 Chih-Chung Chang <chihchung@google.com> Rename pauseDraw() to recycle().

Change-Id: I407df9819b9975aab596bea54945433f37c49a15
om/android/camera/CameraScreenNail.java
15909c16c485d8498691ad9c96bfd97273074e4e 18-Apr-2012 akahuang <akahuang@google.com> Merge "Fix camera_control distorted in small resolution."
a50a44e9229544932e4a9cb2b076ecf256c6cbf2 18-Apr-2012 akahuang <akahuang@google.com> Fix camera_control distorted in small resolution.

Use minimum height of camera_control to fix it.
bug:6228273

Change-Id: I7c623efe06e043664d696f753f08877cd34450a1
om/android/camera/ui/ControlPanelLayout.java
8147561670f166bc090e60cbb271555cde86a9c9 17-Apr-2012 Wu-cheng Li <wuchengli@google.com> Release the camera directly without calling stopPreview if possible.

Camera.release also stops preview. Releasing the camera directly
may be faster on some devices.

Change-Id: Ia5ab052a2fd20767248f33b21f61a08df51a8441
om/android/camera/CameraHolder.java
5c17d7a077acd1f84bdcb7579f7d02a1094602bc 17-Apr-2012 Wu-cheng Li <wuchengli@google.com> Release the camera faster if recording is interrupted.

Change-Id: I0d18b0fbbcc2d2f765b422ed388fd45b67d53f3d
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
3b5b19ae99fb32485e44057d6939204382450d2d 17-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix ANR in onCreate.

If start preview thread calls notify before main thread calls
wait, camera app will ANR. Change to sticky ConditionVariable.

Change-Id: Ib2543592b76a05842ba724ad0145db8574599af3
om/android/camera/Camera.java
9ec25a5048f70ba0b5ae4d807e2cc0779f61e735 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE in onCreate.

mPreviewFrameLayout should be initialized before startPreview.

bug:6349183
Change-Id: I0785865339d52d305c048919540a4ab77d12ccbe
om/android/camera/Camera.java
3db3a36833cdc8ce4da137ef641fce4786995d8c 17-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add autofocus animation."
e75e33cd3de39f1961d3fac8e7a51d126260de45 12-Apr-2012 Wu-cheng Li <wuchengli@google.com> Add autofocus animation.

bug:5687212

Change-Id: I6be5153d2523646693ea229c020f4cc7cc2c503c
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/FocusIndicator.java
om/android/camera/ui/FocusIndicatorRotateLayout.java
om/android/camera/ui/FocusIndicatorView.java
om/android/camera/ui/RotateLayout.java
c38faeb66a3f2cc96e4c5e951228d9b01e12edb3 16-Apr-2012 Chih-Chung Chang <chihchung@google.com> Decrease the timing for fading the controller out/in.

From 300ms to 100ms.

Change-Id: I956dd51f4115822ddf1e37bde31923571cb9fd18
om/android/camera/ActivityBase.java
14eb2f01892cfe3945ecc4d431a7c134ded6ec17 12-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix focus indicator is not displayed.

- Use View.onSizeChanged to set the size of preview frame
layout. So we can make sure FocusManager always have
the correcnt and up-to-date preview frame layotu size.
- Refactor FocusManager to make it simpler.

Change-Id: Ic7d59cfc1f2b7edb97fbcf5ecfc3113514f4a4c4
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/PreviewFrameLayout.java
790dc6e47ecdb82e7567bec777803b661123c5bf 13-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Remove the workaround of delaying camera open."
20d1ab18e1a779e7a1302d1e8cf49851ba258029 13-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove the workaround of delaying camera open.

The workaround was to fix the race condition of camera open
between camera app and face unlock when screen is on. Now
activities are not resumed while the lock screen is up. The
workaround is not required anymore.

Change-Id: I27fa1af048ccdb79f0ac9f3f61b96216489a0bf5
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
9d203872b38c2f0f0d727f303d4a3be2bf707f7e 04-Apr-2012 Pin Ting <pinting@google.com> Update the zoom wheel UI when zoom index is changed.

- Revert "Retain zoom level after tapping thumbnail and going back."

bug:6291241

Change-Id: I92f4fdf40f76860ec0ff8ae8db7461eb9ec2fca2
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
8a79ddc5827de54a33d8fbef0e467da2266342cb 09-Apr-2012 Wu-cheng Li <wuchengli@google.com> Make aspect ratio of preview and picture the same.

- Move the preview to the center of the preview frame layout.

bug:6294992
bug:5954389

Change-Id: I47e4b81dd9f3c207025256e1f4e7b23d5f5d84dd
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
557c7bb1a422f69676ea0eb56a9c2ef82e3412ee 09-Apr-2012 Wei-Ta Chen <weita@google.com> Merge "Speed up the start-up time of PanoramaActivity."
1cc3a3466c8e9f30f13b81a88d8b2f31050c599c 09-Apr-2012 Wu-cheng Li <wuchengli@google.com> Change how camera controls fade in/out when swiping.

The camera control should
- fade out as soon as the swiping starts.
- fade in as soon as the preview moves back into the original
place.

bug:5954389

Change-Id: Ib8a766251e111ffce272dfdbb45c43957a0c26e5
om/android/camera/ActivityBase.java
om/android/camera/CameraScreenNail.java
5aec187988721125e9f6874920eda5d2a7750890 07-Apr-2012 Pin Ting <pinting@google.com> Fix NPE in Camera.capture().

Bug:6280118
Change-Id: I2f96abc389c3b7795a04837a0fdc49c8a61ad7b2
om/android/camera/Camera.java
b96ce59e1d477622f9a3c235135d7040f642e262 06-Apr-2012 Wei-Ta Chen <weita@google.com> Speed up the start-up time of PanoramaActivity.

Optimize the initializing step of the mosaic library:
remove unnecessary glClear() calls, memory block reset, ..., etc.

Before the change, the latency of startup is ~1100ms.
The change reduces the latency to ~700ms.

Bug: 5954891
Change-Id: If2c721f57bf57e935b2f566d857c696ebfbeb61f
om/android/camera/MosaicFrameProcessor.java
bcd784cc5300eb1c3f2e3b3e3250cbed553ceaea 04-Apr-2012 Pin Ting <pinting@google.com> Retain zoom level after tapping thumbnail and going back.

This change applys to both camera and camcorder.

Bug:6291241
Change-Id: I1a618b12f86491d429bcfd8419c5f484b9ed5249
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
ab0f381752965fda6a0a22d423a3d806979b8e17 03-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE at onThumbnailClicked.

bug:6237708
Change-Id: I61f7c9dff082ca73c529dc688423fcec4384b879
om/android/camera/Camera.java
a6b966047b6215b02c502a3f143106070abf6009 23-Mar-2012 Angus Kong <shkong@google.com> Use galley camera preview to support swipe UI.

Users can swipe to see the last captured picture/video and
the camera roll.

Known issues:
- Capture animation is disabled.
- Effect recording viewfinder is black.
- Swipe to gallery does not work in panorama yet.
- Swipe only works in one direction.
- Touch focus is disabled.
- Some widgets like priority indicators are not positioned correctly.
- Aspect ratio of preview and postview may not match.

bug:5954389

Change-Id: I5ea0459bead36169cd73dfa25717da7353f9d181
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraScreenNail.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
9833a3328025552a3a176dc4d054cde63ef11885 03-Apr-2012 Wu-cheng Li <wuchengli@google.com> Move mPausing to ActivityBase and rename it to mPaused.

Change-Id: I152b4c327b4f261bd8634f899198d4fada84a98e
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
8be5509f2f16ac556d44881a0da21a3514f89da0 30-Mar-2012 Pin Ting <pinting@google.com> Make X icon not rotate in get photo and video activities.

This icon is symmetrical on phone and does not need to rotate.
This change is for phone only.
On tablet there's a label along with the X icon, so the icon still
needs to rotate.

Bug:5520553
Change-Id: Ia7b62fbe96ba89a54998bbb296351f91724aba74
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
aaf129e4b755e4eef9eaa0fd736a9bbd20904fc8 27-Mar-2012 Pin Ting <pinting@google.com> Fix NPE in OutputStream.write().

Users could click fading-out buttons before the fade-out animation
ends, which could crash Camera app.

This changelist blocks user click by disabling the button before fade-out
animation starts.

bug:6049267
Change-Id: Ic43710611ddf5c21717a115942a2279f10b4d52a
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
2d537a5ecc7db8695f21a2febd805122592f4cd7 30-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add animation after capturing a video."
8498e7cd3b97fbcf28417c38b46f6ba299a59d08 28-Mar-2012 Pin Ting <pinting@google.com> Dejank zooming in and out.

Dejank zooming in and out for camera and video preview
and during video capture.

Set zoom parameters asynchronously in background thread.

Bug:5954716
Bug:5954391
Change-Id: Ia128322436492be3167b4e14cf1e5b0e08701147
om/android/camera/Camera.java
om/android/camera/CameraManager.java
om/android/camera/VideoCamera.java
3a5b0163009c43a2e2969568baa5fe0efbaf07f5 29-Mar-2012 Wu-cheng Li <wuchengli@google.com> Add animation after capturing a video.

bug:5988937

Change-Id: I5b97cf9c1fbd923722beda6b5d3e14ddcd277627
om/android/camera/Camera.java
om/android/camera/CaptureAnimManager.java
om/android/camera/VideoCamera.java
a51ff6b8ae0d0fc7cb6afbc09f6f2409c34f88d0 29-Mar-2012 Angus Kong <shkong@google.com> Merge "Refine the capture animation."
6fc7917e8636118a3a1bbfe6411ed5f11b974cf1 29-Mar-2012 Angus Kong <shkong@google.com> Refine the capture animation.

Make no delay between zoom in and out. The preview fades in.

bug:5988937
Change-Id: I7612e5b3ec3d3b4358b84ce53ce371d8a52d3000
om/android/camera/CaptureAnimManager.java
296d27772b9543d55820e1d24d900fea959f1b7a 27-Mar-2012 Pin Ting <pinting@google.com> Cut down unnecessary getParameters() calls.

Move mParameters upwards to ActivityBase.

Everytime when setParameters() is invoked, we use mParameters as
argument, thus mParameters is virtually the updated cache of camera
parameters, so we don't have to get that from camera everytime when
we need it.

There are cases that setParameters() will result in camera parameters
different from the argument passed in. For those cases, we call
getParameters() immediately after setParameters() to get the updated
value for mParameters. This logic remains unchanged in this CL.

bug:5954716
bug:5954391
Change-Id: I4681aed5ebdbf9ee5df1ed3e7aab92912302ee3b
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
e4e5758bb5c73ca929dfbbb9d812e0718f442aca 27-Mar-2012 Pin Ting <pinting@google.com> Merge "Move camera operations to background thread."
475b4c6eca6f7e7ca0e4b3ee0ee234c6fe079687 21-Mar-2012 Pin Ting <pinting@google.com> Move camera operations to background thread.

- This CL moves camera operations off the main thread.
- To keep changes clear, this CL doesn't accelerate operations.
Using async call and condition variable to keep the original
synchronous call structure.
- This design keeps the CameraHolder testability.
- Merge CameraDevice into CameraManager.
- Will explore parallelism and possibly merge CameraHolder and CameraManager in follow-up CLs.

bug:5954391
Change-Id: I4d2ad6d3c70cc221e6a6f90f81b6b7a564102ac1
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraDevice.java
om/android/camera/CameraHolder.java
om/android/camera/CameraManager.java
om/android/camera/PanoramaActivity.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
4a70549064290b9cc8bfbf6169319a6861e12415 27-Mar-2012 Pin Ting <pinting@google.com> Remove unused code.

Change-Id: Ibff257be57c516136a85d3db68e3495c6dc394dd
om/android/camera/MenuHelper.java
6f5eec00546fa7042bd273a089954b5dca277d5c 26-Mar-2012 Angus Kong <shkong@google.com> Add debug message.

bug:6170220
Change-Id: I2733d7c77995d3c094d6bc6a0acedf164533a86f
om/android/camera/Camera.java
8a674bebfba0c4dd4b01018276d20f198f65f19e 26-Mar-2012 Wu-cheng Li <wuchengli@google.com> Fix NPE after recording when there is no thumbnail view.

If camera roll has no images, thumbnail view will be gone.
The width of the thumbnail view will be 0 and cause NPE.
Now layout width is used instead.

bug:6208700

Change-Id: I3906740d10982de3b90b41a8265a6338d4e0db94
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
b59f282910deca258ca4381c6f4b6970a2838bed 05-Mar-2012 Angus Kong <shkong@google.com> Use TextureView for preview in camcorder.

TextureView supports animations better than SurfaceView.

bug:5988937
Change-Id: I38222a8c426ce2b6024dcb022d88a3891b786b24
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
6982414ee3deb8c14d153f2d17b03e09a3a9162a 22-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Refactor panorama so it does not need singleTask launch mode."
03f6dd690441ee744bee2128cc194c2cdeb962e6 16-Mar-2012 Wu-cheng Li <wuchengli@google.com> Refactor panorama so it does not need singleTask launch mode.

When a panorama activity resumes, it will check if the mosaic
frame processor is being used by another panorama activity
instance. If yes, it will show a progress dialog and wait
until the mosaic generation finishes.

bug:5954389

Change-Id: If03bbfa54ac6abf8d895accd5efdee1a15f80aa7
om/android/camera/MosaicFrameProcessor.java
om/android/camera/PanoramaActivity.java
a3edb95b2326618a0f9041f90c305194aee48add 21-Mar-2012 Wu-cheng Li <wuchengli@google.com> Remove unused smooth zoom.

All camera operations will be moved to a background thread.
Remove unused smooth zoom so it will be easier.

bug:5954391
Change-Id: Ie66e7adb8b37257f3de8bbf7ed035f4f971794ff
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomControl.java
4449e757e49c9b9afc6bb2ef5ec8702a604f6ae1 21-Mar-2012 akahuang <akahuang@google.com> Merge "Add fade in animation at mode picker."
a1f6eec7b587064b5677160668345f5610073b51 21-Mar-2012 akahuang <akahuang@google.com> Add fade in animation at mode picker.

bug:6144758
Change-Id: I9152d09a9ff7afbc00bc320f8b408a5e305435cc
om/android/camera/ModePicker.java
om/android/camera/Util.java
2e3b393923d05ef5177b0286cb24bfdad8634205 21-Mar-2012 akahuang <akahuang@google.com> Merge "Fix the time lapse label is truncated when recording."
9b49be36473f2829dfaeeba570773073d7342911 16-Mar-2012 akahuang <akahuang@google.com> Fix the time lapse label is truncated when recording.

Change-Id: Ib12f06a6daf958281021ad9d2fc7c844e66c6c05
om/android/camera/VideoCamera.java
e5f08140ca0df5793529a7c501287f3559095a2c 16-Mar-2012 Jason Noguchi <jnoguchi@google.com> Exposing mCaptureStartTime so that camera test can calculate shot to shot latency.

Change-Id: Ie50ec699a9745d8ab00cdf38fad7d0184b666b8e
om/android/camera/Camera.java
b5c00f42e32c23bb68676c9c06adbcb4dbb30222 16-Mar-2012 Angus Kong <shkong@google.com> Reduce thumbnail size.

Save more memory since SharePopup is removed so the full-sized thumbnail
is not needed anymore.

Change-Id: I1003910d4e6692fc616e9804cf8a24f437afc0a0
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
6899a30e3a89ad4b455978140682d5ba871c1b33 15-Mar-2012 Pin Ting <pinting@google.com> Remove SharePopup.

bug:5954391

Click thumbnail to open Gallery directly, instead of showing SharePopup.

Change-Id: I53ed61c37b370edeb7d0aa4c5d6264693ddf379a
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/PanoramaActivity.java
om/android/camera/VideoCamera.java
om/android/camera/ui/SharePopup.java
0f986735d15b2435091bf6e11fc9306c95a5c528 15-Mar-2012 Pin Ting <pinting@google.com> Remove references to old panorama java package name.

bug:5954391

Make camera, camcorder, panorama activities share the same java package.

Change-Id: I23800ff9ede72b04e438111e7997782d535edfe5
om/android/camera/MenuHelper.java
401f72b338a9a8d4a1705e45c9d4c43d85b7788f 15-Mar-2012 Pin Ting <pinting@google.com> Merge "Flatten panorama java package."
9a59de880cc82d8175e40a3bfcebffbadbb33efd 15-Mar-2012 Pin Ting <pinting@google.com> Flatten panorama java package.

bug:5954391

Make camera, camcorder, panorama activities share the same java package.

Change-Id: I6ca29a5f073cdeb090248c9bb857c77a3a04fa5d
om/android/camera/DisableCameraReceiver.java
om/android/camera/Mosaic.java
om/android/camera/MosaicFrameProcessor.java
om/android/camera/MosaicRenderer.java
om/android/camera/MosaicRendererSurfaceView.java
om/android/camera/MosaicRendererSurfaceViewRenderer.java
om/android/camera/PanoProgressBar.java
om/android/camera/PanoUtil.java
om/android/camera/PanoramaActivity.java
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/MosaicRenderer.java
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoUtil.java
om/android/camera/panorama/PanoramaActivity.java
c3711985b0674aad0a4d8b7118333fbdb851d28c 15-Mar-2012 Angus Kong <shkong@google.com> Fix orientation might be greater than 360 degrees.

bug:6167386
Change-Id: I967842b6924b5f97e07bf3aea9e4f212228259c6
om/android/camera/CaptureAnimManager.java
fef060d7ad352c44f3469628cae31fe64143993e 14-Mar-2012 Angus Kong <shkong@google.com> Reset capture animation before start again.

Change-Id: I954cfd2ca49d0de2a99918bc4f9b15ca8c8db831
om/android/camera/CaptureAnimManager.java
10740d9f3f789fdd3932ba011dc5b6edb8ea8c78 14-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge changes Ifc23c416,I9e11734c

* changes:
Enlarge the review control button and fasten the reaction of RotateLayout.
Fix CompoundDrawable warning in lint.
76aabec658bfa46ce1cfa1974ed6b4cdff356ac4 14-Mar-2012 akahuang <akahuang@google.com> Enlarge the review control button and fasten the reaction of RotateLayout.

Change-Id: Ifc23c416dbdbf946a0b4a28c215de2683504f4d8
om/android/camera/ui/RotateLayout.java
892781804513066b68b4a2fa6f846e862dac252a 14-Mar-2012 Owen Lin <owenlin@google.com> Reorganize import for all files.

Change-Id: Ic56125055ff28f989ab4ad84f87736bbd15dd839
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraDevice.java
om/android/camera/CameraPreference.java
om/android/camera/CaptureAnimManager.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/IconListPreference.java
om/android/camera/ModePicker.java
om/android/camera/OnScreenHint.java
om/android/camera/PreferenceGroup.java
om/android/camera/PreferenceInflater.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/RotateDialogController.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/EffectSettingPopup.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/FocusIndicatorView.java
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingRestore.java
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/RightAlignedHorizontalScrollView.java
om/android/camera/ui/RotateTextToast.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
31603c865613af7c4ebe83cfa81d11c9a8e508f1 14-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use littlemock to simplify testing."
1ede776fc9dc53f40166c13daca6195f06d32f68 06-Feb-2012 Wu-cheng Li <wuchengli@google.com> Use littlemock to simplify testing.

bug:5888633

Change-Id: I00a1e301e3f0e98d53111c29daf7d011033cccb3
om/android/camera/CameraDevice.java
om/android/camera/CameraHolder.java
om/android/camera/RealCamera.java
ac1046ba37481726daec3029d2a9193ab14456ee 07-Mar-2012 akahuang <akahuang@google.com> Remove unused Id in xml files.

bug:6047024
Change-Id: Ibc11047112f61f8bc97cab2bfe285da0d9e3e579
om/android/camera/VideoCamera.java
4fde4256f533fce996bcc57153a4881cf38757bb 12-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Use the front camera if there is no back camera in panorama."
2dc1ebbb48926d788e8c2564ca14337e1a822b37 06-Mar-2012 Wu-cheng Li <wuchengli@google.com> Use the front camera if there is no back camera in panorama.

bug:6108756
Change-Id: I7b2100b0a9845b97c42d939a113065202ae59462
om/android/camera/panorama/PanoramaActivity.java
bed0e9991b4b6de7fc0f606ceab02686cd5e438e 12-Mar-2012 Chih-Chung Chang <chihchung@google.com> Disable camera-related activities if there is no camera.

Change-Id: Iadda789c53f4ee9fd2fd3ac65b449fcfcf60db92
om/android/camera/DisableCameraReceiver.java
c796d2e11364adab57ddc75a2c75c37606c2deb7 09-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge "Merge Camera into Gallery package."
8e0d8358b0ad36774cdbc0f0322ce7bdf5028458 22-Feb-2012 Angus Kong <shkong@google.com> Add post-capture animation.

bug:5988937
Change-Id: I3f2188cc83fce569d04b4d5e4960c5f39bde2f3a
om/android/camera/Camera.java
om/android/camera/CaptureAnimManager.java
8408335f3d9eef660974289fd883978c1210dc5f 08-Mar-2012 Eino-Ville Talvala <etalvala@google.com> Fix MediaActionSound lifecycle.

MediaActionSound was being created in onCreate, but released in onPause.

Bug: 6136088
Change-Id: Iff36d4db56669bf90d2b98da7cf6752f66873506
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/panorama/PanoramaActivity.java
de3bd324ef9a8f7f07a734be4dec323135582a75 08-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge Camera into Gallery package.

Change-Id: I1d502dbdf6f3f76ae2c47402b30a99126afef862
om/android/camera/CameraAppImpl.java
be9d83075e557857b608848ea1875e8b5ad20923 08-Mar-2012 Pin Ting <pinting@google.com> Merge "Refactor CameraHolder."
baf7c3a7f084e4a4e061a5ad783d3010e181601c 07-Mar-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Use public MediaActionSound API instead of CameraSound."
1df224649e0663c4bc6366f299e060d5967f526d 07-Mar-2012 Pin Ting <pinting@google.com> Refactor CameraHolder.

Change-Id: I5083cd3999e4612ec06828000dc9435be22ba5db
om/android/camera/CameraHolder.java
983b5ca8abaf178ffb2c0c0cd8aff23ea4d446ea 05-Mar-2012 Angus Kong <shkong@google.com> Use TextureView preview instead of SurfaceView.

TextureView supports animations better than SurfaceView.

Change-Id: I5e7e44be707f6651f5bc2c0e55838dd7f10bd85e
om/android/camera/Camera.java
bd073bd49440ff73790edf1a502fb221c5c0e1fd 06-Mar-2012 Wu-cheng Li <wuchengli@google.com> Set surface view to gone in onPause.

So the last preview image will not be displayed
when the camera app starts.

bug:6114501
Change-Id: Id0a66f64459432b8147aae2af3845dd75fcbd5d2
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
69b6c3c9583eb93092255f933f6977f408b436a2 06-Mar-2012 Pin Ting <pinting@google.com> Merge "Remove unnecessary title in confirm dialog."
02bc38334ebd21df08e268dbfca40b57fde1befc 05-Mar-2012 Pin Ting <pinting@google.com> Remove unnecessary title in confirm dialog.

bug:5747035
Change-Id: I3593ae3abed80f1e21bb0c5a9051b3068d518481
om/android/camera/Camera.java
om/android/camera/RotateDialogController.java
om/android/camera/VideoCamera.java
e7b26d26647188c803e0b4b929f44effc6554aec 02-Mar-2012 Eino-Ville Talvala <etalvala@google.com> Use public MediaActionSound API instead of CameraSound.

Change-Id: Ief3a3bfe03520c2a06c368316e6338482f09ac16
Bug-Id: 5029099
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/panorama/PanoramaActivity.java
8a0e6bc83441cf040e1a4c4a26f873b4b9533592 02-Mar-2012 Pin Ting <pinting@google.com> Merge "Make non-auto scene modes correctly grey out other control icons."
8d3cc29f7bfa9b7dd30cd097595854a43aa8e72c 01-Mar-2012 Pin Ting <pinting@google.com> Make non-auto scene modes correctly grey out other control icons.

Change-Id: Ibee575fccd9ec371ba27bd4daa4025e8770a2b6e
bug:6053004
om/android/camera/Camera.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
4d226d16bb06861527e5ec162e39d9673e23df83 22-Feb-2012 akahuang <akahuang@google.com> Fix lint warnings.

Fix warning: ObsoleteLayoutParam, FloatMath, IconDuplicatesConfig, UselessParent.

bug:6047024
Change-Id: Id33a00e497acb276cd1cec8076f77e2fd4a0876e
om/android/camera/CameraSettings.java
om/android/camera/Util.java
01d58b7678bee107204fbe1d4bf3da21f83b831d 28-Feb-2012 akahuang <akahuang@google.com> Fix DrawAllocation warning in lint.

Let the path object be class member instead of constructing it in onDraw function.

bug:6047024
Change-Id: I22c2ff682f95ae2c7cbaec71619b9cd37197ac2d
om/android/camera/ui/IndicatorControlWheel.java
ec53c5007756e33e2c9c6ed1f08f9a2e2604bfc4 23-Feb-2012 Pin Ting <pinting@google.com> Fix thumbnail orientation of portrait video.

bug:5954973
Change-Id: Ic4e2811942e58242dcaa0fc53e0f25b3a8ee1260
om/android/camera/ui/SharePopup.java
043ad7e3404cdf74afc01076551c84d70a0a01d3 23-Feb-2012 Wu-cheng Li <wuchengli@google.com> Fix Eclipse warnings.

Change-Id: I49c57424a74dd683115d91347c18b6bb0946ee06
om/android/camera/EffectsRecorder.java
om/android/camera/ModePicker.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoUtil.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/OtherSettingsPopup.java
70a39cb712f84f40dd12240ac2cb6b85b66e66b8 23-Feb-2012 Wu-cheng Li <wuchengli@google.com> Code clean-up.

Change-Id: I294d4d051b1818101eb54273907751aa97edb87b
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
43697bd64bc64177d0496ad2ecda8e93efd30560 23-Feb-2012 Angus Kong <shkong@google.com> Fix invalid EXIF orientation value in panorama.

bug:5981234
Change-Id: I599d28f3b148630f3edc37f64284e1eb52caf3ae
om/android/camera/panorama/PanoramaActivity.java
44e84823f02e8793a6a0fc2e60cedb03c06ae2ec 23-Feb-2012 Angus Kong <shkong@google.com> Relax the speed warning condition of panorama.

bug:5955009
Change-Id: I788bea4e4792d1468bb0c1524b0da45887560d19
om/android/camera/panorama/PanoramaActivity.java
aef5310d25537494679f9ec6b9d7a1a9cb60887d 22-Feb-2012 Wu-cheng Li <wuchengli@google.com> Save thumbnail in a background thread.

This fixes a strict mode violation. Exiting camera will also
be faster.

bug:5954967

Change-Id: I8dcb5d1bebac71fa9fe930bd0572fa0862d43a66
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
203dd6832f61c9c3b26af9283546e741184a2c7a 22-Feb-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix the confusing menu item."
46da5c9ce971f27d8c5903c9a4b2b52526b47312 22-Feb-2012 akahuang <akahuang@google.com> Fix the confusing menu item.

Rename the two items:
"Switch to camera" to "Switch to photo"
"Switch camera" to "Rear camera" or "Front camera".

bug:5164126
Change-Id: I2d176bf4c3c8111d1072636cd7881659cd8100a6
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
0234c203d5fc5dfedde5cff30ba04892e799f8b3 22-Feb-2012 Wu-cheng Li <wuchengli@google.com> Fix strict mode violation when opening scene mode setting.

bug:5954967

Change-Id: Ie7ca670686f1d28cac9447c861c5d55feb1e3f5a
om/android/camera/ui/BasicSettingPopup.java
3d2be6a4d9b44fa890c983acd3b32642da263329 21-Feb-2012 Angus Kong <shkong@google.com> Merge "Make mode picker animation smoother."
c24a2a83df9b54297995c5270d015bb7fdd85fab 15-Feb-2012 Wu-cheng Li <wuchengli@google.com> Load the thumbnail in a background thread.

The camera app should not block the UI thread to load the last thumbnail.

bug:6012208

Change-Id: Ic2e99806d51e9c1cd5b2c6d32bc5eae4a4de508c
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
0417ff611c823823c0ae695f5783aebbf69022ed 21-Feb-2012 Angus Kong <shkong@google.com> Make mode picker animation smoother.

Reorder the sequence of changing view and switching activities.

bug:5954391
Change-Id: Ica90f743b731d3e1f8580dd96622d92366fe94c9
om/android/camera/ModePicker.java
90c844841dbcdc8ad7897ac40d1fe562fab790f1 21-Feb-2012 Pin Ting <pinting@google.com> Refactor ThumbnailHolder and its caller.

Change-Id: I12a6cbe47ded3f3c0646d853dab65ac8f7fd6323
om/android/camera/ThumbnailHolder.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
8f4b24b53e0ef186e76822769416b6875af980c7 17-Feb-2012 Angus Kong <shkong@google.com> Fix the share popup.

Fix the share popup to comply with the new design:
1. Black background.
2. Image is centered.
3. Share popup won't rotate automatically.

bug:6031042
Change-Id: Id77cb34ce79be6721ed27186aa97c19c0b66c07c
om/android/camera/ui/SharePopup.java
0dda459fa558543177898769b758de9fac852f0e 17-Feb-2012 Pin Ting <pinting@google.com> Merge "Refactor getPreferredCameraId()."
799f7ab6f88a52f080742acb6fb0a6380f751eab 17-Feb-2012 Pin Ting <pinting@google.com> Refactor getPreferredCameraId().

Change-Id: I85cc06ef71c9502ac01b6ffc0990ea607cfcf9f6
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
1859aaff81561d7bf0b28f6164839731f886c15d 07-Feb-2012 Angus Kong <shkong@google.com> Prevent unnecessary initialization of thumbnail.

Since all 3 modes (still camera, video camera, and panorama) use the same thumbnail, one static
object for passing the last generated thumbnail is more efficient. This change reduces the
initialization time by around 180 milliseconds when changing mode within camera app.
The loading of thumbnail from file also checks the Uri validity first before decoding the whole
bitmap.

bug:6008670

Change-Id: Iee2c6089b5a53fe2d4b3c8486bee1153f29a3fb3
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/ThumbnailHolder.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
d23ea169d3c6cec8833c662b4e14fb85238e71fc 16-Feb-2012 Angus Kong <shkong@google.com> Merge "Back key should dismiss the mode picker."
349cce43aded25a042c0d19b2f744cda24d0c967 16-Feb-2012 Angus Kong <shkong@google.com> Back key should dismiss the mode picker.

The mode picker is dimissed when back key is pressed.

bug:5490233
Change-Id: Iec6e07ed212eca56eb45c4dea1e6f80d81b1248e
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
d2157e20ae18987f830ab7585fbcec8551acd956 16-Feb-2012 Pin Ting <pinting@google.com> Merge "Fix Java warnings."
e3f5727ca2d9ae903357aa78123246b95aae93ba 16-Feb-2012 Pin Ting <pinting@google.com> Fix Java warnings.

Change-Id: I4fc14bb84529d38d22a47d0e8553abe9aa487113
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
4edaf0cbbb5d9cfeae786b6fd0560240947f6585 11-Feb-2012 Angus Kong <shkong@google.com> Refactor storage availability codes.

Fields and methods related to low storage hint is now moved to ActivityBase since both Camera and
Video Camera need to check the storage availability. The estimated number of available shots is not
needed and removed.

Change-Id: I3de6620851a435de430584b619ecd0c9a2d8901c
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
e5b6a36e64ef2c2cb1435c138a5fc179e9a6bc9a 09-Feb-2012 Wu-cheng Li <wuchengli@google.com> Do not let recent apps capture camera screen shots.

bug:5903209

Change-Id: Ib7ba23e560c78c67290321b74df103025cc0f42e
om/android/camera/ActivityBase.java
52eb422cdd1c23ea7979b1c692caf2dbdc7ad975 10-Feb-2012 Angus Kong <shkong@google.com> Clean up unnecessary getContentResolver() calls.

Change-Id: I5297ae26a6f1d2f74d7c60a452687a8c45208a22
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
575247fe3542ad2929d53da38daccd781a39ada0 08-Feb-2012 Angus Kong <shkong@google.com> Reduce redundant getResources() calls.

Change-Id: I9488ba2ec494388dbf87fb302589be3dd6239399
om/android/camera/panorama/PanoramaActivity.java
37520503313142d97051d9a3cb931de4445af8c8 06-Feb-2012 Angus Kong <shkong@google.com> Merge "Remove the unused sensor."
b61dd1bac92ac9e004af55310166be5065156d16 06-Feb-2012 Angus Kong <shkong@google.com> Remove the unused sensor.

The gyro is not used anymore.

Change-Id: Ie83b312730b47a66419e12eb253f9cc65c10bdc9
om/android/camera/panorama/PanoramaActivity.java
913f3784d368a5e11fee5d5db2c355ef832685da 03-Feb-2012 Wu-cheng Li <wuchengli@google.com> Fix warnings and remove unused code.

Change-Id: I1039edbc5a9990d44f5a629a18066805f370775e
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/CameraErrorCallback.java
om/android/camera/ComboPreferences.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
om/android/camera/OnScreenHint.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/RotateDialogController.java
om/android/camera/ShutterButton.java
om/android/camera/Storage.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/EffectSettingPopup.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingRestore.java
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/PopupManager.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/RotateLayout.java
om/android/camera/ui/RotateTextToast.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
om/android/camera/ui/StackLayout.java
om/android/camera/ui/TwoStateImageView.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
75aa8e0970c88c1ffbe30ea5cf50a3e1ad80c5f5 01-Feb-2012 Wu-cheng Li <wuchengli@google.com> Add some tests for camera, camcorder, and panorama.

- Restore default in camcorder.
- Camera open failure in camcorder.
- Test when the device has only one camera.

bug:5888633

Change-Id: If7410ceae1b55e514ffeab413981d35266a6128f
om/android/camera/CameraHolder.java
om/android/camera/ui/CameraPicker.java
f93198f838d047572a5cdeaa66668b060985b937 01-Feb-2012 Angus Kong <shkong@google.com> Fix PanoramaActivity stucks in native lib.

The semaphore in native lib is not initialized if camera device is not
successfully opened. PanoramaActivity thus hangs in onSurfaceChanged()
when calling native library using the semaphore.

bug:5949215
Change-Id: I9d1374489268562fcbc4761fc24c9cff4655f645
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
d930319db413933f1b043028ab52ed968ecf474c 01-Feb-2012 Chih-Chung Chang <chihchung@google.com> Lower the quality to 480p for effect recording even if high quality is specified in the intent.

Bug: 5733323.
Change-Id: I7fce3a85e17aba57f4180c8b3f0ae3bd855b3597
om/android/camera/VideoCamera.java
2a8827776f61ac223b79f0f0696e5644a1e376b1 20-Jan-2012 Wu-cheng Li <wuchengli@google.com> Do not allow switching to other activities during panorama capture.

bug:5541182
Change-Id: Icb1f315f6b49498a10866aef7d44b0715a304586
om/android/camera/panorama/PanoramaActivity.java
8205583ed0421027118c867d5def2d9ae5200a25 19-Jan-2012 Angus Kong <shkong@google.com> Add EXIF info for Panorama.

EXIF info added for tag: DateTime, GPSDateStamp, GPSTimeStamp.

bug:5766177
Change-Id: I1252d20ddc35a537c68c28c0bfd33f343047ae94
om/android/camera/panorama/PanoramaActivity.java
e4ac2363900cc8cd4df8379d620eda751b104ee7 19-Jan-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add test for restore default."
32108707f57e12a5ccb1ab023e83abf8e0086330 18-Jan-2012 Wu-cheng Li <wuchengli@google.com> Add test for restore default.

bug:5888633

Change-Id: Ib3db9b86d0da04d5aa4e5aae13eb2c466ba75aa8
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
f334ba2f68a8bb85ccc84d3b606c3cc59d046f80 18-Jan-2012 Angus Kong <shkong@google.com> Use orientation information before paused.

When no orientation information is found with the intent, use the orientation information before
paused.

bug:5814903
Change-Id: Id7533700a51e37ac3664bbb909747652b871d8ef
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
fe4fe32b015067c3f6ecc7335aa002df80708946 18-Jan-2012 Angus Kong <shkong@google.com> Revert "Add EXIF info for Panorama."

The fix for native jhead library broke the master build. Will try to fix this again after the native library is fixed.
This reverts commit 844c947928a245f34d2dfde76919ad92c458206d
om/android/camera/panorama/PanoramaActivity.java
844c947928a245f34d2dfde76919ad92c458206d 18-Jan-2012 Angus Kong <shkong@google.com> Add EXIF info for Panorama.

EXIF info added for tag: DateTime, GPSDateStamp, GPSTimeStamp.

bug:5766177
Change-Id: I9dda56e1faf1654d545d356eafbdf70490a965b7
om/android/camera/panorama/PanoramaActivity.java
d4a9655c22f41527ab4c814ecf17391a147edf2c 17-Jan-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add continuous autofocus UI."
c37a61cb34d5537cbfada6bfaf654081924093c1 15-Nov-2011 Wu-cheng Li <wuchengli@google.com> Add continuous autofocus UI.

bug:5534973

Change-Id: I2e7b8ee8bc098221c35ea024da696aba672c3379
om/android/camera/Camera.java
om/android/camera/CameraDevice.java
om/android/camera/FocusManager.java
om/android/camera/RealCamera.java
a4a767a10e5e3476b955e0e0f0a53d39a04b4d8a 05-Jan-2012 Angus Kong <shkong@google.com> Allow saving panorama after the activity is paused.

bug: 5541182
Change-Id: Iabef1b3bfa93af97071c565a04f9a871c234661c
om/android/camera/Thumbnail.java
om/android/camera/panorama/PanoramaActivity.java
1972b41cae3d62aa65480ab4de45f914d9fc28c5 09-Jan-2012 Wu-cheng Li <wuchengli@google.com> Do not gray out the icons when taking a picture.

In the very short time it takes to lock focus and capture, the icons
should not be greyed out. While they may be disabled for this time,
there is no need to display this to users. This is very visually
disruptive.

bug:5520610

Change-Id: Ie92eca6e6260299c9a872774303a5832b3379626
om/android/camera/ModePicker.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
08f2b0c990dc8306f9ce490aec16482fc0bdb64c 07-Jan-2012 Eino-Ville Talvala <etalvala@google.com> am 33747731: am d72992e0: Use default volume control stream instead of the music stream.

* commit '33747731e3957765f0639dcd1126b3f938187162':
Use default volume control stream instead of the music stream.
d72992e05197948b7b5bc96146362f6c6c5fcb46 06-Jan-2012 Eino-Ville Talvala <etalvala@google.com> Use default volume control stream instead of the music stream.

Since the Camera API is moving back to using the system audio stream,
do not override the camera app volume control stream any more.

Bug: 5778365
Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
om/android/camera/ActivityBase.java
8f2121c40495a38fbf58b03c5eb3dacdddbfb2a9 05-Jan-2012 akahuang <akahuang@google.com> Merge "Add border in viewfinder for photo capture."
ec38f8b0e662f945738ce31c7f70eb67300f960e 05-Jan-2012 akahuang <akahuang@google.com> Add border in viewfinder for photo capture.

bug:5420695
Change-Id: Id1d93cc84c3170a88d283679ad18dc453c4e0e80
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
0df0aaffd545037927574357965db037c6944172 04-Jan-2012 Wu-cheng Li <wuchengli@google.com> Do not show the small focus indicator for front camera.

Some front cameras are fixed focus. Do not show the small
focus indicator if users cannot choose other focus modes.

Change-Id: Ic311f4cb1c16c0910c085c1f0647dd945841d3c0
om/android/camera/Camera.java
e4d834211d8cf33dbaffe88aad7857fb251f95c8 04-Jan-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add a test to check camera fails to connect."
19c0b7882d14679bc0fe5d25c4e1ea34350d0b8d 22-Nov-2011 Wu-cheng Li <wuchengli@google.com> Add a test to check camera fails to connect.

+ Add CameraDevice interface.
+ Add MockCamera and RealCamera classes.

bug:5656411

Change-Id: I0cba855a4ac1a68b8e4aa2a56d1e58c6f1def459
om/android/camera/ActivityBase.java
om/android/camera/CameraDevice.java
om/android/camera/CameraHolder.java
om/android/camera/RealCamera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
686b13c9441f7edbd301cea9db291eb583e59931 03-Jan-2012 Wu-cheng Li <wuchengli@google.com> Merge "Remove brightness change to be consisten with other apps."
38e7f88993ece55252165940c471a031f87df55a 03-Jan-2012 Wu-cheng Li <wuchengli@google.com> Remove brightness change to be consisten with other apps.

It is strange to see brightness change going to or from the
gallery.

bug:5800702

Change-Id: I44215782ca127b1cc538c303401d32dfdcadb95c
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
4dd8240ccbe3dbe1e79b5b5dae871965df8c56b1 13-Dec-2011 Angus Kong <shkong@google.com> Reduce unnecessary creation of objects.

Change-Id: Id5a16b314ad561739d8063fbc66ce11c34e24e5c
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/PanoramaActivity.java
71e88239cee734b1153839ba9d744a244c0be602 22-Dec-2011 Wu-cheng Li <wuchengli@google.com> Revert "Track users behaviour in Camera app."

This reverts commit 862dc9ba03a2619fcbf8713103317ca5207e409a.
om/android/camera/ActivityBase.java
om/android/camera/AnalyticsTracker.java
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/SharePopup.java
862dc9ba03a2619fcbf8713103317ca5207e409a 15-Dec-2011 Chih-yu Huang <akahuang@google.com> Track users behaviour in Camera app.

At the first time, a confirmation dialog would appear.
In Camera:
Track settings when capturing photos and usage of share popup.
In Video:
Track setting about video effect, time lapse, and video quality.
In Panorama:
Track saving picture or discard, length of picture.

bug:4293199
Change-Id: Ie1d289bc2e2c7520db1ccdf4e07b7f55554cfb85
om/android/camera/ActivityBase.java
om/android/camera/AnalyticsTracker.java
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/OtherSettingsPopup.java
om/android/camera/ui/SharePopup.java
3b9a986afab957466f5b7e693709dbaf28d483bd 20-Dec-2011 Pannag Sanketi <psanketi@google.com> Resolving Backdropper heterogeneous background

On quick start-stop with Background replacement, there was an issue.
The runner would error out and the graph would restart. The preview
loaded faster than the background learner could finish learning,
and hence the user could start recording the video before the background
video loaded. The end result would be a video with some
frames that do not have the intended background.

Bug: 5623585
Change-Id: Idd24c6df7360267366bbd33b9d24b9b4439e55fb
om/android/camera/EffectsRecorder.java
1d772d2a3438d34b86212a5d379224eafaa0bb63 06-Dec-2011 Angus Kong <shkong@google.com> Prevent rendering without data from camera.

To fix issue that when unlock screen to return to panorama mode, we might see some random data
rendered on the SurfaceView. This issue is caused by renderer is called before the camera preview is
activated and thus no valid data is sent to the renderer.

bug:5698310
Change-Id: I1985a0ec946f39a13164cc962ccbafc4fd12259f
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
1fec59dbe402bfd439364a48e948ede8adfa31fb 06-Dec-2011 Wu-cheng Li <wuchengli@google.com> am 4da02059: Fix crash after restoring defaults.

* commit '4da02059e884dbef897f410861329acad96d46d4':
Fix crash after restoring defaults.
4da02059e884dbef897f410861329acad96d46d4 06-Dec-2011 Wu-cheng Li <wuchengli@google.com> Fix crash after restoring defaults.

After restoring defaults in camcorder mode, the indicator
control calls onSharedPreferenceChanged if record location
is on. onSharedPreferenceChanged is also called in the end
of restorePreferences.

With two onSharedPreferenceChanged calls in a row, the first
call notices effects have been disabled, and begins the
effect pipeline teardown in the background thread. Normally,
this would conclude in a few hundred milliseconds, and would
then restart regular preview.

However, with the second call to onSharedPreferenceChanged
coming in right after the first, the method no longer sees
an effect transition in progress (since current and new
effect are equal to none now), and thus just ends up
restarting preview. That attempt at restart runs into the
crash because the main SurfaceView has not yet been released
by the background effects thread.

To fix this, InLineSettingSwitch should not invoke the
listener when updating UI.

bug:5679133

Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe
om/android/camera/ui/InLineSettingSwitch.java
2865863f6a1887bda17e0a58a6a0f3aaac237cb6 29-Nov-2011 Angus Kong <shkong@google.com> Prevent unnecessary icon rotation.

The icons rotate when switching mode in Camera app. An initial orientation value is passed with the
intent to prevent this.

bug: 5575808
Change-Id: I5159c6a269a297016673c35d5082051ec87b1238
om/android/camera/Camera.java
om/android/camera/IntentExtras.java
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
om/android/camera/RotateDialogController.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/Rotatable.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/RotateLayout.java
om/android/camera/ui/RotateTextToast.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
9de21ebdc579dcc675a8a376383c460dc6886dd9 05-Dec-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix the NPE issue."
112a86bb154a5f4c0919f0350e48291439f36533 05-Dec-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5685507: Handle the case if a webcam is removed (in emulator)."
3b7501909e09071b319489520e17295ca982758a 05-Dec-2011 Chung-yih Wang <cywang@google.com> Fix the NPE issue.

Forgot to check if it is in intent mode.

Change-Id: I21cb5da2184afcfae4bc6fab75cac6b252d393af
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
40ffd9c0f81e20a482ca6832a8585ac5232370bf 05-Dec-2011 Chih-Chung Chang <chihchung@google.com> Fix 5685507: Handle the case if a webcam is removed (in emulator).

Change-Id: I485ade5c7f957d2c2d16c2f778aa7887659741a7
om/android/camera/CameraSettings.java
9d00d53fc326be452c3793aba476800649292a31 28-Nov-2011 Chung-yih Wang <cywang@google.com> Dismiss ModePicker selection if possible.

bug:5618255

When the ModePicker selection is popped and the touch is out of the
selection region, the selection should be dismissed.

Change-Id: Iceee3a76b7d179370b6291a3246641b94d035797
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
7c881ad57ef6e4e1a2ced01eefedbc6d5ecc4418 28-Nov-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE if the camera cannot be connected.

bug:5673972
Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9
om/android/camera/Camera.java
749d056cd82ebfe6e613596d9e22dd355aeeec41 21-Nov-2011 Chung-yih Wang <cywang@google.com> Dismiss open menu if exists.

bug:5648754
Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
90089f9eddde732725c43dcad07f4567ed8cb776 18-Nov-2011 Wu-cheng Li <wuchengli@google.com> Update camera sound API.

bug:5640219
Change-Id: Ic3af6527f3025ec04ba4be16b621b462f89953f1
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/panorama/PanoramaActivity.java
13c101cf7829c98da4341a39ecc142afc024cdb7 18-Nov-2011 Chih-yu Huang <akahuang@google.com> Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1
80583a299a9c8964cf09e482380c3bda0670ad6f 18-Nov-2011 Chih-yu Huang <akahuang@google.com> Fix NPE in panorama when camera failed to connect.

bug:5637587
Change-Id: Iea275b4e3780a41f4a0c3fe0845acbfdb1e95cd1
om/android/camera/panorama/PanoramaActivity.java
308eab755ffc14ec7aa754f93d88ce22dd9086a0 18-Nov-2011 Angus Kong <shkong@google.com> Merge "Fix OpenGL processing when activity is not active." into ics-mr1
0cefcea01849364be6955a1b3f7e7d1639010abc 17-Nov-2011 Angus Kong <shkong@google.com> Fix OpenGL processing when activity is not active.

bug:5624690
Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0
om/android/camera/panorama/PanoramaActivity.java
4d29bb4e32a2c0b1f58659e133caf2beaede8f55 18-Nov-2011 Wei Huang <weih@google.com> Merge "Rotate priority indicators according to the device orientation." into ics-mr1
0ca031ca9fef394f27b7cc9722ffc5a198cb964e 16-Nov-2011 Wu-cheng Li <wuchengli@google.com> Rotate priority indicators according to the device orientation.

+ Do not show flash indicator if it is off.

bug:5039279

Change-Id: I329b63d04f46fbe23f5ade3e4cacf446ce41f98c
om/android/camera/Camera.java
10a42f4b16bf43c686f10bfac5d879b46421fbb0 16-Nov-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix EffectsRecorder error path handling when ending recording." into ics-mr1
0e3f8387302b4aa882c20891f1faba74030f1a4f 16-Nov-2011 Eino-Ville Talvala <etalvala@google.com> Fix EffectsRecorder error path handling when ending recording.

Previously, if mRunner had already been set to null, errors sent by
mediarecorder would not be propagated to VideoCamera correctly. This
resulted in crashes when putting device to sleep right after starting
timelapse recording with effects.

Bug: 5627242
Change-Id: I3ae3c713a0aaf9a4507442bbbcd3ec89971d5f95
om/android/camera/EffectsRecorder.java
8ac93cfe05ce7fce703d7316ffb3edf19266548a 16-Nov-2011 Wei-Ta Chen <weita@google.com> Merge "Update the panorama capturing progress correctly." into ics-mr1
1947bdb7e2d82f6d1e8e53223dbcf62dfa9c61dd 16-Nov-2011 Pannag Sanketi <psanketi@google.com> Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1
0d0c3896bfe72cf058d74d92de97e4c0922254d3 16-Nov-2011 Wei Huang <weih@google.com> Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1
4ff0cffb08dc4ec6d8058e6a71edce72a39f138a 16-Nov-2011 Angus Kong <shkong@google.com> Merge "Broadcast for new image added in panorama mode." into ics-mr1
67bed66e355d37dd43a01f1d6f532d45dab18765 16-Nov-2011 Chung-yih Wang <cywang@google.com> Fix the ArrayIndexOutOfBound issue.

bug:5619774

It was caused by the error of the radian computation for rotation of
the indicator wheel. Originally we assume the angle of the first and the last
indicator in the second-level settings should be the same as predefined
angles. In fact, there was some computational error during rotation.

Change-Id: I508f42c5224170ac721562e20be8ed638485e023
om/android/camera/ui/IndicatorControlWheel.java
d22fff61ae44ea5213aeb91f400bfe1456411d25 16-Nov-2011 Angus Kong <shkong@google.com> Broadcast for new image added in panorama mode.

bug:5624740
Change-Id: I0663b34eb07e28e3f4e8b65b0c2c2befce3ca430
om/android/camera/panorama/PanoramaActivity.java
77665404048135a5a96d709378d6f55518b868e2 16-Nov-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE if the device has only one camera.

bug:5620872
Change-Id: I4ee2aa85e73c53d6a72f0839ed3bf31bc14c586e
om/android/camera/ui/IndicatorControlBar.java
2d3391e6be57aeeb7e713f25a484445660b101e3 16-Nov-2011 Wei-Ta Chen <weita@google.com> Update the panorama capturing progress correctly.

Fix an issue that the termination condition on the sweeping angle is broken.
Fix another issue that the panning speed and sweeping angle does not
consider the cases that users hold a device in portrait or panning the
device vertically.

Bug: 5623138

Change-Id: I9d1e2e5ad63a97beb8cfe2404974329c70d46991
om/android/camera/panorama/PanoramaActivity.java
948e75e8e3fd2ec98a08e65efdb6e5eb6d02c33b 16-Nov-2011 Wei-Ta Chen <weita@google.com> Merge "Set the orientation of a panorama image." into ics-mr1
55382a5b3e8baf34e71320ec36d72fc2c38b890e 16-Nov-2011 Pannag Sanketi <psanketi@google.com> Fix crash: camera swap w/ custom Background video

The background uri was not getting stored when swapping the camera
leading to a crash. Now it is sent via the intent.

Related Bug: 5585381

Change-Id: I05aea8321f0d2df96f646119eddd6a8b6a8ac668
om/android/camera/VideoCamera.java
a7a6a7822799f6630f127e931ac7f6e1cd3f685e 16-Nov-2011 Pannag Sanketi <psanketi@google.com> Merge "Start Effects Recording only after preview loads" into ics-mr1
e0bbb93f6a598206ecd6e09150d51eae64bd3507 12-Nov-2011 Wei-Ta Chen <weita@google.com> Set the orientation of a panorama image.

The panorama image returned from the panorama library is oriented based
on the natural orientation of the camera.
We set an orientation in its EXIF header, so that the image can be
displayed correctly. The orientation is calculated by compensating the
device orientation and the camera orientation respective to the natural
orientation of the device.

Bug: 5603313
Change-Id: Id6907cb08a7ff77e44736f3c3cd1503e7a68d783
om/android/camera/Storage.java
om/android/camera/Util.java
om/android/camera/panorama/PanoramaActivity.java
87e72ba9d89f8b83b1356f17077b9652346a29d4 15-Nov-2011 Pannag Sanketi <psanketi@google.com> Start Effects Recording only after preview loads

Start Effects Recording only after we get SurfaceTexture Callback in
EffectsRecorder, and
hence preview loaded. Disable the shutter button on creation, and
re-enable it on the preview callback. Else, one could potentially start
the recording before the preview loads, leading to a wrong state
information and an eventual crash.
Related Bugs: 5605173, 5605658

Change-Id: I2ed766997294c165ce6c262cf47f124493d0c5ec
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
f30e0fcdd498713b82f8ad0922baa4a8f030dcd9 15-Nov-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Switch sound playing to use Camera.playSound()" into ics-mr1
f3a22b8ec6f172831606598663dead220f76957b 15-Nov-2011 Angus Kong <shkong@google.com> Add location information in Camcorder mode.

bug:5560253
Change-Id: I090722d6755068fa4a70a900e18af28a1adc9bf1
om/android/camera/VideoCamera.java
34238165cfdf04584587360dfcf21109bf09e144 14-Nov-2011 Wei Huang <weih@google.com> bug #5612744: guard against NPE found by Monkey.

cl https://android-git.corp.google.com/g/#/c/149421/5 removed the null pointer checking. This leads to Monkey crashes. It seems that we either need to call initOnScreenIndicator() in onCreate(), or check for null in the updateXXXIndicator() methods.

I thought about moving initOnScreenIndicator() to onCreate(), but didn't want to introduce any latency for starting up the camera app.

Change-Id: I8b9fecb5eb77dc1afef9725fd3d3d4dbe5048c9d
om/android/camera/Camera.java
dae264eca3e139d73c1b45c511243ef94fc4d9d5 14-Nov-2011 Wei Huang <weih@google.com> Merge "Fix several UI bugs." into ics-mr1
c2b3d0008432c06ce43a4d93fa1fde1343a6dc65 14-Nov-2011 Wei Huang <weih@google.com> Merge "Fix too small panorama review on phones." into ics-mr1
562db5a0ec57f65cf4014ce3f7dad0f9324bb2f1 14-Nov-2011 Angus Kong <shkong@google.com> Fix too small panorama review on phones.

bug:5611399
Change-Id: I09c400d0faa7e5753a728f2a8ba9a8bc4fcf5a77
om/android/camera/panorama/PanoramaActivity.java
006baced4746ddaf31fbd170bcb76abc5f1f8325 10-Nov-2011 Chung-yih Wang <cywang@google.com> Fix several UI bugs.

bug:5575970

1. The cancel button of the background replacer message should be on the bottom.
2. The location of recording timer was too low in the landscape mode.
3. Fix the animation of the setting popup.

Change-Id: Ia2345e72efc0118cd0172af4bd6243815c602493
om/android/camera/ui/AbstractIndicatorButton.java
419d20ae123f53226ccefb7d28d8a40add8ffd0a 11-Nov-2011 Chung-yih Wang <cywang@google.com> Add a rotatable toast class.

bug:5575970

In order to show the toast in a landscape orientation with portrait
layout. The rotatable toast helper class is implementated and is also
applied for first-hint toast messages.

Change-Id: I942e87df1c1a4509d01cd41e2ecbdc2e2dfec049
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateTextToast.java
8d51fc281ca4e14c87eac278d153e162c0e1fcf2 11-Nov-2011 Pannag Sanketi <psanketi@google.com> Mirroring issue in Background Replacer

The MediaSource is set to rotate so that it adjusts to the
rotation of the device, and displays upright. The backdropper does not
have to do any rotation except for the mirroring in case of front
camera.
Bug: 5490654

Change-Id: Iaa3a82dd98f9cf428fb0d0b65e1175b31d37d2b1
om/android/camera/EffectsRecorder.java
b67c2c4982a01f72763a93c8e366cf713bca0918 11-Nov-2011 Wei Huang <weih@google.com> Merge "Add indicators of settings on the viewfinder." into ics-mr1
944f4a5584504d1eecb25107d54a55c48e9a2290 11-Nov-2011 Wei Huang <weih@google.com> Merge "Fix 5603781: The pressed state of close icon does not disappear." into ics-mr1
cb5679ca3e32e9020b5877f53d53fa91c1895de6 11-Nov-2011 Wei Huang <weih@google.com> Merge "Fix sometimes share icons disappear." into ics-mr1
aaf41bcd841e8b1de39d770ebf9fa59399a7826b 11-Nov-2011 Wei Huang <weih@google.com> Merge "Adjust share UI to full-width." into ics-mr1
204224ce0423e4a6a29fa015128131c71b9bb9d8 11-Nov-2011 Chih-yu Huang <akahuang@google.com> Add indicators of settings on the viewfinder.

Add exposure, flash, scene, white balance, and focus indicators.

bug:5039279
Change-Id: I7ef87ee35855030dbc8fdc2d4c52fa5d8b6549ba
om/android/camera/Camera.java
447399928346f0f2a826423511cb241cd89db407 11-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5603781: The pressed state of close icon does not disappear.

Change-Id: Ibd52cb5febf3a139d5007b6b2dd6adcb09934f99
om/android/camera/ui/SecondLevelIndicatorControlBar.java
ceea1b9d40b80c5e24a12ae0374afc053dad09fb 11-Nov-2011 Wu-cheng Li <wuchengli@google.com> Fix sometimes share icons disappear.

bug:5580133
Change-Id: I4f76ac8d03a54cfd7105e70ca4f1d643e01d3293
om/android/camera/ui/OneRowGridView.java
om/android/camera/ui/SharePopup.java
abd82edfae4ab1a39fe7000dd22b7cab26e9fdaf 07-Nov-2011 Angus Kong <shkong@google.com> Adjust share UI to full-width.

bug:5521011
Change-Id: I66aab65763224cbb66aa721d49d3e4ea916d8a58
om/android/camera/ui/SharePopup.java
om/android/camera/ui/StackLayout.java
450396c1c56565c8b9ec1ccafbdd36de2d6ce313 11-Nov-2011 Wu-cheng Li <wuchengli@google.com> Merge "Do not reset the focus if next snapshot is pending." into ics-mr1
72eaced345def3746038f1aba3efe2845b274884 10-Nov-2011 Wu-cheng Li <wuchengli@google.com> Do not reset the focus if next snapshot is pending.

+ Suupose autofocus is focusing and a picture will be taken when
focus callback arrives. Remeber the next snapshot request if
the shutter button is clicked.

bug:5589632

Change-Id: Ice8df7145f68996bd307fa5914e1c672bc624239
om/android/camera/Camera.java
om/android/camera/FocusManager.java
bba9566c7d74e80a53548853114a7512fb3d416f 10-Nov-2011 Wu-cheng Li <wuchengli@google.com> Merge "Reset mCurrentVideoUri to null before starting recording." into ics-mr1
685dd4346de0801b66a329b87c184c54096dc5b7 09-Nov-2011 Heechan Park <heech.park@samsung.com> Reset mCurrentVideoUri to null before starting recording.

While running monkey, we encountered a usecase where Video Recording is inProgress and an
intent to launch Panorama Activity came in. While switching StopVideoRecording failed and
resulted in Camera Exception (observed 3 times in 2 weeks of testing). mCurrentVideoUri
is not cleared, so the thumbnail of the last video is re-generated, which can take 3
seconds.

bug:5596264

Change-Id: Ie14c426c81c46f2d9a6741b6213cf66b1dbb5612
Signed-off-by: Braganza Sam Roberts<sam.braganza@samsung.com>
Signed-off-by: Heechan Park <heech.park@samsung.com>
om/android/camera/VideoCamera.java
91d70ce513ffee99b216f88a92650e1b63575289 02-Nov-2011 Chung-yih Wang <cywang@google.com> New ZoomControl UI for tablet.

bug:5349676
Change-Id: Ie1f4202d7f1d75978308ece4fbf486635cceead3
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
d628e27f561c4bedf0d457f64270fc12740b5280 09-Nov-2011 Eino-Ville Talvala <etalvala@google.com> Switch sound playing to use Camera.playSound()

Instead of using a few private APIs to properly manage audio output
for panorama, effects recording, and focus notification, use the new
Camera API for sound playback.

Bug: 5447107
Change-Id: I7d5a3d9502f36c199ea75a89e2c6b878185f880f
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/FocusManager.java
om/android/camera/SoundPlayer.java
om/android/camera/panorama/PanoramaActivity.java
4b9791ff6763d310c750892b774119ad750c512a 04-Nov-2011 Chih-yu Huang <akahuang@google.com> Change highlight pattern in indicatorbar.

Use the blue press state for all the icons in the setting bar,
fill the whole bar width with a square instead of blue arc.

Also make the share icon touch area larger.

bug:5521011
Change-Id: I2db26c41758d230e8455696346a90a33b7e3efb6
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
08ce47f0a87dac202bfe3b97a12d1d059a3c88f6 07-Nov-2011 Wei Huang <weih@google.com> Merge "Change effect settings popup styles." into ics-mr1
a39b9f613e4c8eedae407d6ba471a6a524e8d7eb 07-Nov-2011 Wei Huang <weih@google.com> Merge "Make dialog rotatable in Video mode." into ics-mr1
7cbd083b9491e488fb6190a54ad182efe6b923fe 07-Nov-2011 Wei Huang <weih@google.com> Merge "Fix the unresposible close button." into ics-mr1
8a71639b8a106021327f9d03798e617609103d56 07-Nov-2011 Wei Huang <weih@google.com> Merge "Prevent starting face detection twice." into ics-mr1
219f0da6a5dec8dc20dff909fcb0bf549b6a1219 07-Nov-2011 Angus Kong <shkong@google.com> Make dialog rotatable in Video mode.

bug:5575805
Change-Id: I6776f2b1d5a174a95ab40f8480110f0a34fb41e0
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
ef525b617650c1a6d5968e0ff5c539990705d67f 07-Nov-2011 Chung-yih Wang <cywang@google.com> Fix the unresposible close button.

bug:5575807
Change-Id: Ief2f51b363a5300989ae0fe7b047436b923a0386
om/android/camera/ui/SecondLevelIndicatorControlBar.java
c12e12365fc3b0b3b4718eced8f3dc6a776c0851 07-Nov-2011 Angus Kong <shkong@google.com> Make 40% opacity for disabled indicators.

bug:5521011
Change-Id: I150f754b9190e7034e75a3ab06cb0f5e8312cd31
om/android/camera/ui/ColorFilterImageView.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/TwoStateImageView.java
f78664a2246e7eac2b3c948b79b9d51a7de62965 03-Nov-2011 Chih-yu Huang <akahuang@google.com> Prevent starting face detection twice.

bug:5563371
Change-Id: I23231c4c629ab85f203470368d40d67c91e43db2
om/android/camera/Camera.java
0a039136e8e46ddbcb45b55e92d80ddb2ddfc2c2 03-Nov-2011 Wei-Ta Chen <weita@google.com> Fix an OOM issue in mosaic blending.

Set two limits on when we will do mosaic blending.
1) mosaic_width * mosaic_height < (5 * frame_width) * (2 * frame_height)
2) mosaic_height < 2.5 * frame_height

The latter limit rejects blending for the cases having too much movement
in the secondary direction.

Bug: 5554762
Change-Id: I05fb24bb1ff5446bea0cc1a1de8a02c37fb642d7
om/android/camera/panorama/PanoramaActivity.java
3300723ee68dfb28871fcf30864d2f73946ab660 04-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 93b9c8ac: Merge "5554028: Select video snapshot resolution based on the video recording aspect ratio." into ics-mr0

* commit '93b9c8aca92b2a6a651c562c71b8c414458c1419':
5554028: Select video snapshot resolution based on the video recording aspect ratio.
ee97c77fd2acae064e7ef4df63bf1323e2da81dd 04-Nov-2011 Chung-yih Wang <cywang@google.com> Merge "Fix 'back to the first-level when recording'." into ics-mr1
a2c8d40185095a1905f0063ebeb51ff62c0a0ab1 03-Nov-2011 Angus Kong <shkong@google.com> Change effect settings popup styles.

bug:5521011
Change-Id: Ia01bcbd8b1aa916406048b6890ab3439fe2f063a
om/android/camera/ui/EffectSettingPopup.java
530a0dee238412cbdff39bd64295c74f39cc782e 03-Nov-2011 Wei Huang <weih@google.com> Merge "Fix 5521540: UI Tweaks." into ics-mr1
19346d5702f5848167c16d71941e2c48cd17ed05 03-Nov-2011 Wei Huang <weih@google.com> Merge "The dialog for comfirmation is made rotatable." into ics-mr1
015c544e8a9fc7c63a8ab3b378fc85bf73b58113 03-Nov-2011 Wei Huang <weih@google.com> Merge "Adjust the orientation of mode picker in Panorama." into ics-mr1
dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3 03-Nov-2011 Chung-yih Wang <cywang@google.com> Fix 'back to the first-level when recording'.

bug:5395575

Originally we have the fix for back to the first-level when recording,
but it has another side-effect after merging the fix of icons overlapped issue.
This change will fix the issue and make sure the available indicator is
zoom control only during recording.

Change-Id: Ic674c0a2c92a88c2cd2a3586a703f27784415582
om/android/camera/ui/IndicatorControlWheel.java
ae557ecc220f9d491e8c65b1c895827fbedcdafe 02-Nov-2011 Angus Kong <shkong@google.com> The dialog for comfirmation is made rotatable.

bug:5481928

Change-Id: Ic9a34b0f9e8d920afa5aec36561892045480e18c
om/android/camera/Camera.java
om/android/camera/RotateDialogController.java
om/android/camera/panorama/PanoramaActivity.java
3a3fd8f6cf7c939cacbd3da09e80d3df074a00e4 02-Nov-2011 Angus Kong <shkong@google.com> Adjust the orientation of mode picker in Panorama.

bug:5561505

Change-Id: Iafd9e7ba4c60b4decae8f676ef2a1709cf54e5bb
om/android/camera/panorama/PanoramaActivity.java
da705aa1c8cbaaba105d9bc7799aef95c416a459 31-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5521540: UI Tweaks.

- draw fan-shaped semi-transparent area on the indicator wheel.
- change selected indicator color
- remove video mode black border
- set activity background to black
- update assets
- don't gray out unselected modes in mode picker (tablet)
- set ok/cancel icons to 32dp, font to 12sp bold

Change-Id: Iedc43dca29d1943965caf2d36cce176d8e509547
om/android/camera/ModePicker.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/ui/IndicatorControlWheel.java
b455c45a3fc04623bfd81573c8a88101a2afcceb 02-Nov-2011 Chung-yih Wang <cywang@google.com> Enable camera controls after wakeup.

bug:5516230
Change-Id: Ibf0ab46070af9440f3c7fbef116d65264db0ea7e
om/android/camera/Camera.java
1f56f129d65729705326f4d6852d760e6a5cacf5 03-Nov-2011 Chung-yih Wang <cywang@google.com> Merge "Back to the first-level when recording on Tablet." into ics-mr1
1d965984ecf6c6233967a1f5d5a24f21fd2e450d 02-Nov-2011 Chih-Chung Chang <chihchung@google.com> 5554028: Select video snapshot resolution based on the video recording aspect ratio.

Change-Id: I7b01a21271068b9d201e38197e2a61b183f87902
om/android/camera/Util.java
om/android/camera/VideoCamera.java
f060a6491f31e2e4b545ac6d71995074b969c7a2 02-Nov-2011 Chung-yih Wang <cywang@google.com> Fix the disabled icons overlapped issue.

bug:5515221
Change-Id: I9fe40f6492afdd8906ea2ad31839ec34f22a28b7
om/android/camera/ui/IndicatorControlWheel.java
a18e1141ed70a052d257a641c9a8b6f152a81d95 02-Nov-2011 Chung-yih Wang <cywang@google.com> Back to the first-level when recording on Tablet.

bug:5395575
Change-Id: I1493466068ce76dce957cd717a602939c66f138c
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
cd2256375a71ae4c19808d22c313d999cc750d0c 02-Nov-2011 Angus Kong <shkong@google.com> Merge "Change the default orientation to portrait." into ics-mr1
365dab37335c5c0a0ab97ad7ebb28e63046913b7 01-Nov-2011 James Dong <jdong@google.com> Merge "Replace hardcoded value with public API constant" into ics-mr1
d33109730e0ab81230f84e2bd35599e8e24fc4ba 17-Oct-2011 Chung-yih Wang <cywang@google.com> Change the default orientation to portrait.

bug:5446617

Since the orientation is mainly portrait on phones, the default
orientation of an application will decide if the window animation will
be played before it starts. In order to reduce the launch time of Camera
apps, this change is to skip the window animations by changing the default
orientation to portrait.

Change-Id: I6682ab408d7e8d1f0580f3c1600b6c9c3d6a7f6e
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/ControlPanelLayout.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/OneRowGridView.java
om/android/camera/ui/RightAlignedHorizontalScrollView.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
om/android/camera/ui/ZoomControlBar.java
abf79a3e25e6c631275e9f81424c0aa25ec9191b 01-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 4d55f6cb: Merge "Remove long pressing shutter triggers autocous." into ics-mr0

* commit '4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89':
Remove long pressing shutter triggers autocous.
4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89 01-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Remove long pressing shutter triggers autocous." into ics-mr0
be6fec51025dbaadf3f23467e0233d4fba50ad73 31-Oct-2011 Angus Kong <shkong@google.com> am 174b8b7f: Add forced sound for panorama mode.

* commit '174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d':
Add forced sound for panorama mode.
174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d 31-Oct-2011 Angus Kong <shkong@google.com> Add forced sound for panorama mode.

bug:5538024
Change-Id: I59b662a0cc53471ba905391c016c78ebd9ae1d73
om/android/camera/panorama/PanoramaActivity.java
7be69bb2c491505a61771effee9cbfaedb8f5344 29-Oct-2011 James Dong <jdong@google.com> Replace hardcoded value with public API constant

Change-Id: I711a6623208f95385a62c72aaec8d95e6e064b3d
related-to-bug: 5343832
om/android/camera/VideoCamera.java
a83a9a6b43682406f2332e6329ad0d90d175e7af 28-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am c3a0c2d4: Update recording orientation in more states.

* commit 'c3a0c2d4b7c1ec7bd8dc6190a0a68a6ff90cb629':
Update recording orientation in more states.
c3a0c2d4b7c1ec7bd8dc6190a0a68a6ff90cb629 28-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Update recording orientation in more states.

Once effects preview was started, no changes to recording orientation
would take effect. This results in incorrectly oriented videos for the
front camera, if the device is rotated after an effect is selected and
before recording is started.

Bug: 5531485

Change-Id: I0b59d72d446275f4a3b8dc7aabc98783efdd17cb
om/android/camera/EffectsRecorder.java
d6e5029b2df45210834334f7c2e99dfc85e962f0 28-Oct-2011 Chih-yu Huang <akahuang@google.com> Show video snapshot toast in first use.

bug:5494290
Change-Id: I7cb498ef50610d300a64d9d053b0a411d86da730
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/VideoCamera.java
60dc073ff3087af41f9cf3b738eaa74bb2212f95 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5310099: Accept an array of default values for ListPreference.

The reason we want an array of default values is some of them may
be unsupported on a hardware platform. The first supported value
in the array will be used as the default value.

Change-Id: I9e372304ec0eaea3181cf70c352a50b82d4b8c58
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ListPreference.java
bc85294715ce88c8378af3b77f7a0d27d7ceeaba 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5520611: Sleep after no interaction fow two minutes.

Change-Id: I33b38fa54302c0dbf98298e28c9457c9bf61bb7d
om/android/camera/panorama/PanoramaActivity.java
15402eff4f819bd0984ca8f2f6ea76ea0b92b326 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5520606: Should be able to deselect the effect selected to clear effects.

Change-Id: I41ea0d23b4ec83f5205fbe1324fb997a1d0971f3
om/android/camera/ui/EffectSettingPopup.java
a5a767ce09ee46f4b14ff797fab8a84d95dd862d 27-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix video capture intent preview alert for effects." into ics-mr1
30e2c49eedfbce51be7458161829a750f809d56d 27-Oct-2011 Wu-cheng Li <wuchengli@google.com> Remove long pressing shutter triggers autocous.

autoFocus behavior has changed in CAF. The focus callback
will not return immediately if CAF is scanning. There is
no need to have long pressing behavior.

bug:5514415

Change-Id: Iacf14fa3ad48b03c79122296a74e7511c41ea62f
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ShutterButton.java
4c7b291018e08dbb4bc1712d95117a294fa1416c 26-Oct-2011 Wu-cheng Li <wuchengli@google.com> Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.

+ Move tablet resource to sw600dp and sw800dp

bug:5446617

Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628
om/android/camera/ActivityBase.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/Util.java
om/android/camera/ui/ControlPanelLayout.java
8069c9ee96a8cd5a374b9dca01f6c2919388d085 27-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Make Panorama work in portrait layout." into ics-mr1
86bace6c94d86cd662f7bff7a58e90dd43577bb4 27-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix camera app still opens the camera in lock screen sometimes." into ics-mr1
6b3a61edf6cfc87473ad8e97c39988260d2e2a3a 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5489985: Handle the exception when the external volume has not been added to MediaProvider." into ics-mr1
d32aa042a7d7fdb52cd8cec571e7c648f837eaff 19-Oct-2011 Wei-Ta Chen <weita@google.com> Make Panorama work in portrait layout.

Add the support of both portrait and landscape layout to the panorama library.
Add a step into the preview renderer that rotates the content in the
offscreen buffer by 90 degrees in the case of a portrait layout.

Change-Id: I879e3476daac522b0c8b27fe3ef5b17ebf0797e3
om/android/camera/panorama/MosaicRenderer.java
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
14a3ffc328740e8fd4734dfa124e4682df8bdd4a 20-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add portrait support to effects pipeline in VideoCamera.

Needed to enable app to switch to portrait for startup speed. Still
supports landscape for landscape-native devices.

Bug: 5446617
Change-Id: I9853ff50d9fcd8cf53cc6e65d6c16319c1b27f76
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
8853039421ae9b129ef40c8e71a347eac321d921 24-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix camera app still opens the camera in lock screen sometimes.

Suppose camera app is in the foreground. If users turn off and turn
on the screen very fast, camera app can still have the focus when the
lock screen shows up. Now the camera app will not open the camera as
long as screen is locked.

bug:5491362
Change-Id: Idf2a1b160c94abb889729e0525c9903b62f12dd0
om/android/camera/ActivityBase.java
80efb2ecfb09db1ac0915b13a91165d06bfbee74 26-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5489985: Handle the exception when the external volume has not been added to MediaProvider.

Change-Id: I5bb9e59d5b1dae4c3980f624d38194fbb514d7fa
om/android/camera/Storage.java
b11ee09d99c9a817eade2ee502a0ff4727f15c8f 24-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Fix video capture intent preview alert for effects.

In effects mode, stopping video record is asynchronous, and dealing
with alerts and thumbnails has to be deferred until a done callback
from the effectsrecorder.

Bug: 5494625
Change-Id: Ic343b672c29515cb77f62b8d3e685d668681fdd1
om/android/camera/VideoCamera.java
b8bd7ee0f8b0c3e0381ae6364bbeca4f28bdf7a4 25-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr0' into ics-mr1
6f311d0bd4bf8dd8df62e656f737a9e369b3db3d 24-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add missing state check in EffectsRecorder startup path." into ics-mr0
07b77037f2f5aa28d6d3188f78588dc7f2d49398 24-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add missing state check in EffectsRecorder startup path.

When starting up, the EffectsRecorder gets a callback when the effect
filter graph provides an input SurfaceTexture. This callback was not
checking the EffectsRecorder state correctly, and if stopPreview was
called on the EffectsRecorder between startup and before the callback
fires, the callback would improperly reset the recorder state,
resulting in NPEs down the line.

Bug: 5493458
Change-Id: If552b7c0ea82e1506f0b22eb5fa0447c1ca4adf8
om/android/camera/EffectsRecorder.java
7ac1bccdef292bf84bf9d7e40d432a466c39663a 24-Oct-2011 Wei Huang <weih@google.com> Merge "Fix video thumbnail is not displayed when intent passes the fd." into ics-mr0
eb47ed18eb3eec902d1ce18d20530e296bd83d9e 24-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix video thumbnail is not displayed when intent passes the fd.

bug:5494625
Change-Id: I2bc482c05b9ca47bb566e351746a6e4dccdd6111
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d 24-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix startFaceDetection RuntimeException.

Sometimes startFaceDetection is called twice and exception
is thrown.

Reproduction steps:
1. Set screen lock to none.
2. Start camera app and press power key to turn off screen immediately.
3. Start camera app.

bug:5497940
Change-Id: I3337d70e473943f5306cb459ce79c0faa45b77af
om/android/camera/Camera.java
83abe885d9809c1404a1f7e17537ee9a9c61fb57 21-Oct-2011 Chih-yu Huang <akahuang@google.com> am 048edf2e: Fix focus area in front camera.

* commit '048edf2ef22607b85bc4b062e2af71804f5b3530':
Fix focus area in front camera.
048edf2ef22607b85bc4b062e2af71804f5b3530 21-Oct-2011 Chih-yu Huang <akahuang@google.com> Fix focus area in front camera.

Front camera preview is mirrored. Change to use matrix to
calculate the focus area. So the focus area will be
correct in all orientations in front or back camera.

bug:5446617
bug:5461028
Change-Id: I2d39a22cd9f034c5028843ca3d4abe0f9962f18a
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/Util.java
om/android/camera/ui/FaceView.java
f5ba96adb5d72f9cac77ff21614f54e0d2bbb795 21-Oct-2011 Jim Miller <jaggies@google.com> am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.

* commit '7d9eadd0c6c38b3761b7e8d3fa3658d194810d60':
Fix 5491362: don't open the camera in onResume in lockscreen.
7d9eadd0c6c38b3761b7e8d3fa3658d194810d60 21-Oct-2011 Jim Miller <jaggies@google.com> Fix 5491362: don't open the camera in onResume in lockscreen.

Change-Id: I678dd23f1603647e801c339a557fc08b53dbfa38
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
57c4f8965fe9331235a777bd729745d1caf6347a 21-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am cfc9bcc6: Fix race condition in preview startup.

* commit 'cfc9bcc6dc56135d905ffdaaf1b9838cf12a1558':
Fix race condition in preview startup.
cfc9bcc6dc56135d905ffdaaf1b9838cf12a1558 21-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Fix race condition in preview startup.

A small window of time exists between starting preview and the graph
getting fully configured, in which stop preview calls would be
incorrectly ignored. Add a new state to effectsrecorder to reflect
reality a little better.

Bug: 5493458
Change-Id: I76542b6970186c288ec908f3bb558217fd7d00e8
om/android/camera/EffectsRecorder.java
b636db196377712807d81ecd34770d07f4b0706e 21-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 74ec1a36: Merge "Effects: shut down camera preview when unexpected graph closures occur." into ics-mr0

* commit '74ec1a362dc1ddc7835fcfb2a578e3d8f58e6355':
Effects: shut down camera preview when unexpected graph closures occur.
58cede9e3e8004f6be9731e9cb9a135238a2efd8 20-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Effects: shut down camera preview when unexpected graph closures occur.

If the graph runner needs to shut down a graph due to an error, previously
the surface texture connecting the camera to the processing graph would get
released before camera was told to shut down preview. This led to various
abandoned surfacetexture errors in the camera HAL, sometimes including
native crashes.

Now properly uses the SurfaceTextureSource callback to detect unexpected
graph shutdown to clean up the camera before the SurfaceTexture is released.

Bug: 5451833
Change-Id: Id130c1e5deb27cffab335affaa1ed55f04c260a5
om/android/camera/EffectsRecorder.java
4cba085e1394742afd1f367f461faf6d0dbca73e 20-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 7b9a10fe: Merge "Fix effects orientation handling." into ics-mr0

* commit '7b9a10fef160cd452f7905ee52f7b9ac2262faf5':
Fix effects orientation handling.
7b9a10fef160cd452f7905ee52f7b9ac2262faf5 20-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix effects orientation handling." into ics-mr0
30dae69d0ec4daae57177bc8fd352c3c810b3171 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 71d40934: Merge "Fix camera app crash when failed open the camera." into ics-mr0

* commit '71d40934176ee23be9a91ca0aa33656e1cce8ce6':
Fix camera app crash when failed open the camera.
62546767541adbce7672f678bdaa26bbf22d9b64 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> am cf2f19fb: Merge "Fix AE and AWB lock were incorrectly unlocked during autofocus." into ics-mr0

* commit 'cf2f19fb053bfe7f39c552b67ffdfc72119ab2d1':
Fix AE and AWB lock were incorrectly unlocked during autofocus.
3607e8834aa3ae20a78c55f3d59686617df0efdf 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 27c97af5: Reduct latency by starting face detection after preview is displayed.

* commit '27c97af52157672f6201215d2e07497ff6361a8e':
Reduct latency by starting face detection after preview is displayed.
71d40934176ee23be9a91ca0aa33656e1cce8ce6 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix camera app crash when failed open the camera." into ics-mr0
cf2f19fb053bfe7f39c552b67ffdfc72119ab2d1 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix AE and AWB lock were incorrectly unlocked during autofocus." into ics-mr0
43083162b9ac8faf83a393cccaaf661d45ae2a8e 20-Oct-2011 Angus Kong <shkong@google.com> Fix camera app crash when failed open the camera.

bug:5488657
Change-Id: If22aca555b3f83ea754a67018feea69d6e97031b
om/android/camera/Camera.java
27c97af52157672f6201215d2e07497ff6361a8e 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> Reduct latency by starting face detection after preview is displayed.

bug:5446617

Change-Id: I3ddbf269ab882360206fecb59f67ff894b950422
om/android/camera/Camera.java
51b06d6696a4743339d026b3b3bd282645725b27 20-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Fix effects orientation handling.

Effects orientation was incorrectly using the
CameraInfo.orientation field to adjust for true down for face
detection, background replacement, and effects recording video
orientation.

The input surfacetexture from the camera already takes
the orientation into account in its transform matrix, resulting in
incorrect rotation amounts.

Bug: 5488310
Change-Id: I4c4105c44d361ca245874a47e4ff7b93cbd3bb06
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
53be34deae057cfa297c3ee73eee91f880272650 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix AE and AWB lock were incorrectly unlocked during autofocus.

The only actual difference of this patch is not to unlock AE
and AWB when the state is STATE_FOCUSING_SNAP_ON_FINISH.

bug:5483130

Change-Id: If5108ef3c3677ebed96a291a505408ebfdc4668e
om/android/camera/Camera.java
om/android/camera/FocusManager.java
67668bc2d1433d40437ae8ae320a9533fb47bae9 20-Oct-2011 Pannag Sanketi <psanketi@google.com> am e0b66a87: Merge "Support for max duration recording with effect" into ics-mr0

* commit 'e0b66a87432f452bf4a10ef5e0d835113a8ab69d':
Support for max duration recording with effect
247c37b0b7cd29d58dc96322c993437674636977 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 0c1ec7e8: Fix the resolver activity shows the apps that cannot play the video.

* commit '0c1ec7e8cd43de1a4b4cb650b759dd0cbe123eaa':
Fix the resolver activity shows the apps that cannot play the video.
e0b66a87432f452bf4a10ef5e0d835113a8ab69d 20-Oct-2011 Pannag Sanketi <psanketi@google.com> Merge "Support for max duration recording with effect" into ics-mr0
0c1ec7e8cd43de1a4b4cb650b759dd0cbe123eaa 19-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix the resolver activity shows the apps that cannot play the video.

Camcorder apps needs to set the mime type to play the captured video
in video capture intent mode.

bug:5471592
Change-Id: I104baa4ff789fa8bb3136254105bc7284f391723
om/android/camera/VideoCamera.java
7c278bcad6d4cdf7eb4b8e3c0803e65bc671cebd 20-Oct-2011 Wu-cheng Li <wuchengli@google.com> am eeeea93f: Reset the video effect when camcorder application starts.

* commit 'eeeea93f90ff788a3d86e1e3bb2bb4725adff9ee':
Reset the video effect when camcorder application starts.
eeeea93f90ff788a3d86e1e3bb2bb4725adff9ee 19-Oct-2011 Wu-cheng Li <wuchengli@google.com> Reset the video effect when camcorder application starts.

On video recording, if a Background effect is applied,
it is strange to see the popup window the next time the camera app
is opened.

bug:5477191

To reproduce:
-Open camera;
-Select Video recorder;
-Select settings>Effects>Background;
-Activate a background effect;
-The pop-up ("Place your device...") comes out;
-Effect is active;
-Press Home;
-Select the Camera app again;
-The pop-up is triggered again. The app is in background effect mode.

Change-Id: Iea44d7ef2243df5dec961e5ecf67e85b5e971dcb
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
db1596dc704d2085a3f2f7b5652e6cb43696c265 20-Oct-2011 Pannag Sanketi <psanketi@google.com> Support for max duration recording with effect

Related to Bug: 5472397

Change-Id: I3634b1c9248da24eb82ff825fe52f4262e59d0e7
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
fb97d6b5b215eb98bdbf52dd0ce732ba7e887036 19-Oct-2011 Mark Wagner <mxw@google.com> am f9f24d4c: bugfix 5479807 Video preview displaced to right when orientation changed

* commit 'f9f24d4c578a01cb09a7e5c4c66b75595d3669ee':
bugfix 5479807 Video preview displaced to right when orientation changed
f9f24d4c578a01cb09a7e5c4c66b75595d3669ee 19-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5479807 Video preview displaced to right when orientation changed

Three changes:

(1) center the play button over the thumbnail
(2) leverage the existing mechanism for scaling the image for video
thumbnails which want to be 4/3
(3) use center_crop for video previews so that they properly align
in the ui. Not doing so means we were getting black bars at the top
and bottom which was wrong.

Change-Id: Ifc416455d03136a393239487db07493dc27f151e
om/android/camera/ui/SharePopup.java
0042b3b48b693a46030ec02f31df625b767e4977 19-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 7b52266b: Merge "Add hysteresis to orientation rounding." into ics-mr0

* commit '7b52266b6f9af570f1fdb200a1d0fa7947344e1a':
Add hysteresis to orientation rounding.
7b52266b6f9af570f1fdb200a1d0fa7947344e1a 19-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add hysteresis to orientation rounding." into ics-mr0
131cf9886c4f34431598be0b1f5b7aaa915277cc 18-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add hysteresis to orientation rounding.

This prevents fast flickering between two orientation states, which
can result in ugly UI issues, especially with the preview thumbnail.

Bug: 5477483
Change-Id: I9513547207ae1918066c1a19947c974eaad72e24
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
fdea7c43e7b48e39cc0c8fb588bada0d6cb5c71a 19-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 53d86908: Merge "Use video capture intent quality when recording with effects." into ics-mr0

* commit '53d86908dc3e1cb54add568aa6bc325485e3efe5':
Use video capture intent quality when recording with effects.
53d86908dc3e1cb54add568aa6bc325485e3efe5 19-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Use video capture intent quality when recording with effects." into ics-mr0
3deae58131c486165f4b05869e5785d8cbbad4ef 19-Oct-2011 Chih-Chung Chang <chihchung@google.com> am 55efc325: Fix 5480562: Set indicator orientation after video recording is stopped.

* commit '55efc325fc17b911ed1d2a252ea82d995eca2360':
Fix 5480562: Set indicator orientation after video recording is stopped.
55efc325fc17b911ed1d2a252ea82d995eca2360 19-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5480562: Set indicator orientation after video recording is stopped.

Change-Id: Ic7bd5fe93d38bbe1c291dc9eee82a5aefcfa7c3a
om/android/camera/VideoCamera.java
a9b3f482c555729ee87daa2055eec19f1290e1e0 19-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Use video capture intent quality when recording with effects.

Previously, effects always used 480p quality. When used for messaging,
the intent requests a lower quality, and it needs to be used instead.

Bug: 5465146
Change-Id: Ib2ae772de35ad84b8c19f961c71fd9ae43dd4426
om/android/camera/VideoCamera.java
5ac0a79b20fdd2c7955b1f2478b70a7828d55f22 19-Oct-2011 Pannag Sanketi <psanketi@google.com> am 967d36c0: Merge "Add timelapse recording support to effects mode." into ics-mr0

* commit '967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5':
Add timelapse recording support to effects mode.
967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5 19-Oct-2011 Pannag Sanketi <psanketi@google.com> Merge "Add timelapse recording support to effects mode." into ics-mr0
d979079aa0735beb302dd58797af0c6b600edfea 13-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add timelapse recording support to effects mode.

Bug: 5452088

Change-Id: I87c69e715ccdd6c48f18ecaa1fb4f362e2a9d567
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
0d4b8bd024837c2a30ee70e5e71c6e674c6b579a 18-Oct-2011 Wei-Ta Chen <weita@google.com> am 66188959: Fix getting an empty thumbnail in reviewing panorama.

* commit '66188959498860c8b43ab7b9119c7b5c890c83dc':
Fix getting an empty thumbnail in reviewing panorama.
66188959498860c8b43ab7b9119c7b5c890c83dc 18-Oct-2011 Wei-Ta Chen <weita@google.com> Fix getting an empty thumbnail in reviewing panorama.

The sample size for generating a thumbnail should be calculated in a way
that also considers the case of a portrait image, i.e., height > width.
The SharePopup should also puts the thumbnail of a portrait panorama in
the center of the thumbnail view.

Bug: 5411488

Change-Id: I5e86a91829de77f4694c039bd871e6831f3906cb
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/SharePopup.java
1508ab60efb9264484ab8811dee256944e4885d7 18-Oct-2011 Wei Huang <weih@google.com> am d7a60abb: Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0

* commit 'd7a60abbee203872df4b5ab9a873e7efad80e239':
Disable Thumbnailview when Panorama capture is inProgress.
d7a60abbee203872df4b5ab9a873e7efad80e239 18-Oct-2011 Wei Huang <weih@google.com> Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0
af327d0b5571a9bcddd3f8d69ec25dd4fc59e5b7 18-Oct-2011 Wei Huang <weih@google.com> am ff55f519: Merge "Lock AE and AWB before autofocus starts." into ics-mr0

* commit 'ff55f519629fbe839fe051108b396565403d696e':
Lock AE and AWB before autofocus starts.
ff55f519629fbe839fe051108b396565403d696e 18-Oct-2011 Wei Huang <weih@google.com> Merge "Lock AE and AWB before autofocus starts." into ics-mr0
ad805f2cad2d846790252eed337c638bf4a8c0d8 18-Oct-2011 Wei Huang <weih@google.com> am e4a29ba9: Merge "Fix the NPE in onPause()." into ics-mr0

* commit 'e4a29ba9b6e04a0e708d3653ecba927968d8da59':
Fix the NPE in onPause().
e4a29ba9b6e04a0e708d3653ecba927968d8da59 18-Oct-2011 Wei Huang <weih@google.com> Merge "Fix the NPE in onPause()." into ics-mr0
2532dba74a0de4558e1cb22bee1d636d95ff1d08 18-Oct-2011 Chih-Chung Chang <chihchung@google.com> am b3548b65: Merge "Fix 5454202: make the UI work even if there is no goofy face effect." into ics-mr0

* commit 'b3548b653b277eabe2214396f2e9dbfe19eb6082':
Fix 5454202: make the UI work even if there is no goofy face effect.
b3548b653b277eabe2214396f2e9dbfe19eb6082 18-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5454202: make the UI work even if there is no goofy face effect." into ics-mr0
a35b699f49b33253684a2937f0448903230d755d 18-Oct-2011 Wei Huang <weih@google.com> am 046b8ced: Merge "Use calculated frame offset instead of gyroscope." into ics-mr0

* commit '046b8ced839d1b04c32d1207fe53f7639d69453b':
Use calculated frame offset instead of gyroscope.
046b8ced839d1b04c32d1207fe53f7639d69453b 18-Oct-2011 Wei Huang <weih@google.com> Merge "Use calculated frame offset instead of gyroscope." into ics-mr0
fc86176be4d413322e738e0e0b961e2b075dda2b 18-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 136c335a: Fix 5472996: NPE in switchToOtherMode.

* commit '136c335a69069bbb07af1a842acc4629c3131139':
Fix 5472996: NPE in switchToOtherMode.
d991766dc3bcc03a02c6648e2cfd54ee4f8cbd9e 18-Oct-2011 Angus Kong <shkong@google.com> Use calculated frame offset instead of gyroscope.

bug:5359162
Change-Id: I319e9d54e08a2d711dc63bafa2593d6d68ef06fb
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
136c335a69069bbb07af1a842acc4629c3131139 18-Oct-2011 Wu-cheng Li <wuchengli@google.com> Fix 5472996: NPE in switchToOtherMode.

Change-Id: Ied128d3cf5e8ee632c46f371aeaa0a42bb2f1cb5
om/android/camera/Camera.java
4a3026b84fa4fd403317b30b6a9db61125fecfa2 15-Oct-2011 heech.park <heech.park@samsung.com> Disable Thumbnailview when Panorama capture is inProgress.

Step 1: Go to Camera
Step 2: Change to Panorama shot
Step 3: Capture
Step 4: During capture tap on the album quick view
Step 5: Observe that we are able to view album from quick view while capturing as panorama shot.

bug:5475248

Change-Id: Ia74906e4a4c6b8b04e96724f76f98a37eaeb3189
Signed-off-by: Braganza Sam Roberts <sam.braganza@samsung.com>
om/android/camera/Camera.java
om/android/camera/panorama/PanoramaActivity.java
9cae606ce029cdcdc7534c164582c065e4241bb9 18-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5454202: make the UI work even if there is no goofy face effect.

Change-Id: I6e498dac31538a1af57e2c79d5df3519f2ab57da
om/android/camera/ui/EffectSettingPopup.java
bcb097dbf1319edc84ae9bed51fa30b3ae6e3fd1 21-Sep-2011 Wu-cheng Li <wuchengli@google.com> Lock AE and AWB before autofocus starts.

Now camera API specifies autofocus does not lock AE and AWB.
So the application locks AE/AWB when focus starts.
AE/AWB are unlocked when focus finishes or preview starts.

bug:5441274
Change-Id: Iddf21a413234bc3569187f4696d54099c362d008
om/android/camera/Camera.java
24db47192bfa37ac77b0be474b3ad9d8c0366e78 18-Oct-2011 Chung-yih Wang <cywang@google.com> Fix the NPE in onPause().

bug:5474906

We changed the order of onCreate. mLocationManager can be null if the
app fails to open the camera.

Change-Id: I31d3af5717ee320b6fb108db7f6c129355b366d9
om/android/camera/Camera.java
1920cca5077e15dbfedd85226d7b496d53276d75 18-Oct-2011 Wei Huang <weih@google.com> Merge "fix auto merge issues."
d943c5973495d0caa0f32662b98a8d9e82223092 17-Oct-2011 Wei Huang <weih@google.com> fix auto merge issues.

Change-Id: I0374abc65a037ebc61e340f2eace6a119436d1c8
om/android/camera/VideoCamera.java
66f54530c7d1022c63ee3e2c0b0b32be21fd174e 17-Oct-2011 Pannag Sanketi <psanketi@google.com> am 9c96da0c: Fixing size limit error on video capture intent with effects

* commit '9c96da0c452cf980eb368cbb5a63afc4ab5f4bc4':
Fixing size limit error on video capture intent with effects
993df346a7b7ec781699e927472399421c743670 17-Oct-2011 Mike Dodd <mdodd@google.com> Fix build.

Change-Id: If6b2622e565e3bf736fe6968f1c90fa462ba5d89
om/android/camera/VideoCamera.java
1e8525a9f111d2548fdbba291b1d99f77626611a 17-Oct-2011 Rodrigo Carceroni <carceroni@google.com> am f3d505af: Merge "Bug 5383077: handle video thumbnail generation correctly when effects are on" into ics-mr0

* commit 'f3d505afe66e0961e904027e8ab98455ccd3bd2e':
Bug 5383077: handle video thumbnail generation correctly when effects are on
267bccfc197cdb2eaa44a0a96c8138863d1cc0bc 15-Oct-2011 Eddy Talvala <etalvala@google.com> Merge "Remove code introduced by mistake in MR0" into ics-mr0
5eb38c132c1345741d48a2c6e58c63a32ca02a78 15-Oct-2011 Rodrigo Carceroni <carceroni@google.com> Remove code introduced by mistake in MR0

Change-Id: Ic6dc692e703e04960e9a1f0d28d1ca2d59fc05ab
om/android/camera/VideoCamera.java
5a3b94b72e6c807b0f88bca11d4e8a4a41761cde 15-Oct-2011 Rodrigo Carceroni <carceroni@google.com> resolved conflicts for merge of f3d505af to master

Change-Id: Ic7e9fdcb874b9c41e332c7e2c1bf896fd52b0b11
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
9c96da0c452cf980eb368cbb5a63afc4ab5f4bc4 14-Oct-2011 Pannag Sanketi <psanketi@google.com> Fixing size limit error on video capture intent with effects

There was a problem with size limit using video capture intent with the
effects on. The video would not recorded. This fixes that error, though
the limit seems to be reached very soon (~5s).
Related to bug: 5441217

Change-Id: I1ea372840831c8d0852368cb99fd2edecf1a3083
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
094db3868a6f18d9ea2c4268b32214a02a62908c 14-Oct-2011 Chih-yu Huang <akahuang@google.com> DO NOT MERGE: Change low storage threshold in video to 50MB.

bug:5334604
Change-Id: Iefc6a20ace2c7afbbc2cb7b3acf5ac957b4f16be
om/android/camera/VideoCamera.java
4fa3d1bd4a30011d84edc5201ad64314a0a79186 14-Oct-2011 Wei Huang <weih@google.com> Merge "DO NOT MERGE" into ics-mr0
37cd6529b6a876d01fe2306e375687cd9a0a0c45 14-Oct-2011 Chih-yu Huang <akahuang@google.com> DO NOT MERGE

Change low storage threshold to 50MB.

bug:5334604
Change-Id: I410bcf7322c71d1ca25d3de36d574616411b5533
om/android/camera/Camera.java
om/android/camera/Storage.java
f3d505afe66e0961e904027e8ab98455ccd3bd2e 14-Oct-2011 Rodrigo Carceroni <carceroni@google.com> Merge "Bug 5383077: handle video thumbnail generation correctly when effects are on" into ics-mr0
77db815c740427774423e8dc8256a1f2ce68aeca 14-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am f3b7efa2: Disable AE/AWB locking when shutting down effects.

* commit 'f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c':
Disable AE/AWB locking when shutting down effects.
caf8466dcdf6d6c496e46961bb3132126363ef83 14-Oct-2011 Rodrigo Carceroni <carceroni@google.com> Bug 5383077: handle video thumbnail generation correctly when effects are on

Change-Id: I94d63c99dd8b8a488f5c8d660c592bc34d1b7360
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c 14-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Disable AE/AWB locking when shutting down effects.

Bug: 5463413
Change-Id: Idcd338adc5835e5a211e977b22a090e9dd2dfe4a
om/android/camera/EffectsRecorder.java
866908eb2c744c03b9035725d8450bca5e435be4 14-Oct-2011 Pannag Sanketi <psanketi@google.com> am e3fd1952: Merge "Fixing crash in video capture intent with effects on" into ics-mr0

* commit 'e3fd19525c55e58025faa0508c16fd410a159a5f':
Fixing crash in video capture intent with effects on
e3fd19525c55e58025faa0508c16fd410a159a5f 14-Oct-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing crash in video capture intent with effects on" into ics-mr0
7e6b690c96b36b134d6825562b4ae66e055ba6a8 03-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Set logging in effects recorder back to normal. DO NOT MERGE.

- Cherry-pick of change in master.

Bug: 5404515
Change-Id: I3757e5ae2a032182ffe323e0cb0352b008f78181
om/android/camera/EffectsRecorder.java
dca2af0a95ccb682d57bcea43f03fb01b929edf3 14-Oct-2011 Pannag Sanketi <psanketi@google.com> Fixing crash in video capture intent with effects on

The video capture intent sends an uri and not a filename. Adding
support in the EffectsRecorder and VideoCamera for uri. The
effectsrecorder passes that on to the MediaEncoderFilter.

Related to bug: 5441217

Change-Id: I784a6c3b53a586950adcc07a6e26659838ae3cbc
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
be0e8423b2aa485b0eca98e00a6dd6d0525c0d0a 14-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Set logging in effects recorder back to normal."
7ecbbadc3e459a05519c39cb3d2e8e6907daa4d9 14-Oct-2011 Chung-yih Wang <cywang@google.com> am 6bfe6df5: Improve the launch time.

* commit '6bfe6df5ea40684d56f4736da76b5680515f05ae':
Improve the launch time.
6bfe6df5ea40684d56f4736da76b5680515f05ae 14-Oct-2011 Chung-yih Wang <cywang@google.com> Improve the launch time.

bug:5446617

Since there are two major blocking operations(openCamera and startPreview)
which are dependent and time-consuming, we have to take advantage of
this blocking intervals to do the layout inflation(setContentView) and indicator
initialization concurrently to reduce the launch time.

Change-Id: Ibbc3563ad3e8ccea409f61a5af9a8bdae0352579
om/android/camera/Camera.java
4d9d7387eed740a51f56e4bfe063ee8c0d2a4460 14-Oct-2011 Chih-yu Huang <akahuang@google.com> Change low storage threshold in video to 50MB.

bug:5334604
Change-Id: Iefc6a20ace2c7afbbc2cb7b3acf5ac957b4f16be
om/android/camera/VideoCamera.java
7f7401e54e51feb2e2aabc2535f3c6543d08653a 14-Oct-2011 Chih-yu Huang <akahuang@google.com> Merge "Change low storage threshold to 50MB."
a5edbe951a507a066f7601204e633dbd2dff3224 14-Oct-2011 Chih-yu Huang <akahuang@google.com> Change low storage threshold to 50MB.

bug:5334604
Change-Id: I410bcf7322c71d1ca25d3de36d574616411b5533
om/android/camera/Camera.java
om/android/camera/Storage.java
3ebe49d8f1b4defb7cfd4850a14e795aada2ebd1 07-Oct-2011 Chih-yu Huang <akahuang@google.com> Rename function "setDegree" to "setOrientation".

bug:5244256
Change-Id: I6f5c96a5e1fefab5fa09a12fd3a0cf169bcbc6f5
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/RotateLayout.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
1003bbc8bfa6dd241af7bbb5f124a9940ba4cc32 13-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 6baaa42a: Merge "Play a sound when starting and stopping recording with effects." into ics-mr0

* commit '6baaa42a5bb88fdae55efa8dc6b7805b187f1d02':
Play a sound when starting and stopping recording with effects.
6baaa42a5bb88fdae55efa8dc6b7805b187f1d02 13-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Play a sound when starting and stopping recording with effects." into ics-mr0
39fab0d2a861eb5d102593eb63a40304b8129e8b 13-Oct-2011 Eino-Ville Talvala <etalvala@google.com> am 3069cb81: Merge "Add video stabilization management to the application." into ics-mr0

* commit '3069cb81151aa984cab6ba8cc2d944b43099efba':
Add video stabilization management to the application.
3069cb81151aa984cab6ba8cc2d944b43099efba 13-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add video stabilization management to the application." into ics-mr0
334099a31b84b4dc2f9bf4d38ccef2f048ec8e61 13-Oct-2011 Wu-cheng Li <wuchengli@google.com> am 1bca5eaa: Simplify code about ShutterButton.

* commit '1bca5eaaa3c6d3fd36df572546715e4e515cf9e6':
Simplify code about ShutterButton.
9108f02b6eb3df368aa1a665150bc8dd1475bdc2 13-Oct-2011 heech.park <heech.park@samsung.com> am 73ab0023: Implemented full scan AF followed by capture on long pressing the shutter button.

* commit '73ab0023b4a9d86ac5fa844116a83aa6c52acf0c':
Implemented full scan AF followed by capture on long pressing the shutter button.
1bca5eaaa3c6d3fd36df572546715e4e515cf9e6 13-Oct-2011 Wu-cheng Li <wuchengli@google.com> Simplify code about ShutterButton.

bug:5447399
Change-Id: I240d7523509f27d333a0ef69e6e0d3228a41e9de
om/android/camera/Camera.java
om/android/camera/ShutterButton.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
73ab0023b4a9d86ac5fa844116a83aa6c52acf0c 13-Oct-2011 heech.park <heech.park@samsung.com> Implemented full scan AF followed by capture on long pressing the shutter button.

1. In CAF, do full scan AF followed by capture on long pressing the
shutter button.
2. Capture is triggered only if long press is released on the button.

bug:5447399

Change-Id: I9c7d75d76074e2e20d1f1926388315cec2c22eed
Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
Signed-off-by: Sam Braganza <sam.braganza@samsung.com>
Signed-off-by: heech.park <heech.park@samsung.com>
Signed-off-by: heech.park <heech.park@samsung.com>
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ShutterButton.java
041f6bb7cb0ae5da34eab67e82825ac2fde10b87 13-Oct-2011 Angus Kong <shkong@google.com> am ac65f661: Merge "The orientations use right angles in Panorama." into ics-mr0

* commit 'ac65f66171c9ff18b2c9f24fd4deae64ccf6fc93':
The orientations use right angles in Panorama.
87412bf98591aa08c7981f271932d469da8d3f86 13-Oct-2011 Angus Kong <shkong@google.com> am ef011a1e: Cancel the mosaic computation when paused.

* commit 'ef011a1e479f8e801318eba2dccb50fac1590d3c':
Cancel the mosaic computation when paused.
ac65f66171c9ff18b2c9f24fd4deae64ccf6fc93 13-Oct-2011 Angus Kong <shkong@google.com> Merge "The orientations use right angles in Panorama." into ics-mr0
ef011a1e479f8e801318eba2dccb50fac1590d3c 13-Oct-2011 Angus Kong <shkong@google.com> Cancel the mosaic computation when paused.

bug:5447804
Change-Id: Id8e3a9d0c140b572fa76cbe9cfb38abc6b53d871
om/android/camera/panorama/PanoramaActivity.java
07d5f8c27d144f7e72820b48fe5cb08f691435ad 12-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add video stabilization management to the application.

- Still image mode: Disable vstab if it is supported
- Camcorder mode: Enable vstab if it is supported
- Camcorder with effects: Disable vstab when using
background replacement, enable otherwise

Bug: 5440224
Change-Id: Ibb9744b601d9bb122618e5eeaec00f50ee54cbee
om/android/camera/Camera.java
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
fb71fba09059cc3399d563f16a5c9fafe95c75ec 12-Oct-2011 Pannag Sanketi <psanketi@google.com> am bb6fcb0f: Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0

* commit 'bb6fcb0f4d2a694b0d9af472d7444c653592a99e':
Handle MediaRecorder stop exception for effects recording
bb6fcb0f4d2a694b0d9af472d7444c653592a99e 12-Oct-2011 Pannag Sanketi <psanketi@google.com> Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0
c2151f208379162fc1572b3125d3972ec8a8b1f2 11-Oct-2011 Pannag Sanketi <psanketi@google.com> Handle MediaRecorder stop exception for effects recording

When recording videos with the effects ON, if user starts and stops the
video in rapid succession, MediaRecorder stop can throw an exception,
which we want to be treated separately than other runtime exceptions
thrown by effectsrecorder.
In this particular case, the idea is to keep the app running without crashing.

Currently, all "Stop" exceptions will lead to the same behavior.
In future, we might need to work out the details more to find out
what caused the stop to crash and pass that up from the native layer
and react according to the cause of the exception.

Change-Id: I35a961d6cf4fc3cc3ca66870ea80ee16316f0728
om/android/camera/VideoCamera.java
ec82b6d3c009c773baefbb81289e33d298524135 12-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5422126 Panorama needs to load the thumbnail from the file"
82dd2a3b7ba88a3ea051d2b3960310891a243dad 10-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5422126 Panorama needs to load the thumbnail from the file

This change makes Panorama closer to Camera in the way the Thumbnail is
loaded. But the Camera has a pretty different startup sequence so you
should review this to make sure it's correct.

Note that doing any IO on the UI thread can lead to ANR so we should
consider making the thumbnail load from an async task instead.

NOTES:

In camera the sequence is like this:

Thumbnail.loadFrom
initThumbnailButton
initializeFirstTime
FIRST_TIME_INIT message
onResume, surfaceChanged,

So we initiate the call to Thumbnail.loadFrom via onResume or surfaceChanged.

I removed the call to "updateThumbnailButton" from onStart to make this closer
to what we do in Camera.

Change-Id: I86283acbc9355f077d2966a018a3b972efe1c08c
om/android/camera/panorama/PanoramaActivity.java
6b3bf91285a2916f939724629aa054a2bf7149c0 12-Oct-2011 Wei Huang <weih@google.com> Merge "Clearing Time Lapse string on Preview screen when Restore option selected" into ics-mr0
22400adc90877480c3229d0ee86df9a6736c66cd 12-Oct-2011 Angus Kong <shkong@google.com> The orientations use right angles in Panorama.

The original orientation is represented in 0, 1, 2, and 3. Now we use the right angles to ensure the
consistency with Camera.java and VideoCamera.java.

bug:5447850
Change-Id: I4bc97d4f5b76c8ae297da550b5097b38bd0cefea
om/android/camera/panorama/PanoramaActivity.java
fde9af6fc5d524727ec883fd819793fded1717e8 12-Oct-2011 Raji Reddy Kandi <rajireddy.k@samsung.com> Clearing Time Lapse string on Preview screen when Restore option selected

Steps:Camcorder->select timelapse interval->select effect->Restore Defaults.
issue: Time lapse string is stil shown on preview screen.

bug:5447893

Change-Id: Ia579cb74dc8ea9f53231cc42dd4c209bf0fc7b14
Signed-off-by: Padmanaban R <padhu.r@samsung.com>
Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
om/android/camera/VideoCamera.java
3681d0503694ace9674800395929ac429be9590a 11-Oct-2011 Wu-cheng Li <wuchengli@google.com> Do not call cancelAutoFocus after stopPreview. (do not merge)

API did not define if cancelAutoFocus is allowed after stopPreview.
Work-around this before there is a conclusion.

bug:5397951
Change-Id: I5a23f02ac646b3f2a070d0d06847de3899484a72
om/android/camera/Camera.java
85a5556fb58f1cdc016f5afe5e07cbe1b419ffd8 12-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Play a sound when starting and stopping recording with effects.

Normally, CameraService takes care of this, but with the effects
recording, CameraService doesn't know when recording is toggled on and
off. Mirrors the code in CameraService.cpp in terms of enforcing audio
output.

Bug: 5383166
Change-Id: I2175c1090ff57884d17cb422532a7930f29e10de
om/android/camera/EffectsRecorder.java
om/android/camera/SoundPlayer.java
69e105dbd0d7693ac753dc5c15fa3def65cc31e4 12-Oct-2011 Evan Millar <emillar@google.com> More bg training polish.

Make training modal by placing a semi-transparent view behind the
message panel to prevent interaction with the rest of the camera UI.

Use the framework dialog asset as the background asset for the message
panel. Since this asset is not public I had to copy it into the Camera
package.

bug:5225962
Change-Id: Ief97f545c6c0bb3695a056481d5e6d56d44edf25
om/android/camera/VideoCamera.java
73ad6a2afa0e66c0984ced0d91b5cc2b42dd0661 11-Oct-2011 Evan Millar <emillar@google.com> [DO NOT MERGE] Add orientation switching and cancel button to bg training panel.

-I also changed some calls to GridView.ClearChoices() to explicit
setItemChecked(..., false) calls because of bug 5439410.

bug:5225962
Change-Id: Ie764a209bc9647db8522efd38609c8ed383b5d0b
om/android/camera/VideoCamera.java
om/android/camera/ui/EffectSettingPopup.java
895573a418f0304e312ae9645a37f85d443bfa3a 11-Oct-2011 Chung-yih Wang <cywang@google.com> Merge "Remove redundant operations for zoom control."
b2bb1a1245be62222eb02f09f350b2e77b7bf67c 06-Oct-2011 Chung-yih Wang <cywang@google.com> Remove redundant operations for zoom control.

bug:5441257
Change-Id: I660a8fb4edc81134a611597f46a95e7e23dabbcd
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/ZoomControlBar.java
b0e8c4a25504bc9ffdc8c48b724230d4d41d83a6 11-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5429468: Append _1, _2, etc to the file name in the same second."
ee740f1254232cbe5b8dd34c0c957866c03e7787 11-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5429468: Append _1, _2, etc to the file name in the same second.

Change-Id: I68ca915eee4e343fa1b90fef068fecb9c919aa53
om/android/camera/Util.java
26d88fce15a24362644123af5f0cce79ea572e7b 04-Oct-2011 Chung-yih Wang <cywang@google.com> Add content descirptions for accessibility.

bug:5230109

Change-Id: I055fccea0d30c54dc8520bf1d0424b963d2ba8a5
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControl.java
a44cfbaf741b5410465cbfe6a4907eb38e0db001 08-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5290450 Share UI should match redlines

Add the "go to gallery" button at the top of the list of share
choices. Made it a separate button rather than part of the list
since it gets it's own separator.

Change-Id: I62f866f7aedd3e84916eccf037f3fa37a8528196
om/android/camera/ui/SharePopup.java
4e5736ca54605455304142fbd680045228904601 07-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5290450 Share UI should match redlines"
5201b1e0051877d8e8ed0ef5b461ffcac534eb5c 06-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5290450 Share UI should match redlines

Incremental work towards matching the redline. This will probably
require a review pass from UX to catch any missed items.

Change-Id: I0496aa0fc1941f8ffa06050ae8fbed3fe7246878
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/SharePopup.java
9d80a29af1ed57eded5d20af51ef5e704b32b452 07-Oct-2011 Chih-Chung Chang <chihchung@google.com> Remember the snapshot request when the previous one is still in progress.

Change-Id: I6916f775c1143a87c326e5450dfbdaf3008bc3b7
om/android/camera/Camera.java
om/android/camera/FocusManager.java
d534023dbdb0470163f79aa40beb1f00b28fe378 07-Oct-2011 Chih-yu Huang <akahuang@google.com> Merge "Let review icons rotatable."
c5bc067250fad1a246ea22604260d01aab627ba4 07-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Do not restart preview if only the size of the surface changes."
94ca8baae7e6e3885d895c095890eabf30d922e2 07-Oct-2011 Chih-yu Huang <akahuang@google.com> Let review icons rotatable.

bug:5244256
Change-Id: Ieed6119f22598a34eeb1672d07f55a876dced791
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/Rotatable.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/RotateLayout.java
3ba647bff45d0dabb23067486005952d32097d4c 07-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Allow user to adjust the focus and shutter sound volume."
f41e094f3ddd07db3c011250e635ffc880a099ac 07-Oct-2011 Wu-cheng Li <wuchengli@google.com> Do not restart preview if only the size of the surface changes.

This speeds up the below case:
1. Start camera app.
2. Power off the screen.
3. Power on the screen.
4. Slide the center to the left to start camera.

The camera app is already started behind the lock screen. When the
lock screen closes, the camera app now just call setDisplayOrientation
again. Camcorder app is more complicated because it has effects.

bug:5422679

Change-Id: I26d89c97edefe7f46d0ae51759ff791ea43c7cac
om/android/camera/Camera.java
3e5f954de2bcb7df695b069b18c8b6083accb19d 06-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5371242: Reduce shot-to-shot time by moving image saving to another thread.

This is a follow-up change to add more comments and limit the queue length.

Change-Id: I1aded7a87be2657a6527d924d188fb3f479ca87a
om/android/camera/Camera.java
8608b577921acf67a5a7b7968cb3633b8f94714d 07-Oct-2011 Chih-Chung Chang <chihchung@google.com> Allow user to adjust the focus and shutter sound volume.

This also fix the problem that user need to slience the ringer to
silence the focus/shutter sound.

Change-Id: Ia4ae5feb4926172fd8af7dc4023525f2ab7daa0e
om/android/camera/ActivityBase.java
om/android/camera/SoundPlayer.java
d5bc2383782a06ef824856ea5712ca64f138d5fc 06-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Properly mirror video for front camera effects recording."
773388257b4ade20f21449b3c9d1945067a8c03f 06-Oct-2011 Wei Huang <weih@google.com> Merge "WIP: Speed up shot-to-shot time by moving image saving to another thread."
8e74e273f87b6f144fa68fe8d98bc34b5c45af3a 06-Oct-2011 Chih-Chung Chang <chihchung@google.com> WIP: Speed up shot-to-shot time by moving image saving to another thread.

Change-Id: I4e7d1d8921caf28f06696d58737274de26f8adc4
om/android/camera/Camera.java
66c52372aee1f7997ce4a0a852d63bd63c148c6f 06-Oct-2011 Chung-yih Wang <cywang@google.com> Merge "Use hardcoded value for QUALITY_TIME_LAPSE_QVGA."
02462c6bebe4af262936096540f08c6de56e04b7 06-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Change focus sound."
1acf35ce296efc6b3ad823a9500f79f71c545201 06-Oct-2011 Wu-cheng Li <wuchengli@google.com> Change focus sound.

bug:5401870

Change-Id: Ifb5c61ad52489c0b8fb711ba6ada624f20f0e880
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/SoundPlayer.java
a6237b99ec53f93209f5af3594c98af5abb8a951 06-Oct-2011 Chung-yih Wang <cywang@google.com> Use hardcoded value for QUALITY_TIME_LAPSE_QVGA.

bug:5377739
Change-Id: I42026cb9ed06329482fc0bc6717cb8ea7e7f1fa0
om/android/camera/VideoCamera.java
739a5ff8a554729a6637cb042889b9c17be6b9b2 06-Oct-2011 Wei-Ta Chen <weita@google.com> Show a toast while taking a video snapshot with effects on.

Show a toast when a user tries to take a video snapshot while the
effects are on.

Bug: 5350124
Change-Id: I09092e01a0864db7e48d94e09dc643d17f6b7528
om/android/camera/VideoCamera.java
2c2550bd42c614330a3c968bda005ac23d12f8d1 05-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Properly mirror video for front camera effects recording.

- Incoming transform from camera SurfaceTexture is mirrored
for front camera
- Recording preview needs to be mirrored, but the recorded
video needs to be unmirrored.

Bug: 5408479
Change-Id: I0cdb29151ae20b02f690fb976e5a29e594c094a1
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
1ea2431debf771dd6d8a31b7945cedad332c102e 05-Oct-2011 Wei Huang <weih@google.com> Merge "Always show gray focus indicator in continuous autofocus mode."
7f1b0d66edd09a4cb218ecc1255a8d48f5c18a60 05-Oct-2011 Wei Huang <weih@google.com> Merge "Add time lapse label for Phone UI."
a7a50a45c75585e350eb730574b1e531468e8b18 05-Oct-2011 Wu-cheng Li <wuchengli@google.com> Always show gray focus indicator in continuous autofocus mode.

+ Do not play focus sound in CAF.

Now CAF does not do a full scan. It returns failure most of
the time. It is strange to show red indicator.

bug:5219431

Change-Id: Ie914180e7132f29c8365dcccf810a7787bbf0d54
om/android/camera/FocusManager.java
2fc09f97eceef3659572d695cadd791b4dcfd19c 05-Oct-2011 Chung-yih Wang <cywang@google.com> Rearrange the second level indicator set.

bug:5360827

+change the icon spacing to 16dp
+Store the geodata in the video.

Change-Id: I133871066b6b9a8918f861f0510e3996d5b0f839
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
e4d0a72cbc4633497c393019ff2c57e63b1039b9 05-Oct-2011 Angus Kong <shkong@google.com> Add time lapse label for Phone UI.

1. The behavior on tablet UI and phone UI now is the same.
2. The recording time and time lapse label now always stay on the top-left corner (even when in
portrait).

bug:5394916
Change-Id: Ifa5013748dbdda3a6c0083569ec3c565b4c687eb
om/android/camera/VideoCamera.java
2aa8185ae2efbafd7e4efd65fdf798819058c600 05-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix display of preview thumbnail after recording video."
b4d98e8e64d606beea6e131efbdee4f3cb8416a3 04-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5340803 Deleted panorama still shown."
07abd8b392209c5136462807c055c2abd448dd0b 04-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5388221 Last captured (photo, video, panorama) thumbnail disappears in panaromic mode"
8b084a607d0b207272d5c87fecbb5d33cbef1b4f 04-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5340803 Deleted panorama still shown.

Second part for this fix. 139755 has the first half.

Change-Id: I9268bf3bb1a604f369fdf6056cb8a7dcd47b3632
om/android/camera/panorama/PanoramaActivity.java
2170cdf91c4486443ecfacf5b7622bd3255df61c 04-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5244268 Remove animation of mode-picker and thumbnail in Panorama"
9a7cba43937e7c74ebd9778bca40afc89145e3e1 04-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5388221 Last captured (photo, video, panorama) thumbnail disappears in panaromic mode

Change-Id: I6dc31868870e27ea2c8446deb1cbb430bafe44ca
om/android/camera/panorama/PanoramaActivity.java
23884e94e2a2bdad2e803db0931482717434a9b6 04-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add support for rotating background video based on device orientation."
2512c685868eadb274f5be8cd71068078b1f5ddd 04-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5244268 Remove animation of mode-picker and thumbnail in Panorama

Change-Id: I7172e104db252ad1200812771ab2890733af4847
om/android/camera/panorama/PanoramaActivity.java
b416f542580970aeac320219b80137b1e9f8d4cd 26-Sep-2011 Mike Dodd <mdodd@google.com> Fix display of preview thumbnail after recording video.

The first was that the code was trying to rotate the video thumbnail
retrieved from MetadataRetriever back by just reversing whatever
rotation we set as a playback hint when we started recording. But
this isn't actually correct -- the bitmap we get back from MetadataRetriever
is going to be oriented correctly for display if the device is oriented
in the locked UI orientation (landscape), and we need to rotate it
to compensate for what the actual device orientation is relative to
that.

Phrased another way, we were taking into account the camera and
device orientation, but not the UI orientation. This just happened
to work on some devices because of their camera orientations, but not all.

bug:5360349

Change-Id: I8b481907c211328726ecd91fa054b9e9a4798601
om/android/camera/Util.java
om/android/camera/VideoCamera.java
d5ec81fea464e1f9db3cb06f7db3de3cf2e3be94 01-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add support for rotating background video based on device orientation.

Bug: 5355973
Change-Id: I5c0145a717c22b9423341988b90c4962ad333337
om/android/camera/EffectsRecorder.java
d27335ef95e26282737a07188a883cec4a7ea743 03-Oct-2011 Wu-cheng Li <wuchengli@google.com> Merge "Revert "Lock AE and AWB before autofocus starts.""
dace9de3dae5f89dd226782f3a16147e6c6a95b7 03-Oct-2011 Wu-cheng Li <wuchengli@google.com> Revert "Lock AE and AWB before autofocus starts."

This reverts commit d5b2118fc4aa377a3c4f5e4052745f14ec78b2c4.
This commit incorrectly calls setParameters during autofocus.

bug:5365121
Change-Id: If039e56390bfb94c518a3381001095bce050de7e
om/android/camera/Camera.java
44d4035047c92c151ea96764d16562d7d5e3a8a0 03-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Set logging in effects recorder back to normal.

Bug: 5404515
Change-Id: I3757e5ae2a032182ffe323e0cb0352b008f78181
om/android/camera/EffectsRecorder.java
d519d3bff76107eda37dfc81b6d1a7c6e0091e42 03-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Temporarily increase logging verbosity to help track down crashes.

For bugs: 5388119, 5388011, 5397146

Change-Id: I6f7c8d526629bb63f3d026a702fc944902c35c8f
om/android/camera/EffectsRecorder.java
7867aba2ba13f0eb70bc23fba2fcbaf45f9c90ab 03-Oct-2011 Marius Renn <renn@google.com> Merge "Initial fix for bug 5357970: Camera now handles errors during effects recording."
ff7106e9609981e79ba183b839223df392deefcf 28-Sep-2011 Angus Kong <shkong@google.com> Fix recording time label in portrait mode.

bug:5039042
Change-Id: I61dd597b0b71566a00eb1cca45ea0b3e3019fac6
om/android/camera/VideoCamera.java
2bbd7e182f25816008262f2e2bd9a1a08392c913 03-Oct-2011 Chung-yih Wang <cywang@google.com> Fix the UI issue during video recording.

bug:5395575

Start recording when 2nd level settings are open, it should return to
1st level controls during recording with zoom control only displayed
When recording is stopped continue to display 1st level controls -
settings and switch camera icons reappear.

Change-Id: I502f2486c764dce8baa35cd45e00cd324930c894
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheelContainer.java
575b49275691f5b539fe2c6dfde1741645dc3e93 30-Sep-2011 Raji Reddy Kandi <rajireddy.k@samsung.com> Issue: panorama preview is rotated 90 deg after lock and unlock.

Fixed.panorama preview is rotated 90 deg after lock and unlock. Its fixed.

Change-Id: Ibc5e3d18a56b3900c0715a3aeb7f345ccc476fca
Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
870d55b7ed96b842f4e0ee5ac2160643adf34794 30-Sep-2011 Chih-yu Huang <akahuang@google.com> am bd29d3c5: Use smaller focus area and larger metering area.

* commit 'bd29d3c5d59b375d77334aaa426545dc781b95fd':
Use smaller focus area and larger metering area.
bd29d3c5d59b375d77334aaa426545dc781b95fd 30-Sep-2011 Chih-yu Huang <akahuang@google.com> Use smaller focus area and larger metering area.

Change the length of focusIndicator to 1/4 of height.

bug:5371513
Change-Id: I1a242b9caec9c59c4d6ce2cd70fcf6d4e55dcfc9
om/android/camera/Camera.java
om/android/camera/FocusManager.java
140f7d8b0b3b9133eed0b06cbb6bcf0cadc4a714 30-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Remove mContext varaibles in Views."
d59bc1c6339fab062e1ed837a4132fd1ceb522aa 30-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the single popup issue."
757459bc8ded7e5708d8ad99ff38a3cb41904640 30-Sep-2011 Chung-yih Wang <cywang@google.com> Remove mContext varaibles in Views.

Since mContext is already a protected member in View, we should reuse it
instead.

Change-Id: I7bad94a8e7aabc6c4141be8950a867ff70e63731
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/InLineSettingRestore.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsPopup.java
5f6e354a6e2a77aa935fcefeb33a9baa67d48aaf 29-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the single popup issue.

bug:5169941

Popups should not persist when another is opened.
+Rename the confusing PopupChange listener.

Change-Id: Idca3218c090c8d9d176dbb97d8077dcc27409368
om/android/camera/ActivityBase.java
om/android/camera/ModePicker.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/PopupManager.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/SharePopup.java
175d7d64e2990e92eb1609f8f706b6f568b22800 29-Sep-2011 Wu-cheng Li <wuchengli@google.com> Reset zoom UI in onResume.

Zoom value was reset to 0, but the UI was not updated.

bug:5390413

Change-Id: I16ef04012c13f4e9acbbf44a957e01960570f4bc
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
d97adb8f99e522a613d484d9d5725dd84921489f 29-Sep-2011 Marius Renn <renn@google.com> Initial fix for bug 5357970: Camera now handles errors during effects recording.

For now, the camera front-end deletes the recorded file and then continues
to throw the exception upwards. Recovering from this situation gracefully
will require more work and testing.

Change-Id: I98814d5143090f1bc7b92561fd7aae58b3a166a6
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
10bc9cb3578d877c8e3eb944e0c4282b1ba1b0c6 29-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix ModePicker selection UI."
ea312297ff6132bbafed99b90a72e4858b888fa4 28-Sep-2011 Angus Kong <shkong@google.com> Add dimension attributes to MediaStore.

1. Width/height of still images added.
2. Resolution of videos added.

bug:5376821
Change-Id: I809743ae777e6bbc01e3a86651e7cd6489a81c86
om/android/camera/Camera.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
46f4430b50ba8ca8b04b698d45d9ca2d4513121d 28-Sep-2011 Chung-yih Wang <cywang@google.com> Fix ModePicker selection UI.

bug:5353407

-The mode icon should be highlighted when tapped, not after the mode
picker has animated closed.

Change-Id: I6ff29acb2952653c2b6ebde447e160e202fd7fc6
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/VideoCamera.java
c159dfe54fbc0f055a1d760f1614db4a8bcec94c 28-Sep-2011 Angus Kong <shkong@google.com> Change the option menu items for Crespo.

bug: 5164126
Change-Id: I63014a3ffc24f734b08ff45e485951347c83800f
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
0cb21101b367711759dc94c6b1c0de8cdb0414a3 28-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix crash when starting up Camcorder mode." into ics-factoryrom
5ac801c1d8474a148570a64347394c710612e167 28-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Fix crash when starting up Camcorder mode.

When having previously used 'pick from gallery' background replacement,
and then starting camcorder with the effect still selected, a crash
would occur due to references to not-initialized UI elements.

Bug: 5382973
Change-Id: Iccc64d1cecdc29b1138a12f339e5505b39c4d13c
om/android/camera/VideoCamera.java
a91df49eb460aec8bcae4169e7d29ddc7f9ac3ec 28-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Make sure correct GL context is active when tearing down effects.

Previously, filter graph teardown occured in the wrong GL context,
resulting in UI corruption and likely the failure to properly release
filter resources.

Bug: 5353684
Change-Id: I023c23ce7cb590bc8af5cd9b039d901a290eebc5
om/android/camera/EffectsRecorder.java
f1244801b6b24053b8a81f353229d63d6d801763 27-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Clear the share popup when a new thumbnail is generated." into ics-factoryrom
db288b8686e5bcecef620176b934b00eb0742597 27-Sep-2011 Wu-cheng Li <wuchengli@google.com> Clear the share popup when a new thumbnail is generated.

When a new thumbnail is generated, the share popup still keeps a
reference to the old thumbnail. Clear the share popup so the old
thumbnail can be garbage collected.

bug:5336037

Change-Id: I8de6bdb82f6f36cfb8190929f99a7c278eefe7e5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
1743de666ba52fd8a32babb36de01c7e3b56c2a7 23-Sep-2011 Gilles-Arnaud Bleu-Laine <gilles@ti.com> Prevent re-compression of thumbnail upon closing camera

Thumbnail is compressed to JPEG at 90% quality every time the application is
closed. This behavior causes the degrading issue that the quality of thumbnail
is getting worse.
Adding a new flag to ensure thumbnail is compressed and
stored only when it is newly generated.

bug:5371985

Change-Id: I90cedeebf2d4c5dfc25e6524529f7f1e5a6f63fc
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
f70f0a83edea8f02f5d268efa89fb351797c6583 26-Sep-2011 Wei Huang <weih@google.com> Merge "Fix the bug that local preference is not reset." into ics-factoryrom
3c454fc97678e8967cbc6c8a4a67097c5bdb2422 26-Sep-2011 Wu-cheng Li <wuchengli@google.com> Call cancelAutoFocus in startPreview and before release.

Now camera API specifies focus it not reset by stopPreview or
takePicture. This is especially important when the mode is
FOCUS_MODE_CONTINUOUS_PICTURE because the focus will be paused
after autoFocus is called.

bug:5356404

Change-Id: I027df2b8b4092183668c21f4d97a84ad73a9d396
om/android/camera/Camera.java
cfcb0b746106900c9233f9bf51843f82d50f9d20 26-Sep-2011 Angus Kong <shkong@google.com> Fix the bug that local preference is not reset.

bug:5366049
Change-Id: Ifee52c43c7c2ec8ff674fca8ce7762cc489c1b6a
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
926405a84a882ab78f2f5aa1e88c4961640724f7 20-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Restrict effects to 480p.

- Preview stretching still occurs after some transitions.
- Correct quality used in recording, shown in UI at all times.

Bug: 5320425
Change-Id: I63612c55d2e6e0e979208c59f2caf9a61ac1d3f8
om/android/camera/CameraSettings.java
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
a3d4776e153be0b4ccdfdfb603da94b13b0d7443 23-Sep-2011 Wei Huang <weih@google.com> Merge "Add clear effects button, silly faces title, and background title." into ics-factoryrom
97805866d29c7de439105ebdfbfe788a1735c878 23-Sep-2011 Wei Huang <weih@google.com> Merge "Show the real resolution for quality settings." into ics-factoryrom
70c9730d0cbdcd64d29928f8de293c6c753deba7 23-Sep-2011 Wei Huang <weih@google.com> Merge "Clear zoom listener and error callback when leaving." into ics-factoryrom
1e99673af90451eaffeb100735f38e6ce0f18456 22-Sep-2011 Wu-cheng Li <wuchengli@google.com> Add clear effects button, silly faces title, and background title.

bug:5226051

Change-Id: I61609e31fb8f18041f6885cb923507aeecfd9c9f
om/android/camera/EffectsRecorder.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/EffectSettingPopup.java
om/android/camera/ui/ExpandedGridView.java
om/android/camera/ui/IndicatorButton.java
05999715cc38365aa4751a2a355eb1af284573ab 23-Sep-2011 Angus Kong <shkong@google.com> Show the real resolution for quality settings.

1. Change the assets.
2. Change the strings from high/low/mms to 1080p/720p/480p.
3. Change the preference from customized string to the real values of
CamcorderProfile.QUALITY_[1080|720|480]P

bug:5141068
Change-Id: I294799bda8e873f828bbf4bd21330591f0859632
om/android/camera/CameraSettings.java
om/android/camera/ListPreference.java
om/android/camera/VideoCamera.java
fe45771b64882d2c025e09cb5937772fa47fb345 23-Sep-2011 Chih-yu Huang <akahuang@google.com> Clear zoom listener and error callback when leaving.

bug:5336037
Change-Id: Ib1ffb7694625d63161e2cc52a7d755614d4b63bb
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
022d6d7e809fcd47ebc751deaea84e2d3639069a 23-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the current mode hightlight of ModePicker." into ics-factoryrom
c4f4c3da52404870b0b559b7bf88896a4f41b7de 23-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the current mode hightlight of ModePicker.

bug:5363212

The hightlight was incorrect as the initial value of ModePicker is
MODE_CAMERA and the old code just return right away without update its
current highlight.

Change-Id: I2ae8e2c614be75836ad49abe0c735f01f37f5e12
om/android/camera/ModePicker.java
50117d0316f93d0cfbfc18c249d2b57013170ce9 23-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Show the hightlight bar of the active indicator button." into ics-factoryrom
08ab29a60a4f847b449c9e64f8f4649b545070a2 23-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix setParameters failure if users keep pressing shutter." into ics-factoryrom
b62bb6946185959ad28577fdcb175f2bd92bb014 23-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix setParameters failure if users keep pressing shutter.

Do not call setParameters, autoFocus, or cancelAutoFocus if the
snapshot is in progress.

bug:5359430

Change-Id: I17a367643c85e0e65b2ba3f9c1ab9ace86c52722
om/android/camera/Camera.java
842f11c8716bc6320b1b7c228742c0dd1cab2d0b 22-Sep-2011 Chung-yih Wang <cywang@google.com> Show the hightlight bar of the active indicator button.

bug:5039235
Change-Id: I79d4b7be080748b2715b8826924de65e0d75ef39
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomIndexBar.java
3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097 23-Sep-2011 Chih-yu Huang <akahuang@google.com> Fix bugs about review control in video intent mode.

- Switch position of checkmark and X.
- Let review play icon visible in intent mode.
- Let review control visible after reviewing video.

bug:5244256
Change-Id: I20d51faf9fb5658ee009dd45ff112947cf4ebf02
om/android/camera/VideoCamera.java
dd28e1cc00373c02adf88dff878dbbe5d8be9e59 21-Sep-2011 mbansal <mayank.bansal@sri.com> Updates to handle textureless scenes during capture.

1) Starts stitching only when the camera sees a textured scene at the beginning.
2) If a texturess scene is encountered in the middle of a capture, the stitching continues with the intermediate frames translated using the pan velocity estimate.
3) Added more error codes and percolated them up to the java layer.
4) Fix a build error in Mosaic::addFrame() and added comments.
5) Update the javadoc in Mosaic.java to reflect the new returning codes.

Change-Id: I7727ace615ece22adefe313a19ac2cbe8c8d21a8
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
0f98da00b21484d147add25cb3f1ddbf924ad70e 22-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Lock AE and AWB before autofocus starts." into ics-factoryrom
d5b2118fc4aa377a3c4f5e4052745f14ec78b2c4 21-Sep-2011 Wu-cheng Li <wuchengli@google.com> Lock AE and AWB before autofocus starts.

Now camera API specifies autofocus does not lock AE and AWB.
So the application locks AE/AWB when focus starts.
AE/AWB are unlocked when focus finishes or preview starts.

bug:5356404

Change-Id: I9d735404babd5bc84bef5253768221fd7509afca
om/android/camera/Camera.java
c9b05bf45bdefe34c2d5591fef3224dd2049461c 22-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the zoom control bar UI on phone." into ics-factoryrom
e335860d0e456a8182bee3aa67c52d1395b6f563 21-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Disallow video snapshot while using effects in recording.

Bug: 5350124
Change-Id: I515f7982072987e888408f8d667a6a8cd422104b
om/android/camera/VideoCamera.java
606093cd434a89f5ca941d3a6d6e8470eb768c67 21-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the zoom control bar UI on phone.

+use drawable selector to activate/deactivate the zoom control bar
+update/add zoom assets

Change-Id: Ie429dd0d78c562c8d1045280f336ae74ea6ce898
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
2df78e141f055b39a0a8a15b0710c564f39f1368 21-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Effects: Fix SurfaceTexture abandon/disconnect errors." into ics-factoryrom
fd140e054faaf9bf45c4dfe226e7f6ca8154c575 21-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix overridden settings don't stay disabled when resuming Camera.

bug:5340674
Change-Id: Iedb4bdf22cad562a8406739a1d07a758db5d9fc4
om/android/camera/Camera.java
om/android/camera/ui/IndicatorControlBarContainer.java
06102878c6e8777e6b40abb9cbfaae8e546f9184 21-Sep-2011 Angus Kong <shkong@google.com> Merge "Show the video quality setting only when needed." into ics-factoryrom
c0c662c5acaa5b76e1cb90a7868d16e471e2bd93 20-Sep-2011 Wu-cheng Li <wuchengli@google.com> Change video effect setting to a grid view.

bug:5226051

Change-Id: If3c6aece533a263411f55d21a9cc76282b021554
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/IndicatorButton.java
717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1 21-Sep-2011 Angus Kong <shkong@google.com> Show the video quality setting only when needed.

1. Remove mms option from quality setting.
2. Hide the quality preference when the desired quality is already known.

bug:5141068
Change-Id: I3d839bc60fc6173626d0dfb4110edb06db4bf28e
om/android/camera/VideoCamera.java
a7409d87247162002fca1719c035de67fa7e7535 20-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Effects: Fix SurfaceTexture abandon/disconnect errors.

- Now ensures that camera preview is stopped before starting or
stopping the effects processing, and that the previewTexture
is set to null.
- Fix a few potential race conditions relating to effect switching
- Tear down old graphs properly

This fixes errors relating to SurfaceTexture disconnect/abandon errors
when swapping between effects, and possibly some rarely-occuring race
condition crashes.

Bug: 5328760
Change-Id: I6b655f32b835e7ac65cb7c8dc533befb5177907c
om/android/camera/EffectsRecorder.java
b28b9c0fa991bc97e8aa11da83d27f71fdfef6da 19-Sep-2011 mbansal <mayank.bansal@sri.com> Blending algorithm updates to support WIDE strip-based blending.

1) Added algorithm to select wider strips (and made it the default mode in the app).
2) Added algorithm to cross-fade blend between the wider strips.

Change-Id: I744e69edb16a20f0040ee82c3390548b78853087
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
b7d0a0704e437a1892fbf2a6e5138cf36df9fde8 06-Sep-2011 Chung-yih Wang <cywang@google.com> New zoom control for phone.

bug:5318964

+update assets

Change-Id: I39c6575803d22ab5db5c75a2d47257d12a397255
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
c328de2439d96a40d210872b14c02e8a7e7af7c6 20-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Follow UI redlines for indicator bars." into ics-factoryrom
3cd761b5888b54683e63db051ca9f38606dc1ecc 20-Sep-2011 Wu-cheng Li <wuchengli@google.com> Set the default of the mode picker to camera mode.

ModePicker.setEnabled needs to use mCurrentMode. Set
the default to a valid value so there is no dependency
between setEnabled and setCurrentMode.

bug:5344666
Change-Id: I82eb966994158733cfda72e3bda08fa57f7b0d45
om/android/camera/ModePicker.java
6b3f2ff14ca0a0d694d5af13e4d5a392c8552191 15-Sep-2011 Chung-yih Wang <cywang@google.com> Follow UI redlines for indicator bars.

bug:5287560

1. options icons:
No dark background. Use the dark background only when in advanced
options. Make sure the position of the icons match the
redlines, specifically the padding at the top and bottom.

2. second-level indicator bars:
Modify the icons and spacing inbetween.

Change-Id: Ic8d1382b8e07719c5f86b309e3853023e76dccd3
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControlBar.java
23a5e416ca6564cafcc80f7ee7f822e1dbe4d16b 20-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Update share UI to match redlines." into ics-factoryrom
91d9529fee2283f491737e6b55c8e5e8f738c9c2 20-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Hide review controls in onResume." into ics-factoryrom
ae191e239d48bf436715ace25d6624fbadf58ee0 16-Sep-2011 Wu-cheng Li <wuchengli@google.com> Update share UI to match redlines.

- Update highlight and arrow assets.
- Add play icon in the video thumbnail.
- Update play icon.

bug:5290450

Change-Id: Ibbba581f1df1631fd846a6bfe511949651f25ce0
om/android/camera/ui/SharePopup.java
61afc876d9a8ee6bd314fe25f5bc0c83d51077d6 20-Sep-2011 Angus Kong <shkong@google.com> Merge "Dialog is now shown when pausing. (DO NOT MERGE)" into ics-factoryrom
a555a5681f964aaace10c79ecf4659c3fec3df50 20-Sep-2011 James Dong <jdong@google.com> Merge "Support QVGA resolution in video recording" into ics-factoryrom
e77bc2918d46c2e896f0517cbb42eac816c80438 20-Sep-2011 James Dong <jdong@google.com> Support QVGA resolution in video recording

Change-Id: I06a174a2da8938247d800d4c03029e052a681cd1
related-to-bug: 5145483
om/android/camera/VideoCamera.java
3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc 20-Sep-2011 Angus Kong <shkong@google.com> Dialog is now shown when pausing. (DO NOT MERGE)

This fix is already submitted in master build. Submit again for factoryROM.

bug:5317261
Change-Id: I2f4a1153322c16ddf52a30a1b17195ddec96e4ec
om/android/camera/panorama/PanoramaActivity.java
5be37a20b9086be505ebd424a4b92967800038c8 19-Sep-2011 Wei-Ta Chen <weita@google.com> Merge "Adjust the screen brightness in the panorama mode." into ics-factoryrom
6e48f6c9ef082b2beb0145ebc28189c3d1a4f072 19-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix indicator bar height in video mode." into ics-factoryrom
cfa5dfffd63fe94f66b981bd72d50e293fe58f32 19-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Initialise zoom controls in OnResume rather than OnCreate" into ics-factoryrom
db3556078a75be0bd4a08195d90f060724034e88 19-Sep-2011 Chung-yih Wang <cywang@google.com> Fix indicator bar height in video mode.

bug:5287560
Change-Id: I000d11aa3974e1d48d18f4dcf6ec31166f6ef8ec
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
a27b8c0d0a1467994a9163df5f718002db504458 19-Sep-2011 Braganza <sam.braganza@samsung.com> Initialise zoom controls in OnResume rather than OnCreate

Issue:
1. Zoom is not working after coming back from the camcorder album
Description:
Step 1: Go to Camera
Step 2: Change to Camcorder
Step 3: Zoom in
Step 4: Record->Stop
Step 5: Quick View
Step 6: Share via messaging
Step 7: Back to camcorder preview
Step 8: Try to zoom
Actual Result: After coming back for the messaging screen zoom is not working
Expected Result: Zoom should work properly

Analysis:
Zoom change listener is set to null in Camera.open. We need to set it everytime
in after camera is opened.

bug:5338478

Change-Id: I5f31504ace6fb6b6d5f76a5c9bdf28cdd7acf581
Signed-off-by: Sam <sam.braganza@samsung.com>
om/android/camera/VideoCamera.java
1324c7a05149ffa07a2b1339d1bc9bdff862e77e 19-Sep-2011 Wu-cheng Li <wuchengli@google.com> Hide review controls in onResume.

Steps:
1. Launch message application and compose new message.
2. Tap on attach icon and select capture video.
3. Start recording.
4. Stop recording.
5. Tap on home icon.
6. Relaunch message application.
7. Check that vf screen is displayed in post recorded screen.

Observed: Post recorded screen is overlapped with VF screen

bug:5338199

Change-Id: Ica3fb71a71fc8e3f79e789acc2ca5b8f480a35fc
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
93fd3bcfa06ef1f525dced9e125ed6541071a865 19-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in onTouch if camera fails to open.

If the camera fails to open in onResume, it is possible
to have a null mCameraDevice in onTouch.

bug:5332896
Change-Id: Ia357d4aa23a99eabcd641ec65811d34372ce973f
om/android/camera/Camera.java
a959d05b52ac4b27dcdfe3d3a4e72220cf69d47a 17-Sep-2011 Wei-Ta Chen <weita@google.com> Adjust the screen brightness in the panorama mode.

Adjust the screen brightness in the case of automatic brightness.
Make the screen brightness in the panorama mode consistent with that in
the Camera mode and VideoCamera mode.

Change-Id: I1600bcabcdf0d5f3840a347cce10c329d2db100b
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
4bdaddf2fd7e989d61a1ba6e9958fa9b700110ed 17-Sep-2011 Wei Huang <weih@google.com> bug #5334042: don't use Picasa video as background replacer background.

Change-Id: Ic8ec440f404e720c02dc3b98b0800b6d89e40c15
om/android/camera/VideoCamera.java
efc7babaccbcf6feb690702127019a466a954c56 16-Sep-2011 Wei-Ta Chen <weita@google.com> Merge "Set the focus mode to infinity in the Panorama mode." into ics-factoryrom
d3105c578427ac7507ca32ff1de4a92962de2357 16-Sep-2011 Wei-Ta Chen <weita@google.com> Set the focus mode to infinity in the Panorama mode.

Bug: 5320359
Change-Id: Iff431595bcc23a64cba93c5ac77bb3f34008b6b8
om/android/camera/panorama/PanoramaActivity.java
30f0481931beed547656f2c7bc6290ecc9b01ac3 08-Sep-2011 Chih-yu Huang <akahuang@google.com> Change image of review control buttons.

bug:5244256
Change-Id: Idf02f40edb7e2e15edb4fc1ac86a4694d9147661
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
1e35ce08ae70575c6127c606dd4ba28f6ff2add1 15-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix animation for second-level indicator bar."
507aaa672eb8ad5464159021f1b3596cafeede1d 13-Sep-2011 Chung-yih Wang <cywang@google.com> Fix animation for second-level indicator bar.

Change-Id: I8accf9eedf8df439ebed1453c332cb9f9e7b3567
om/android/camera/ui/IndicatorControlBarContainer.java
fa959aede9b1fe9d510108e883a2f16cf28c9033 15-Sep-2011 Angus Kong <shkong@google.com> The panning indicator turns red when too fast.

bug:5244268
Change-Id: I095c5aec9583885e86960d0e446328ca86e3dcb9
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
48ccad73c132753904a08651ce04cdb27377ef28 15-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Update share UI to match redlines."
977d06c6278cb7b131ed3c0960853d9168aacbdd 14-Sep-2011 Wu-cheng Li <wuchengli@google.com> Update share UI to match redlines.

- Change animation to crossfade.
- Remove border in the normal state.
- Remove the divider of the application icons.
- Change the area of the share popup to viewfinder only in panorama.

bug:5290450

Change-Id: Ia483c65f846e568a942d855119634f02c2c30c14
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/SharePopup.java
ccc10bb25616e2b4619c15a0fe22eb8538174062 15-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix effect selection is not reset in setting popup."
7debfb4ae64e710e2bea5ba2446407c29952b107 15-Sep-2011 Angus Kong <shkong@google.com> Merge "Prevent NPE when handling messages."
15d9a599aa3d354a89c7dcac7f03aa458f3a4158 15-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix effect selection is not reset in setting popup.

bug:5280921
Change-Id: Iaf05eb162edf77036ec9e161b64d96696e32b4e9
om/android/camera/ui/BasicSettingPopup.java
59a140990af1ba6d2c9aa627047a02e50c8dd0e1 15-Sep-2011 Angus Kong <shkong@google.com> Prevent NPE when handling messages.

bug:5238952
Change-Id: I56c65efb5798978aa76fbe1689317c6c021635a7
om/android/camera/panorama/PanoramaActivity.java
c24192e3b9a3d4f6e5e77e408fd4d91333b1275e 14-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add back arrow icon in the share popup."
c718193efe9b13f1e00f6bd8e3c145e9c28d9309 14-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix orientation handling for Effects mode."
d62087915cf9e4a686db03291b7ef9d99758ebba 13-Sep-2011 Wu-cheng Li <wuchengli@google.com> Add back arrow icon in the share popup.

+ Fix the wrong calculation of the thumbnail size.

bug:5290450

Change-Id: I80318af68f084a726b32dc98cb205013abada88d
om/android/camera/ui/SharePopup.java
3ac6ed3a95322fa9e29f81377e92669ebaeb77fb 14-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Fix orientation handling for Effects mode.

- Did not correctly set mDisplayRotation for effects mode
This caused very slow startups for effects
- EffectsRecorder does not need camera facing adjustment
- onOrientationChange did not properly calculate orientation
for effects

Bug: 5309932
Bug: 5311545
Bug: 5280905
Change-Id: I2c5b240f42cebfaad974176f72864c61e1861042
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
7ef764eb76f8e1e463c143ec5c7aa9a9d678b2d8 14-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the Camcoder not working for MMS message.

bug:5309725
Change-Id: I1745a3805327420433f106dc2a43469b18bceb9d
om/android/camera/VideoCamera.java
6e943908bc0608a168f7590078d2f6f371f09610 14-Sep-2011 Angus Kong <shkong@google.com> Merge "Show indication when panning too fast."
8b0e23544474480345937c0c0985429f61569761 14-Sep-2011 Angus Kong <shkong@google.com> Show indication when panning too fast.

bug:5141543
Change-Id: I579fd8583eb01c1f2309b8550f20c14fbe3ea2cf
om/android/camera/panorama/PanoramaActivity.java
e33ca5f8c89d1822442bae8b7a5960b7e8f22787 14-Sep-2011 Angus Kong <shkong@google.com> Merge "Solve issue that camera connection is lost."
5726a74bbf4fd7404eabb5b5b99ee758ad2ac422 14-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the NPE in IndicatorControlBarContainer."
27c7ab8a5d3dd50a62be80900abe6890c7182956 14-Sep-2011 Angus Kong <shkong@google.com> Solve issue that camera connection is lost.

bug: 5290362
Change-Id: I461847225772acf663614d20e9e1fb16c2d01e88
om/android/camera/panorama/PanoramaActivity.java
d798026ec65a87d8517cf8f9be41c9e7db9966a8 14-Sep-2011 Angus Kong <shkong@google.com> Merge "Direction indicator before panorama panning added."
6108e0ed3a6b03deed2a8586d98607a6756637b1 13-Sep-2011 Angus Kong <shkong@google.com> Direction indicator before panorama panning added.

bug:5141666
Change-Id: I2ede83f9a5d31544db6d8ea2a269f50da4a3bb7a
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
55fd2a3b10b55cb107fe6613d1a0beda869b131c 13-Sep-2011 Wu-cheng Li <wuchengli@google.com> Remove the delay to show postview for 0.5 seconds.

This can reduce the shot-to-shot time on some devices.

bug:5219431
Change-Id: I335314f2f67f44aca8b03e17c47fed355e43462d
om/android/camera/Camera.java
6176dfc23f5a092ca1b2ee3d07d7076821ec6095 13-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the NPE in IndicatorControlBarContainer.

bug:5299759

move the view inits to onFinishInflate().

Change-Id: I3a3adb01805fbfb5e22d58f86c9d5da3ce3585a6
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
ed2ea4de7489f4e27d47227da6ad1bb08d2d15e7 13-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Modify the Mode Picker to follow UI spec."
20ff6a12d36dd928e6ccfb96aebf9f6481d15697 08-Sep-2011 Chung-yih Wang <cywang@google.com> Modify the Mode Picker to follow UI spec.

bug:5141384
bug:5141387
bug:5287560

+Follow the 'redlines' UI guidelines.

Change-Id: Ib46f4d45beb0e390933957727902d2d1f9e81211
om/android/camera/ModePicker.java
8df38bbe67338a1f5dc58996bd8866f4c1fe264d 13-Sep-2011 Angus Kong <shkong@google.com> Show capture indication for panorama.

bug:5298354

Change-Id: I430d833dff9b7bcab6353889522da6e55e58d4e4
om/android/camera/panorama/PanoramaActivity.java
ca667e83ccbca59879a236aae8156e8735ce32a5 13-Sep-2011 Angus Kong <shkong@google.com> Merge "Fix issue that view are modified in non-ui thread."
917cd82d626aaa5ea48b301fe9c7bc7452a0177f 13-Sep-2011 Angus Kong <shkong@google.com> Fix issue that view are modified in non-ui thread.

bug:5300117
Change-Id: Id0c3f36477796dcb3de42cf329d7a1fed7b0d82f
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
667870ba798e39407db2dab5fd89d7b560c56ba2 13-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix AF failure when shutter and tap focus are triggered at the same time."
620e427c0aa990458d39b43477675b768d360327 13-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix AF failure when shutter and tap focus are triggered at the same time.

When the shutter button and the viewfinder are tapped simultaneously.
(1) onTouch ACTION_DOWN. Tap area is set and AF is not started yet.
(2) Shutter doFocus. AF starts.
(3) onTouch ACTION_UP. AF is called again and an exception is thrown.

Now onTouch always cancelAutoFocus if AF is in progress and the state
is not STATE_FOCUSING_SNAP_ON_FINISH.

bug:5265128
Change-Id: Ib52dcc5169132dde2b688062d812d59e0d7c2d7c
om/android/camera/FocusManager.java
2a23e0edc54644af52049a9a4309d340f760f49f 13-Sep-2011 Angus Kong <shkong@google.com> Merge "Saving panorama starts automatically."
215f7ecf1fcc861986397fdf6724602d4775ab2c 12-Sep-2011 Angus Kong <shkong@google.com> Saving panorama starts automatically.

1. Saving process starts right after low-res result is generated.
2. Progress bar for panning stops updating after capturing.
3. Fixed the issue that progress bar for panning will show a indicator on the left side first when
there should be nothing shown on the screen.

Change-Id: I68a60b01035939d92bebe5ee59d63a27dfccc3c6
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
595d33f1308089ea4e656e247548a71b218d9fa5 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Do not take the picture if the storage is not ready.

+Add debug messages because UnsupportedOperationException
still happends when Environment.getExternalStorageState
is Environment.MEDIA_MOUNTED.

bug:5293390
Change-Id: Id00a0887f653fe29e09bbb7511ea3fcc833eee71
om/android/camera/Camera.java
om/android/camera/Storage.java
cb237cd180788f52f35dea9a0ec687ede2898153 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPE in video capture intent mode."
dca61b985be5987bc8dd95a39522ed86ff9aaf02 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix ArrayIndexOutOfBoundsException in InLineSettingKnob."
f519d8845d0f8b884bf3c594bb0753e918e670b8 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in video capture intent mode.

bug:5297312
Change-Id: Ib4efd8fb181f28611e1800aedc757eef07cb1538
om/android/camera/VideoCamera.java
c3e797c34a6d3ba04caab6b0afbaecf7027e0bae 12-Sep-2011 Angus Kong <shkong@google.com> Merge "Replace the custom dialog with system dialog."
cc7e206e610c73a610d55144d8a216ba46a69652 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix ArrayIndexOutOfBoundsException in InLineSettingKnob.

bug:5292885
Change-Id: I5dafe2d90e573bda101a15b895837b865753c39d
om/android/camera/ui/InLineSettingItem.java
822a8165fc214ce2ce8cf9eeb95efc55c102c669 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Disable thumbnail during recording.

Users want to click the thumbnail after video snapshot.
Disable the thumbnail so it does not show pressed
state feedback.

bug:5187868

Change-Id: Iede42310670dc6a41afef4af8522eacd4a165038
om/android/camera/VideoCamera.java
om/android/camera/ui/ColorFilterImageView.java
7ff76029a67b1d310355555514231c966852b1d7 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "The last thumbnail can be an image or video."
9d21b89cf8a85267fe753f1405185ab64873db54 12-Sep-2011 Angus Kong <shkong@google.com> Merge "Fix issue 5244268."
382b51fa8f512d7f5d5163715eeb85bbfd0a02c7 12-Sep-2011 Wu-cheng Li <wuchengli@google.com> The last thumbnail can be an image or video.

Query the content resolver with the last image and the last
video. Show the thumbnail of the one that has the latest
dateTaken.

bug:5187868

Change-Id: I51ee4ece8f33aaec46913aad9b2427b43c31c1bb
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
13e2b964e821f6ee40cf5715b6baec19c7fd09b8 11-Sep-2011 Angus Kong <shkong@google.com> Fix issue 5244268.

1. Remove the member field mMosaicComputationStatus for the ease of further maintainence.
2. Resolve the issue 5244268 that the progress dialog can be dismissed before generation is done.
This issue was previously fixed but brought up.

bug:5244268

Change-Id: Ia38d8c8a5a85fd72e73dbcd774c844a5ddaa0d3c
om/android/camera/panorama/PanoramaActivity.java
bfb958a707ce0e08d2142c81a278ec12b61083e0 11-Sep-2011 Angus Kong <shkong@google.com> Replace the custom dialog with system dialog.

Change-Id: Iabeeb6f4912e0f13a6691b9fd08507e7d5791c2c
om/android/camera/panorama/PanoramaActivity.java
0bb4487fcc7601118111d4545c31dae04651b456 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Disable zoom and shutter button during video snapshot.

bug:5274338

Change-Id: I4a0f578535075ff37a92f642fd2a7bc6343d3357
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
e164996caf656a9b966e828dee5296c5b328f364 12-Sep-2011 Angus Kong <shkong@google.com> Merge "New progression bar used by saving and panning."
2580cb3166768fd6f98a1113e1229f733507fd7e 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Set picture size in camcorder for video snapshot.

+ Use public API isVideoSnapshotSupported.

bug:5187868
Change-Id: I5ff12487be3dec7e9788cd9510269df792247b10
om/android/camera/VideoCamera.java
057040c0e19834d98719143c2627a9f0df3e4c35 09-Sep-2011 Angus Kong <shkong@google.com> New progression bar used by saving and panning.

bug:5286267
Change-Id: I06f4cf147cdc5e68dc6cd7f5689ceb671a0fc43f
om/android/camera/panorama/IndicationView.java
om/android/camera/panorama/PanoProgressBar.java
om/android/camera/panorama/PanoramaActivity.java
b3b80f6550f6a827e15b23abd780457cb26eebdf 09-Sep-2011 Angus Kong <shkong@google.com> The mode picker and thumbnail review animates.

The mode picker and thumbnail review not animate in after the capture starts and animate out after
the capture is done.

bug:5276223

Change-Id: I8c5073ec513ecd81e6041053059bc9a20280cbf5
om/android/camera/panorama/PanoramaActivity.java
e1178a73fd5756771d25d0b8375452450f509e99 08-Sep-2011 mbansal <mayank.bansal@sri.com> Updates to allow cancellation of mosaic computation from a UI trigger.

1) reportProgress now takes a new boolean parameter that can be used to break out of the mosaic computation loop at the library level.
2) Added a cancel button to the progressDialog and a new Handler message to handle the button click so that the user can be taken back to the capture stage.
3) Updates to address the code review.

Change-Id: I0768da55dd6ccd9b1464d456ab41973779734c65
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
6a6cad85e4932ca6b3f00acd6617e9ad1701d13d 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Put a red border around the viewfinder during video snapshot.

Also remove the viewfinder border in all other cases.

bug:5187868

Change-Id: I4164fc9b0b62268b80496c71058466e03cbf0aa3
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
34bf50c8685b7bb72b575d61f755e2b6df34dde9 08-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Fix Divide-By-Zero bugs."
4523316833cc0b3c04dec507befb8a74bc13526e 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Do not trigger another aufocous if CAF returns failure."
90a21dd768fae18d670a338a72679e4c77ee1170 08-Sep-2011 Angus Kong <shkong@google.com> Merge "A customized dialog for preparing low-res review."
6bc0f740f5d7fa6eb8aa8a4ba7dd3ab4dca999d4 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Do not trigger another aufocous if CAF returns failure.

It was decided CAF will do a full-scan automatically if
the scene is not focused. The app does not need to call
autofocus again.

bug:5265061
Change-Id: Id16444a89c9a64ddd0df0c6817ae3dc0df4f652b
om/android/camera/FocusManager.java
2f9ed6f52580b8fecb77ec3ca123a804eea89f8c 07-Sep-2011 Angus Kong <shkong@google.com> A customized dialog for preparing low-res review.

According to UI spec, a customized dialog is needed. The customized dialog has a rounded rectangle
as a background and a spinner over a text view.

bug:5244268

Change-Id: I21a5709babbaf92e507c8900a8cfb322e29bae4c
om/android/camera/panorama/PanoramaActivity.java
e0861e7473d042bdd9c935f3bdf50ae220891b6c 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Enter lights out mode.

bug:5158325
Change-Id: I7c14397d6b6d9fe72e92bf0ea260322d64c87b98
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
3eb65e705ec7446fc888fc8d621fb5e1d9a1bfb8 08-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Use the same thumbnail in camera and camcorder."
da7b4ed9303499c4449c7069461db42ff37e3e3f 07-Sep-2011 Wu-cheng Li <wuchengli@google.com> Use the same thumbnail in camera and camcorder.

bug:5187868

Change-Id: I47aa460db3005ed494a2b760d31e8c17d896ac85
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
2670b3d7c318604f07b680b22360d349103144be 07-Sep-2011 Wei Hua <whua@google.com> Added Orientation change support for goofy face effect.

bug: 5221073
Change-Id: Iff414f33fe389f0bac8f75920d8a14283f4a4d2e
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
a93a4d60eacee4e12471b45f8691c14114e113a4 07-Sep-2011 Wu-cheng Li <wuchengli@google.com> Set rotation and gps in video snapshot.

bug:5187868

Change-Id: I1092e3d37dba78073b42aa9107e7cc326d67decc
om/android/camera/Camera.java
om/android/camera/LocationManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
f09f58c11f3e6b5670cfb1317bb2d7cf1e412d7c 07-Sep-2011 Chung-yih Wang <cywang@google.com> Fix Divide-By-Zero bugs.

bug:5261752
Change-Id: I780e1e1187242b6f44e6844b92b7a9eac2d3b1d1
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlWheel.java
03e53d81e5d64542fba64565962b9c0049525f71 07-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add video recording with effects into Camera."
1ba9dce4232ab3dfd3d50b3925bc25bf047901db 07-Sep-2011 Angus Kong <shkong@google.com> Merge "Use new assets for panorama shutter button."
c35a79da571f504437b4a53b53c8f38752c9852c 07-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Refactor location code to LocationManager."
c343fa06491ee5677b735920032d92e055c16366 06-Sep-2011 Wu-cheng Li <wuchengli@google.com> Refactor location code to LocationManager.

Video snapshot will need to set location to EXIF.
Refactor location code to LocationManager.

bug:5187868
Change-Id: Ic54814370a13084e2857472ea067c4d6bd31964e
om/android/camera/Camera.java
om/android/camera/LocationManager.java
fcdf619d92701052621a96572d956d047e07cf24 07-Sep-2011 Angus Kong <shkong@google.com> Use new assets for panorama shutter button.

The original button with text is now replaced by the button with image provided from UI team.

Change-Id: I4598b5be1ff802b115450ba7b4dba9cb8e742450
om/android/camera/panorama/PanoramaActivity.java
3ffd465511aecea6ccfbebcc5ea82c275e48bbb8 07-Sep-2011 Angus Kong <shkong@google.com> Merge "The controls stay while capturing."
a466abbd54caa8100a1ef6584a5b0db78224a125 06-Sep-2011 Angus Kong <shkong@google.com> The controls stay while capturing.

Change-Id: I1f375b8526dc131ee658c38c5b5dfa62fdf05335
om/android/camera/panorama/PanoramaActivity.java
086d0c78ad0ca37819dbd1ab021ed249e8760aea 06-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Rotate the face indicator according to device orientation."
9efb0b19fa929c528253f0a9b6f5b27791e1ee52 20-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Add video recording with effects into Camera.

Initial support for video recording in the Camera app, with
the goofyface and background replacement effects.

Bug: 5212166

Change-Id: I30995e305c202ba57bf76ff18c885bf16c5ea14f
om/android/camera/CameraSettings.java
om/android/camera/EffectsRecorder.java
om/android/camera/VideoCamera.java
c7e69709baea0cd9e49eed005d85714326b27da1 06-Sep-2011 Wu-cheng Li <wuchengli@google.com> Rotate the face indicator according to device orientation.

bug:5223866
Change-Id: I155a8c3701dbb175e3478268d6aa3eb0fc8f4977
om/android/camera/Camera.java
om/android/camera/ui/FaceView.java
e47b5624a1aa3cc7bd9763852bed4ac3215a77b2 30-Aug-2011 Wei-Ta Chen <weita@google.com> Fix the panning speed issue.

Use the moving average speed, rather than an instantaneous speed, to
calculate the panning speed. Also, set the panning speed threshold to 20
degrees/sec across all devices.

Bug: 5249945

Change-Id: Ib5bedf34b2a999d2e380873db48589b7f1882936
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
260fa672e7c4b56f3feda906825aa835d7d1e1a3 06-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Refactor the overflow menu for new UI."
a8b55a9628fa7c073d4f9c97c9a198275194f76a 26-Aug-2011 Chung-yih Wang <cywang@google.com> Refactor the overflow menu for new UI.

bug:5039364

+Use Switch widget for the 'Store location' preference.

Change-Id: I031cef58ab60d62d04431d7bfe742da672899deb
om/android/camera/ui/InLineSettingItem.java
om/android/camera/ui/InLineSettingKnob.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/InLineSettingRestore.java
om/android/camera/ui/InLineSettingSwitch.java
om/android/camera/ui/OtherSettingsPopup.java
fe370991104ad90b0656d5cc897171cb5cb8780b 03-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the draw/layout before initialization.

bug:5246857
Change-Id: I8aa96a744cbff414f38e7c886a613cf2c9c7922e
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
fc404e9a87e2f7e1fa9bc0ede998ed9cf75a047d 03-Sep-2011 Chung-yih Wang <cywang@google.com> Fix the Divie-by-zero issue.

The height could be zero if the motion event is sent before onMeasure().

Change-Id: Icd698be097b32baf728adfba5a6fa144a8a6b15d
om/android/camera/ui/SecondLevelIndicatorControlBar.java
f6de2b4114de0355581a666cde86c3351b851417 03-Sep-2011 Chung-yih Wang <cywang@google.com> Merge "Add the missing setEnabled() for phone UI controls."
d97d89558a67673396b083f4a75813ffd0b7c87e 02-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Update focus rectangle assets."
ea136afa2f4d38428ad486df5fb0a24db8314a3d 30-Aug-2011 Chih-yu Huang <akahuang@google.com> Move review control out of preview.

bug:5141555
Change-Id: I04e4ca0d0e1a40ccfe39e5276fda66ffd02ae1b5
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
20b3c3526ebb8d8a6873f7a1110f23847a843515 01-Sep-2011 Wu-cheng Li <wuchengli@google.com> Update focus rectangle assets.

bug:5223866
Change-Id: I9e938953dd552da784fdea067a9b2b3859e579dd
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ui/FaceView.java
om/android/camera/ui/FocusIndicator.java
om/android/camera/ui/FocusIndicatorView.java
om/android/camera/ui/FocusRectangle.java
757b67951f40850b1ac3102dc0b6fe8977615a4a 31-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add video snapshot.

Touch on the viewfinder will take a picture during recording.

Things not implemented:
- Add EXIF GPS.
- The last thumbnail can be a jpeg in camcorder mode.
- Call setRotation.
- Highlight preview border during video snapshot.

bug:5187868

Change-Id: I59a22aa00424355584611f095af752b83c0ee2f0
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/SharePopup.java
c89a0eb7b1f0cd5cd45de8fd08ff051f6f74f382 30-Aug-2011 Angus Kong <shkong@google.com> The angle indication now goes in two directions.

The computation of angles is moved into PanoramaActivity from MosaicFrameProcessor for rapid update
of the UI.

bug:5141674
Change-Id: I1bb6721c8354a0460701b5b0f60d772dd0b8633a
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/IndicationView.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
22d4b7fbace56c03092eb088a4df98e04a6681af 31-Aug-2011 Angus Kong <shkong@google.com> Fix NPE 5238952 when generating panorama fails.

1. Handle the situation of failing to generate the panorama.
2. The string id "details_ok" is changed to "dialog_ok" and used now in the "Ok" button of all the
dialogs.

bug:5238952
Change-Id: I847255a46667960e604892ad55a642358c4eab02
om/android/camera/Util.java
om/android/camera/panorama/PanoramaActivity.java
b69aa1513070fc9b799c48a9257fddbc04ace7dd 01-Sep-2011 Wu-cheng Li <wuchengli@google.com> Merge "Close the camera setting when an option is tapped."
b1ce29490ec61847602ece16f3745417787d3d8f 31-Aug-2011 Chung-yih Wang <cywang@google.com> Add the missing setEnabled() for phone UI controls.

bug:5109283

We have to hide the setting buttons during video recording, or it will crash
the camera driver easily by changing the camera settings. For camera
mode, we just simply disable the buttons with grey out effect.

Change-Id: Iec06a48f246ab5ef9ae4d8c6ca0b78851fcb0155
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/ColorFilterImageView.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
0341c03529f04351534a15d06facb096aab7a95f 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Close the camera setting when an option is tapped.

bug:5141477

Change-Id: I3428922ae6343d5c26f3d85808aeeb6923335802
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/IndicatorButton.java
c2f9a6866c8c0ea970f50645c33cf6296721bd91 31-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Add ZoomIndexBar for phone UI."
d2202f9677fcc5f3f2b3e950c35aefe80da14a8a 29-Aug-2011 Chung-yih Wang <cywang@google.com> Add ZoomIndexBar for phone UI.

bug:5083780

The zoom index should be displayed in another bar to the left of the
zoom control bar.

Change-Id: I272675be22d4233c5b0b08fa24bfe05394ca021e
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
om/android/camera/ui/ZoomIndexBar.java
69f5b701b0398bdf0d862935910f52a2c71c38a3 30-Aug-2011 Wu-cheng Li <wuchengli@google.com> Disable the camera picker during snapshot and recording in tablet UI.

Before we hide the indicators and camera picker, disable it to
be consistent.

bug:5141131

Change-Id: Ie5663c13b482e7fac0789b01c8488e004e73feb7
om/android/camera/ui/CameraPicker.java
82111c5d1fe1539a5ff70c1a459a09256ae50c1e 30-Aug-2011 Chih-yu Huang <akahuang@google.com> Merge "Remove thumbnail in image and video capture intent."
d4832351874aa6eb2cd5e312c21bd4ec607ff3a4 30-Aug-2011 Wu-cheng Li <wuchengli@google.com> Rotate the focus rectangle in different orientations.

The new focus assets look different in portrait and landscape.
Rotate the drawable so the orientation looks correct.

bug:5223866
Change-Id: I5e5ebbcbaca95b118e051fbf6131c1a12584b2f2
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ui/RotateLayout.java
51dd927dbe8940e226a2d15f105e53fb2effe7dc 30-Aug-2011 Chih-yu Huang <akahuang@google.com> Remove thumbnail in image and video capture intent.

bug:5141555
Change-Id: I240006b82f6c694a1549208bcb580f393f07f2bf
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
2a1e44382f6a4fc70e4a89e3d183503a2255826f 30-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update focus rectangle assets.

bug:5223866
Change-Id: I7edd73f68f81e3f5c522afb6ec7d291f67b12204
om/android/camera/ui/FaceView.java
om/android/camera/ui/FocusRectangle.java
7648319f0416b86ae13b97eeba0466581ace1a48 29-Aug-2011 Wu-cheng Li <wuchengli@google.com> Increase the resolution of the thumbnail.

The share popup gets bigger. The resolution of the thumbnail
should be increased.
This also fixes OOM in panorama. It should use the width to
calculate the resolution, not height.

bug:5157438
bug:5220505

Change-Id: Ib7b6600469e94e38bd684c43b07584ce61acfcca
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
c2fe2b3f1360e4c6ec3abac15e523f15c29d28bc 29-Aug-2011 Wu-cheng Li <wuchengli@google.com> Decrease the time of showing postview image.

Originally the camera shows postview for 1.2 seconds.
Decrease the time so the camera does not look slow.

bug:5219431

Change-Id: I01b38ee6812aacbab9bc0c9096799933be6a72d9
om/android/camera/Camera.java
4a7c00fed8ad1753fe7bf016267850c040c73c9f 29-Aug-2011 Chih-yu Huang <akahuang@google.com> Merge "Change video recording shutter button and overflow assets"
4bbbfc12a05120a2d06e07ba1252367d42e6bb82 29-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Add ZoomControlWheel."
68798bfa946e812beb9190fa7c98a316392fbce6 29-Aug-2011 Chih-yu Huang <akahuang@google.com> Change video recording shutter button and overflow assets

bug:5024054
Change-Id: Icd8c66bcf9be76df35852e6772ffd76f6f1013e8
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControl.java
ab2ffa88872149978823c3184d0af162d3cdca13 24-Aug-2011 Chung-yih Wang <cywang@google.com> Add ZoomControlWheel.

bug:5083780
Change-Id: I1a18c247d638edd3f8e5e0588170b6820f280f96
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/OnIndicatorEventListener.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomControlWheel.java
om/android/camera/ui/ZoomPicker.java
4591c5ecbaade585c3094be353d27b14f0592494 26-Aug-2011 Wu-cheng Li <wuchengli@google.com> Make the size of the share popup the same as preview area.

bug:5157438
Change-Id: Ib199ee62cce314c648c323304289af7e1421c59e
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/ui/SharePopup.java
21eafb33a46aad92326df76b41771194b1f341f9 29-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add applicaton icons to share popup."
71e76dcebdbb3e5768fc948bed9c529a5787294e 28-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add goofy face effect setting UI.

The functionality is not working yet.

bug:5226051

Change-Id: Icb684d9320688f90ea0856b97424f9bfb6c47f39
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/VideoCamera.java
7097299bb13ba2e8defca40e82bc7b28982a41cf 24-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add applicaton icons to share popup.

bug:5157438

Change-Id: I9ed34ae1f4b2058a7ec0f7a29ae9196c84a24a72
om/android/camera/ui/SharePopup.java
5f47cc1a9ce83a5656751df5705674a1711687d1 27-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the monkey test issue."
0c9caf77ab90b173fbe2719ec6a78e588964ac33 25-Aug-2011 Wei-Ta Chen <weita@google.com> Fix an issue that "Too fast" pop up in preview.

The issue is that the "Too fast" message is cleared only after we hit
"Start". Therefore, a previous "Too fast" message will be shown after
we hit "OK" and finish generating High-Res mosaic.
Fix the issue by clearing the message once we can done with capture.

Change-Id: I2b70b3a2334a7c9351365ad58fdb4323fe661526
om/android/camera/panorama/PanoramaActivity.java
f03611c90bb17682ae101b5fe6a7c45c1bf880f1 26-Aug-2011 Chung-yih Wang <cywang@google.com> Fix the monkey test issue.

bug:5215779
Move the init of view variables to onFinishInflate().

Change-Id: Iee42e7dc1dfdd1316839ba4ed8b5105604aa097b
om/android/camera/ui/IndicatorControlWheelContainer.java
0935e09bb12a1886a801713bbd78bbc20bf4ea4e 23-Aug-2011 Chih-yu Huang <akahuang@google.com> Change front/back switcher icon in camera mode

bug:5198658
Change-Id: I4a0f91f9318313c219904c3417fbf98a256cfac3
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheel.java
6f6ea6ab6dad370d2cc378be91a2649ae44b2c94 25-Aug-2011 Angus Kong <shkong@google.com> Show progress when generating high-res panorama.

bug:5141680
Change-Id: I3e38f135364f874e830e08a671893775ac535775
om/android/camera/panorama/PanoramaActivity.java
86394cc38a4ef9ef4e58ef6b4e801c717eefeb73 25-Aug-2011 Angus Kong <shkong@google.com> Merge "Start capturing after the control disappears."
f619ef352d74b1d1ff06d82fb4d265aa9676014b 25-Aug-2011 Angus Kong <shkong@google.com> Start capturing after the control disappears.

The capturing process and mosaic rendering begins after the control totally disappers.

Change-Id: Ib1fd281a1497a79c695b83e5e6206f5b3718f886
om/android/camera/panorama/PanoramaActivity.java
5d4972e63a1f81139c6503fd433f06c77276fc38 25-Aug-2011 Sundar Raman <sunds@ti.com> Reset the touch AF before calling cancelAutoFocus

If touch AF is reset after cancelAutoFocus then the AF mode
stays at auto and also the touch region passed to the driver
doesnt get reset.

Change-Id: I6bc4241c1fde104e41315e065aaa70489cc7a197
Signed-off-by: Sundar Raman <sunds@ti.com>
om/android/camera/FocusManager.java
08d49209701c69799bc6f27430d594dc295b63ed 25-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Fix the bug of reloadPreferences."
58dadc3028b3af2e9895089e1b39ad1ab982ece2 25-Aug-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in FocusManager.

bug:5210804

Change-Id: I39143a3c45d27db6dc2669e3a249945aafddc3c4
om/android/camera/Camera.java
om/android/camera/FocusManager.java
4cc009b812557bc312af556e3ed64cae2367d69e 25-Aug-2011 Chung-yih Wang <cywang@google.com> Fix the bug of reloadPreferences.

In the old code, we have two methods in IndicatorButton,
reloadPreference() and reloadPreferences()(the one inherited from
AbstractIndicatorButton). Merge them and take reloadPreference()
in the AbstractIndicationButton.

Change-Id: I50c65da8bc5ef07202c6562f28f2e046dbb7606a
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
3a92e643ed83c0ecce072797259dd4fa11246b2b 25-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Add second-level indicators in tablet UI."
ed6373cd34393dfdda8d18a03705c83bfff1f535 24-Aug-2011 Chung-yih Wang <cywang@google.com> Add second-level indicators in tablet UI.

bug:5146861
bug:5140745
+Animation for open/close.

Change-Id: I8daeec1d63c23027a212fa4c363bb4beee13ef6f
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
a907c122ccec649c6cedf3a45b1c426a5fca932e 21-Aug-2011 Angus Kong <shkong@google.com> Add thumbnail and share popup for the last result.

bug:5141665

Change-Id: Idc44d33d09c8d4a30fdcef66de2d6754daf1ea82
om/android/camera/Camera.java
om/android/camera/Exif.java
om/android/camera/OnClickAttr.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/OnClickAttr.java
om/android/camera/panorama/PanoramaActivity.java
50b3c890986aadb3780b4da8c0b8dbb0f1422eba 23-Aug-2011 mbansal <mayank.bansal@sri.com> Updates to allow the mosaic library to report the mosaic computation progress (both low-res and high-res).

1) Added a new method to the Mosaic class that reports the percent progress for both LR and HR mosaicers.
2) Added a test function to the activity that logs the reported progress.
3) [REMOVED] Added a test progress-bar to the UI for quick testing of the progress reporting UI.
4) Made minor updates in response to Wei-Ta's review.

Change-Id: Iaf8ccf771579a40580a868743a6b53c6b05f14c6
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
f26e1ab12cb3f359fe1d6efcbe65344a3a0bf276 24-Aug-2011 Angus Kong <shkong@google.com> Controls animates in and out.

The controls on the right now slide out before capturing and slide in after review.

bug: 5146822
Change-Id: Ie9d162b4231bb77bdd155589e0c0443115a4cc98
om/android/camera/panorama/PanoramaActivity.java
a321cfdb0803653ba895485f87493290273f26d2 24-Aug-2011 Wu-cheng Li <wuchengli@google.com> Dim the background and change the animation of the share popup.

bug:5157438

Change-Id: I177678959698af3c2f6a6236101e0ced6d5b868d
om/android/camera/ui/SharePopup.java
d480002ccad05cf992c628c72884091c36cc654c 22-Aug-2011 Wu-cheng Li <wuchengli@google.com> Refactor all focus code to a separate class.

The code about focus is complicated and scattered around.
Move the code to a new class, so it is easier to maintain.

Change-Id: I0214b405bf1596d967e7d89cdb04328322c6ab95
om/android/camera/Camera.java
om/android/camera/FocusManager.java
om/android/camera/ui/FaceView.java
e8b7ae993fcd192aa3460540e7f3a66f601a93b1 23-Aug-2011 Wu-cheng Li <wuchengli@google.com> Use public API Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.

bug:5086125
Change-Id: I3e10e9a993804e60d77ba678c0fa664d9c13fa17
om/android/camera/Camera.java
ff45331706e2fe361b4ff736d90b0ad4af0e7be9 18-Aug-2011 Chung-yih Wang <cywang@google.com> Refactor indicator wheel.

+add IndicatorControlWheel container.

Change-Id: Ia3c7f0441de75a70c8a2172e86d3812b2ef1a15b
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlBar.java
om/android/camera/ui/IndicatorControlBarContainer.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/IndicatorControlWheel.java
om/android/camera/ui/IndicatorControlWheelContainer.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/SecondLevelIndicatorBar.java
om/android/camera/ui/SecondLevelIndicatorControlBar.java
om/android/camera/ui/ZoomPicker.java
5e4949c34eb558f13869d2c9a641d06a8366fe55 23-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Start face detection every time after starting preview."
71d5570605d517a271f40c749cb8123d5f2c3059 22-Aug-2011 Wu-cheng Li <wuchengli@google.com> Start face detection every time after starting preview.

This fix the face detection is not resumed after tap-to-focus
and take a picture. According to javadoc, face detection should be
restarted after starting preview.

bug:4460717

Change-Id: Ic092de72e42c281c78f9e11b67df9d89c0b10388
om/android/camera/Camera.java
cc3238fae72d6579288e0cdc03c7d09539ebb734 23-Aug-2011 Angus Kong <shkong@google.com> Merge "Show spinner dialog when generating mosaic."
84afaa29e27c0df338f79154c4c90090cbb7c414 23-Aug-2011 Chih-yu Huang <akahuang@google.com> Merge "Disable mode picker during video recording"
3ea573b7823efd6b8a19f4d6535ae61af0ae0b3c 22-Aug-2011 Chih-yu Huang <akahuang@google.com> Disable mode picker during video recording

bug:5152987
Change-Id: Icfa472494dad0c475fff5b71fe19f06e472873ff
om/android/camera/ModePicker.java
5fde6d5259fccaed4bc517697a4930d3b69ae860 21-Aug-2011 Angus Kong <shkong@google.com> Show spinner dialog when generating mosaic.

bug:5141680
Change-Id: I66aa7530361728549da517b1cad1fea881894b4e
om/android/camera/panorama/PanoramaActivity.java
cd5f34c389d0d929687b95885e348d574f574d85 22-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add continuous autofocus in still picture mode."
838e6e75fdcb1946deef2fae276c03f2cb00e596 21-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add continuous autofocus in still picture mode.

bug:5086125
Change-Id: I5c235fce5f13115554849623579cc5e659521ed3
om/android/camera/Camera.java
b0c6bcf47a8ca1c096d98ebebd33a821dd483585 18-Aug-2011 Chih-yu Huang <akahuang@google.com> Add exposure indicator on screen.

bug:5141528
Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
43b0b2ccd5949ee8fc377c37e7e2b82a26c88ca8 19-Aug-2011 Wei-Ta Chen <weita@google.com> Set a panning speed threshold across all devices.

We set the threshold to 30 degrees/sec.

Bug: 5182333
Change-Id: I29282893519f54601738b74945b2146c016c0af3
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
38e737508cf9fd517bfa9289e80089fb60c8e5b0 19-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update back/front camera picker icon.

bug:5024054
Change-Id: I6c6338b0b90f225bf69cec8c328ca37d50669910
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorControl.java
69e3cc1f6c1cd167a62361b2fe07d7d755ee8844 19-Aug-2011 Angus Kong <shkong@google.com> Merge "Fix NPE bug in onPause() when mSurface is null."
4d1c2846e24a7f7f6c8ff59e01ca36a000344944 17-Aug-2011 Angus Kong <shkong@google.com> Fix NPE bug in onPause() when mSurface is null.

bug: 5166296
Change-Id: I48855b2b5309e9d0f91c8c2ac5cde08095bac408
om/android/camera/panorama/PanoramaActivity.java
0e7b1301af5775c41827b9de0822566a91ea0c4f 18-Aug-2011 Chung-yih Wang <cywang@google.com> Cleanup unused imports.

Change-Id: I72c979a921d4b6a5143bd90a59e9e4d91958033f
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/IndicatorBar.java
2faf16a90a6a6d18e40faf45ced217b913b214b6 18-Aug-2011 Angus Kong <shkong@google.com> Refactor to decouple SurfaceTexture and renderer.

Change-Id: Icae3183f597fc64ab2f3ffc0868a12b878aabdf2
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
fbc5751416caa3a0d065ae15f56d1fb0253552c5 13-Aug-2011 Angus Kong <shkong@google.com> Show "Too Fast" when panning speed is too fast.

bug:5141497
Change-Id: Iaff5b7bd05c9b232091f0133a756a5513e5956b3
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/PanoramaActivity.java
46521167db54dcc88e5bf6dc82798fa912a5a66a 18-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update white-balance and remove old setting icon.

bug:5024054
Change-Id: I6a11ba498c2eee82f5496594b61351fe745eb4a9
om/android/camera/ui/IndicatorControl.java
c852ce9bee37362da5e9f33548daae9bcee8db70 18-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Clear the face view in onPause and when face detection starts."
98c85e2f5bfcaf4ab5257065a238fceb46ce754f 18-Aug-2011 Chung-yih Wang <cywang@google.com> Fix the NPE.

bug:5179776

A bug caused by the boundary case.

Change-Id: I8c835797725a17d1deccb3e8712bf66149cd10ab
om/android/camera/ui/SecondLevelIndicatorBar.java
5af9472f1c260c1a3b54d2e1bd448c27b5e5968f 17-Aug-2011 Wei-Ta Chen <weita@google.com> Make the speed indicator visible.

The speed inidicator has to be drawn on top of the viewfinder/panorama
preview. Its visibility state should be same to the STOP button.

Change-Id: I5631dd77a98e96b2467f146f0b437e2043504fa1
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/PanoramaActivity.java
cd8d7deb1ca1d8f8cc06100b0760169c7fe488a7 17-Aug-2011 Wu-cheng Li <wuchengli@google.com> Clear the face view in onPause and when face detection starts.

bug:5169594

Change-Id: I822e8860861c6b11ab55bcfd5a9604e4fcee8d6a
om/android/camera/Camera.java
95788ace8ad3630312f2f94544690c448c935f9e 16-Aug-2011 Chung-yih Wang <cywang@google.com> Move CameraPicker into IndicatorControl.

+Move the CameraPicker icon to IndicatorBar for Phone UI.

Change-Id: I2ab75166586adb6a029b4cf1b3f19604526dd818
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/SecondLevelIndicatorBar.java
74fe6dc0918c8129210cdcf1816a6a052d737997 17-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Add Sprung Lever Zoom Control for Phone UI."
adab2bddc93bf4af535cb58e7167bf8690d97d8c 14-Aug-2011 Chung-yih Wang <cywang@google.com> Add Sprung Lever Zoom Control for Phone UI.

bug:5083780
Change-Id: I5b29f6bc509fc93ed74175e2754ce9f3c4afe27f
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorControlContainer.java
om/android/camera/ui/OnIndicatorEventListener.java
om/android/camera/ui/SecondLevelIndicatorBar.java
om/android/camera/ui/ZoomControl.java
om/android/camera/ui/ZoomControlBar.java
om/android/camera/ui/ZoomPicker.java
e46486104523760a4433f03e09ed615987d83b6c 16-Aug-2011 Angus Kong <shkong@google.com> Fix issue: returned width/height <= 0.

Width/height returned by Mosaic JNI is <= 0. generateFinalMosaic() now returns null in such cases.

bug:5133740
Change-Id: I49b69cab1d40fd878d7cd4988fbc1a9f4dba9343
om/android/camera/panorama/PanoramaActivity.java
97965c13c44accd66621362873f8bbac8bc104d4 17-Aug-2011 Angus Kong <shkong@google.com> Merge "Fix NPE at PanoramaActivity.stopCapture()"
1254e04152ce9efc0b54d6d97b5873d7a9acdb2f 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Revert "Clear the face view in onPause and when face detection starts."

This reverts commit 383a2b45820ff710627dbd536f1bd683e393e335.

The changes will have NPE in onPause if the camera cannot
be connected.
om/android/camera/Camera.java
36839102e03107e3fb121197036365a58ec2686e 15-Aug-2011 Angus Kong <shkong@google.com> Fix NPE at PanoramaActivity.stopCapture()

bug: 5166705
Change-Id: Idbeeaef6981775303ebc324a0f004b6db45bcbf8
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
383a2b45820ff710627dbd536f1bd683e393e335 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Clear the face view in onPause and when face detection starts.

bug:4460717
Change-Id: Ia35f525ef40a03fc5ad4bee715ad107201323f7a
om/android/camera/Camera.java
fdcb4386bc3d55f6ae910c2ac5cd9e35283cad55 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Show tap to focus toast after getting the first orientation."
60fc534ec8f68d95a486984cb396a2da0e200518 16-Aug-2011 Angus Kong <shkong@google.com> Remove preview layout and adjust widget size.

Since we now use GL to render the realtime preview, the original preview frame can
be removed then. Also some widgets' size is adjusted.

bug:5142002
Change-Id: I8da708bab63b107b39e9e87a4893506dec171910
om/android/camera/panorama/PanoramaActivity.java
54fcae5227535ae6960d2cea4fe83b9ee848249e 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Show tap to focus toast after getting the first orientation.

bug:5039278
Change-Id: I011a8f89deedaa81d9700a01605862bed72cdeac
om/android/camera/Camera.java
3c5db7d5a010ceb3da8d52d5afa530a117bb556e 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add tap to focus toast."
1f227d20aa000d0798581f451b89b1d3b2bcd349 15-Aug-2011 Wei-Ta Chen <weita@google.com> Fix an issue with hitting frame number limit.

In the native side, the library always returns the transformation of the 100th
frame after hitting the frame number limit - 100. The application codes
need to avoid adding more frames once the limit reaches. Otherwise, we
see the UI repeating the 100th on the panorama preview. Ultimately, we
want this termination condition to be solely determined in the native
side.

Also updates a comment on MosaicRenderer.

Change-Id: I6883b25f14103527de8454a2568f4768669e0aff
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/MosaicRenderer.java
3a73cd704cb7a6caa8267af55d191cceeef94d16 15-Aug-2011 Wei-Ta Chen <weita@google.com> Merge "Remove the flag - mUseSurfaceTexture."
98d615769af2b08bcddf02ee1b11f5288ec5cf92 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add tap to focus toast.

bug:5039278
Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/ui/RotateLayout.java
fbfd6d187b46cab35be980c586962d027e4a2409 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Draw all the faces on one face view."
41ecefdc167ca88d785e6a1d58b706cc7f03c2bd 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Draw all the faces on one face view.

bug:4460717

Change-Id: I29b676a95d8fc7b22b359508e1886fba513ba493
om/android/camera/Camera.java
om/android/camera/FaceListener.java
om/android/camera/ui/FaceView.java
a24cd1882d1fc4cd10c681ffb88360c1f2f41842 15-Aug-2011 Angus Kong <shkong@google.com> Merge "Use "Start" button instead for Panorama."
827192aefc4c75151dd389e1a1a5ebc8313d0164 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove unused files.

Change-Id: I8f7c34ddb1ffa1455131c51ff7d6522f3d94e402
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicTexture.java
om/android/camera/ui/BitmapTexture.java
om/android/camera/ui/CameraEGLConfigChooser.java
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/ColorTexture.java
om/android/camera/ui/GLLinearLayout.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLOutOfMemoryException.java
om/android/camera/ui/GLPopupWindow.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/MeasureHelper.java
om/android/camera/ui/NinePatchChunk.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/RestoreSettingsItem.java
om/android/camera/ui/RotatePane.java
om/android/camera/ui/StringTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomControllerListener.java
739f9e1541c30735e45d5cb90255dd36a32d3604 11-Aug-2011 Angus Kong <shkong@google.com> Use "Start" button instead for Panorama.

The shutter button in panorama is replaced by a start button.

bug:5141569
Change-Id: Idb3f6cc621be5b83fae70bce7ef35636079e31f3
om/android/camera/panorama/PanoramaActivity.java
ef91f8514bf3c21091dde6b292f9616464dc32e8 11-Aug-2011 Angus Kong <shkong@google.com> Generate High-res panorama.

bug:5105037
Change-Id: I06a5527b9b614ff3aedf7e1b5d1efd38938dbd3d
om/android/camera/panorama/PanoramaActivity.java
63364838e1f742ac74d47498ae8f51e1e6e7e902 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Remove focus mode setting if tap-to-focus is possible."
7dad1ad263f5954224cf130c9a042e7fed430409 15-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Do not show focus rectangle if there is any face rectangle."
f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22 14-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove focus mode setting if tap-to-focus is possible.

bug:5141526
Change-Id: I947721209ffbcb3eb6f443cb503f80871031a0bf
om/android/camera/CameraSettings.java
0adf2489520d3a98a56e081aeacb1ab9336a012f 13-Aug-2011 Wei-Ta Chen <weita@google.com> Remove the flag - mUseSurfaceTexture.

The flag was used for debugging.
We completed the transition of using SurfaceTexture to get preview frame data.

Change-Id: I4af16456845c741342bbbf65e912a67c094ab006
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
41a2e9735136f372de95652d0828600282c8e967 09-Aug-2011 mbansal <mayank.bansal@sri.com> Updates to allow using SurfaceTexture for reading the preview frames directly from GPU memory.

1) SurfaceTexture is now used to obtain the data processed by the mosaicing library.
2) SurfaceTexture in GPU memory is directly rendered using the transformation from the mosaicing library to generate the preview mosaic.
3) GPU is also used to generate the Low-Res frames from the High-res frames (was being done in CPU before).
4) SurfaceTexture is also used to render the viewfinder as soon as the mosaicing application starts (eliminating the need for a separate SurfaceHolder to render the camera).
5) Modified the XML layout during the preview state to be the same size as during the capture stage to accommodate the SurfaceTexture based viewfinder [this needs to be reviewed and adjusted].
6) Fixed the viewfinder and back button issues identified by Wei-Ta.
7) Round-1 of removing trailing spaces and tabs.
8) Added documentation to new Java side interfaces and cleaned up code in general.
9) Cleaned up redundant and commented out code from the native side.
10) Merged with latest updates from the main trunk.
11) Fixed issues identified in code review and also cleaned up and refactored some code.
12) Added layout-w1024dp/pano_capture.xml for tablet layout.

Change-Id: If8fb0116de6c7fc6652cc67ac453553726961c32
om/android/camera/panorama/Mosaic.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/MosaicRenderer.java
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
43df069e847abf43eb7afb738154f7a18661a4b2 12-Aug-2011 Wu-cheng Li <wuchengli@google.com> Do not show focus rectangle if there is any face rectangle.

Also clear all face rectangles in stopFaceDetection.

bug:4460717
Change-Id: I282376be94844c5066926c2d0749d334197df292
om/android/camera/Camera.java
om/android/camera/FaceListener.java
7058a9318dd5d6d5a1e79a84080cdc02975f68c1 12-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove zoom ratio text label.

Change-Id: Ia4d54034b0b2c039e874b1fa580b036962f4cd33
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomPicker.java
d2db70880e6159413932f747eb82df3e925852c1 11-Aug-2011 Wu-cheng Li <wuchengli@google.com> Use matrix to transform the location of faces.

bug:5141019

Change-Id: Id4bb82cee5fd788689fb18bb199504d963c5d3a2
om/android/camera/Camera.java
om/android/camera/FaceListener.java
om/android/camera/Util.java
142402d57c1689c1342d096c976b9b0826f8ce1a 08-Aug-2011 Angus Kong <shkong@google.com> "Retake" and "Ok" buttons can function correctly.

1. "Retake" button brings user back to preview stage without saving the final result.
2. "Ok" button brings user back to preview stage after saving the final result.

bug:5031609
bug:5142100
bug:5134202
bug:5133871
Change-Id: I234e242182765cc5624b2fc8444bc38e5a9edf9f
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/OnClickAttr.java
om/android/camera/panorama/PanoramaActivity.java
d159d11f5a47928a59c9bf27fbae1a95dd6cbb02 10-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove color effects to simplify UI.

bug:5141303
Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
5e270b255775e1aae76cb476873001798ad8e88a 10-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove share icon and close arrow.

Alose increase the speed of icon rotation.

bug:5141343
bug:5141404
bug:5141514

Change-Id: I0db6b6edbc0fc1a0f83b4f29f6828bcff01bf0c4
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/SharePopup.java
89155720bce8b530659bcdd48bcb3802bc80a6ba 10-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update face detection API.

bug:4460717

Change-Id: Ia748a3b9c5664058c63edce2335836f3817c909d
om/android/camera/Camera.java
7629155333c8db423ec28f2d368f0938ea7ddf23 09-Aug-2011 Wei-Ta Chen <weita@google.com> Merge "Remove the unnecessary low-res alpha bitmap."
93ad273a53e7d2975a67d7d1f8a157f845e41cf2 09-Aug-2011 Wu-cheng Li <wuchengli@google.com> Use recording hint API.

bug:4266229
Change-Id: Iafd4b6cb4bf20a1bff3ed639f9e48ca71f026969
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
e5fe56fec047dec5ccb12c2001bacfd9455352da 09-Aug-2011 Wu-cheng Li <wuchengli@google.com> Fix shutter button state is not reset.

Change-Id: I80402befad3ad827efa9f1441699b72032b2b3ce
om/android/camera/ui/IndicatorWheel.java
16ca94d73bfe07f280e381595709b56c2681b2bc 08-Aug-2011 Wu-cheng Li <wuchengli@google.com> Use new background and shutter button.

bug:5024054

Change-Id: I2def331433b0db66efc0d38f1e9537c0980441bb
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ControlPanelLayout.java
om/android/camera/ui/IndicatorWheel.java
d690626cc82e43eb3fadde968ea15a10e40590bf 09-Aug-2011 Wei-Ta Chen <weita@google.com> Remove the unnecessary low-res alpha bitmap.

Since we now use OpenGL to render panorama preview in the native layer, there is no need to
maintaine a low resolution alpha bitmap in the application layer for
panorama preview rendering. The change improves the rendering
performance.

Change-Id: I3e7fa36e895d600de06808a2a67f72ae757205e2
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
f921d46b1e1c9b4a8f1b017ce26675fd9accd609 06-Aug-2011 Wei-Ta Chen <weita@google.com> Fix the issue that panorama preview occludes viewfinder.

Change-Id: Ide8fdde9c95fb9d4ed1b03a750e0ce78fde93236
om/android/camera/panorama/PanoramaActivity.java
eeb94d4de94bfd4e01f3a716803f77a530f5b92c 02-Aug-2011 mbansal <mayank.bansal@sri.com> Updates for mosaic preview rendering to happen using native GLES2.0 code.

1) Added new subfolder mosaic_renderer in feature_mos/src with FrameBuffer and WarpRenderer classes.
2) Added mosaic_renderer_jni.h|cpp files to the jni folder to perform GL calls for rendering on the GL thread.
3) Updated code in feature_mos_jni.cpp to connect with mosaic_renderer_jni.cpp.
4) Added new java files in com.android.camera.panorama to encapsulate the GL JNI interface, a GLSurfaceView for display and a GLSurfaceView.Renderer for rendering.
5) Modified APP code to enable the new GL-based rendering and made relevant changes to the UI (in pano_views.xml).
6) Fixed a GL bug which was preventing the rendering from working properly after hitting the back button once.
7) Preview rendering now displays in the current frame coordinate system.
8) Fixed the ghost preview rendering bug.

Change-Id: Ieb64ee3fd4a9a2c6563a311a4930ddc85ce2247c
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/MosaicRenderer.java
om/android/camera/panorama/MosaicRendererSurfaceView.java
om/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
om/android/camera/panorama/PanoramaActivity.java
178f4d6d1f20bb5fe7f714448cac9910c2c18c1f 05-Aug-2011 Iliyan Malchev <malchev@google.com> camera app: shut up: "Num of faces" spam

Change-Id: Ia14a9af517e4869d57fbad3b0fd425102db9163b
Signed-off-by: Iliyan Malchev <malchev@google.com>
om/android/camera/FaceListener.java
e46d09dc17ac1cad5062fdc4b29916dc63da06c3 05-Aug-2011 Chung-yih Wang <cywang@google.com> Use View.GONE instead of View.INVISIBLE.

Refactor this to improve the performance.

Change-Id: I6a20021bf07546b0cfa6b4c4b5fe0d67556940a5
om/android/camera/Camera.java
om/android/camera/ModePicker.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/BasicSettingPopup.java
c926b2152b7d1b65f34b58af50d0c6cdeb070123 05-Aug-2011 Chung-yih Wang <cywang@google.com> Fix the build.

Change-Id: Ia7ae06b577a570441f1e962fa2ff53c48184ce23
om/android/camera/ui/AbstractIndicatorButton.java
0980ef20897b2b83ee1ddce300044c121192f599 05-Aug-2011 Chung-yih Wang <cywang@google.com> Merge "Add the CameraPicker for PhoneUI."
141cf9386c6053e655ef054f499230cfafba3ff6 05-Aug-2011 Wu-cheng Li <wuchengli@google.com> Fix face rectangles are not updated when the number of faces is 0.

bug:4460717
Change-Id: I41f77f7a78ba19605e29abc4a0634868f8a84510
om/android/camera/FaceListener.java
c6bf6547259e75a4fc0e3ac61ab589f456031837 04-Aug-2011 Wu-cheng Li <wuchengli@google.com> Enables zoom buttons during recording.

This also fixes indicator buttons are not disabled during snapshot.

bug:5029304

Change-Id: I4496d8333ecb0c6e02e30cd4eb1f7424b95a9912
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorWheel.java
b5c569214281e11dc7e8ffc313fbb27e5ff6e5c5 03-Aug-2011 Chung-yih Wang <cywang@google.com> Add the CameraPicker for PhoneUI.

+recover the removed CameraPicker.

Change-Id: I5e45c4f73ce7c082cf420d27a86b922283a83bcc
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/RotateImageView.java
a955261dd734524eb7d8e1af76c695122efc8aa7 04-Aug-2011 Angus Kong <shkong@google.com> Stop button added on panorama UI.

1. Individual layout XML file added for preview, capture and review stages.
2. Stop button added for capture stage.
3. Layout changed to comply UI spec more.

bug:5031609
Change-Id: I152daafe8a1a9fcc12b3803f3f7a36875b425628
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
d1cff41cd8ae0fc6e9df1050730bb5e47bd364af 04-Aug-2011 Wu-cheng Li <wuchengli@google.com> Set preview invisible after mosaic is captured.

bug:5118463

Change-Id: Icd90cdb9cc9d26e28ff16292ccf20eb8bad617cc
om/android/camera/panorama/PanoramaActivity.java
ead4a28d6c99e95707149563d89b563c372b870a 04-Aug-2011 Wei-Ta Chen <weita@google.com> Merge "Make Panorama run on phone."
4b602592e0d189499b22d107d997b83e798b5bd9 03-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add face detection UI.

bug:4460717
Change-Id: Id09cc012efffcee0f5af3a070b5dcb775a7048a0
om/android/camera/Camera.java
om/android/camera/FaceListener.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
98f41918daf64318a7da4ec94712eeb8d6697f31 03-Aug-2011 Wei-Ta Chen <weita@google.com> Make Panorama run on phone.

Change-Id: I41ff1c35918794e81d4f397ed72f438dadccde4a
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/panorama/Preview.java
bed7386688cd7810cba23732ab71f370fe3222ff 20-Jul-2011 Chung-yih Wang <cywang@google.com> Merge the indicator bar implementations.

bug:5039235

Originally we have the GLView-implemented indicators for Phone-based UI.
Based on the current UI design, we would like to merge the look on all
devices for the dialog of the camera setting. Therefore, a refactor of
how to handle the popup window is required here and this will simplify our
UI work for handling different layout/resolution.

Change-Id: I6f9e6ebed7600be460ddd906505cdc44f81098ad
om/android/camera/Camera.java
om/android/camera/CameraAppImpl.java
om/android/camera/ModePicker.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorControl.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/ZoomIndicator.java
3ab4f0912da83f7f5f8266a57a606d521c1649e3 02-Aug-2011 Wu-cheng Li <wuchengli@google.com> Set recording hint to true in camcorder mode.

bug:4266229
Change-Id: Ic8cf3ea9e16adb62dbe30df7baf9528807c9ea56
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
ac86e91982dbb64eac089aa8ccf23bddb51f27f1 30-Jul-2011 Angus Kong <shkong@google.com> Insert final mosaic image into MediaStore.

bug:5031609
Change-Id: I234868bafd1f4437f39ee719ca7946052aec71db
om/android/camera/panorama/PanoramaActivity.java
8f530f57261b42080bbda7a57459f1eef8cbaa3d 29-Jul-2011 Wei-Ta Chen <weita@google.com> Merge "Fix memory leaks both in the native and Java side."
766d62f188e324f075583b57f69208614a8eec88 29-Jul-2011 Wei-Ta Chen <weita@google.com> Merge "Add a freeMosaicMemory function in JNI to address the leaks."
423a0a07d4dceea081c6f28acdbbcdbce4fe5785 29-Jul-2011 repo sync <cywang@google.com> Fix the NPE issue.

bug:5093236

I did not find the root cause of the NPE, however, let's try to get rid
of this issue by extra check.

Change-Id: Id37dda556e9b0ad8569b7371f9ebda8ac34561e3
om/android/camera/Thumbnail.java
94f592fc405ca45b8794007cd9083c3250924b50 27-Jul-2011 Wei-Ta Chen <weita@google.com> Fix memory leaks both in the native and Java side.

Change-Id: I80dabe069047fb2327ddbb4f78477723870e1c2a
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/panorama/Preview.java
b062b806441939e162e19be0baeb6513592c66b3 26-Jul-2011 mbansal <mayank.bansal@sri.com> Add a freeMosaicMemory function in JNI to address the leaks.

1) Fix coding style issues.
2) Added native and java functions to freeMosaicMemory.
3) Added optimized YUV420to444 conversion routine to native side.
4) Fixed more style issues based on code review comments.

Change-Id: Ic824584f6b3a02e4d0d7b472bed57637873ca622
om/android/camera/panorama/Mosaic.java
8a2c41754655a3733175fce81fb7506ff7022959 28-Jul-2011 Angus Kong <shkong@google.com> Refactoring Panorama UI codes.

Mosaic native interface is moved out from Preview.java. Program logics and UI are now
decoupled.

bug:5031609
Change-Id: If46a21a6be05deba7fd1f94f37d14c4afa460d78
om/android/camera/panorama/MosaicFrameProcessor.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/panorama/Preview.java
a72d73cbac59db43d413291e4db66763be08143a 27-Jul-2011 repo sync <cywang@google.com> Add mode picker for camera/camcorder/panaramo

+remove camera switcher
+add menu item for panorama

bug:5039225
Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
om/android/camera/Camera.java
om/android/camera/HorizontalSwitcher.java
om/android/camera/MenuHelper.java
om/android/camera/ModePicker.java
om/android/camera/Switcher.java
om/android/camera/SwitcherSet.java
om/android/camera/VideoCamera.java
om/android/camera/panorama/PanoramaActivity.java
07c328d3f67ecfb2b01f9b9765e1d2426c0959fd 27-Jul-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix potential activity leak."
788aad96ea4abcda2469867464139daa8087af65 27-Jul-2011 Wu-cheng Li <wuchengli@google.com> Fix potential activity leak.

CameraHolder.sHolder is a static variable. Camera.Parameters is
an inner class and references to the enclosing Camera. Camera have
references to the listeners. We need to clear mParameters, so
the listeners are not referenced.

Change-Id: I54c4062e3ddf2f8bdbf6f0fac6b617353d051f16
om/android/camera/CameraHolder.java
7929debdccbf3e0cbaf91d476e6f3008c62671f1 27-Jul-2011 Angus Kong <shkong@google.com> Fix preview orientation bug on some devices.

bug:5031609
Change-Id: If70a5a4125315caf4d53534d1e884bde6bc80cbd
om/android/camera/panorama/PanoramaActivity.java
bdc7e2b461064b25b7f17b0941077fc97653093d 15-Jun-2011 Wei-Ta Chen <weita@google.com> Check in the Mosaic Stitching codes.

1. Camera setup moved to activity level.
2. Fixed releasing and acquiring camera process.
3. Unused .xml files removed.
4. Style issues fixed.

Bug: 5031489
Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f
om/android/camera/Storage.java
om/android/camera/panorama/CaptureView.java
om/android/camera/panorama/PanoUtil.java
om/android/camera/panorama/PanoramaActivity.java
om/android/camera/panorama/Preview.java
f8e7cdfca602c5f9699b54f25e1552fc20fadd15 26-Jul-2011 Wu-cheng Li <wuchengli@google.com> Fix wrong camccorder profile for mms.

The camcorder profile for mms was incorrectly selected
as the high resolution.

bug:5028241
Change-Id: I66767199090e5c5fdbab9a4f75fa7a2ab2b35e2b
om/android/camera/VideoCamera.java
0f33ecf033eb8057ab3d21a9224ae54712eb7ff3 20-Jul-2011 Wu-cheng Li <wuchengli@google.com> Enable continuous autofocus in camcorder.

bug:5029304

Change-Id: If05059ba846573b43fd00d16dec8ceaba74c1f26
om/android/camera/VideoCamera.java
a9b3713b0e006d6cdcabd5e1b094f4a1aa3738fa 18-Jul-2011 Wu-cheng Li <wuchengli@google.com> Broadcast new picture and new video intents.

bug:4964321
Change-Id: I94edce33bd18fc67ed8220d54b01c1af63963c5c
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
b4aa4791c329cadc4df8edf3def5655cf4105f56 18-Jul-2011 repo sync <cywang@google.com> Merge "Make all wheel icons rotatable."
cead50ba3ce2df3bd9fcf06c6f54ea0c6980f0d7 14-Jul-2011 repo sync <cywang@google.com> Make all wheel icons rotatable.

+Make the popup menu rotatable.
bug:5039041
Change-Id: I28394531d5c0894215b8229159cfe9c7bee958b9
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/ZoomPicker.java
e1b7b87757cfef229162601154b0d62bbfb693a2 18-Jul-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add a share application list in share popup."
750173a4d20f1e8d6607edb3ada6be5166d0cd82 05-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add a share application list in share popup.

bug:4725978

Change-Id: Id7a8b24fd7785f2d7dd316b5000f8ae3f3e8c567
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateLayout.java
om/android/camera/ui/SharePopup.java
2b1f214ecbd9c0e40edf827620b59ba00777c948 14-Jul-2011 repo sync <cywang@google.com> Merge the different implementations on CameraSwitch.

+enable the camera/video icon rotation for tablet version.
+render disabled effect for tablet only.

Change-Id: I2827cb57ac7d8d60efdb6f3172c89db32ac443d4
om/android/camera/Switcher.java
om/android/camera/SwitcherSet.java
5281216188a75f5a2edd87ef5f7358a956f17e28 11-Jul-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix wrong preview border drawable is displayed in phone UI."
79227ee2627163a64a3f8f5133528a6c86d79e04 11-Jul-2011 Wu-cheng Li <wuchengli@google.com> Fix wrong preview border drawable is displayed in phone UI.

Change-Id: Iccee528e8e3681f22480a0b726dac90c46757a5f
om/android/camera/VideoCamera.java
3bbc913542e9a0c0da401ef469f9650a30487584 08-Jul-2011 Wei-Ta Chen <weita@google.com> Merge "Check in Mosaic.java - the Java interface to JNI."
81f844f803ea2feeb61eb9270fbdd5592620d42e 08-Jul-2011 Wei-Ta Chen <weita@google.com> Check in Mosaic.java - the Java interface to JNI.

Change-Id: Id3a84177aa6978499c5a8b1cff78b44759989119
om/android/camera/panorama/Mosaic.java
039f1dc1fd89b5baeed8be05f3f21770cf75d4b3 06-Jul-2011 Wu-cheng Li <wuchengli@google.com> Move zoom buttons and front/back camera switch to indicator wheel.

bug:5001059

Change-Id: I5ed60169b6f73dc41d84ba7bd299ed8bf394a284
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicatorButton.java
om/android/camera/ui/CameraPicker.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/OtherSettingIndicatorButton.java
om/android/camera/ui/OtherSettingsPopup.java
3008e86ddbf854e9fb6a247b6fa9f267d44886ba 07-Jul-2011 Wu-cheng Li <wuchengli@google.com> Remove color effect in camcorder app.

bug:5000060

Change-Id: Iaac250dfb0cabf3d6d6a9c563d432d9fac889a3d
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
cd4aacd29f860ba6c1769372c698ab1a4517179c 06-Jul-2011 Wu-cheng Li <wuchengli@google.com> Refactor ZoomPicker.

Zoom buttons will not be in a LinearLayout. Refactor ZoomPicker
so it can accept two zoom buttons as input. It does not matter
where the zoom buttons are.

Change-Id: I445228b03adc96a1e7b4ba90025680c8ef0388a2
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ZoomPicker.java
02af7e82f97ade581703c7f4a32666e4f578173b 20-Jun-2011 Wu-cheng Li <wuchengli@google.com> Remove jpeg quality.

Jpeg quality (super fine, fine, normal) is confusing for some users.
Just always use super fine. This also simplifies the UI.

bug:4993146
Change-Id: I55c2bf7d5aa8391f1656e3d5fdd0e7b2732459ed
om/android/camera/Camera.java
om/android/camera/JpegEncodingQualityMappings.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
c5e37cbb96b8284203560c51dd5f41c705a21f58 30-Jun-2011 Wu-cheng Li <wuchengli@google.com> Add expanded thumbnail in phone UI.

bug:4725968

Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/RotateImageView.java
om/android/camera/ui/RotateLayout.java
om/android/camera/ui/SharePopup.java
25c0a6c44f32788cb4e14095c48f1452b14530a6 29-Jun-2011 Wu-cheng Li <wuchengli@google.com> Lock the camera if starting recording fails.

bug:4965716
Change-Id: I271ceb3790bd2d13d597c77cd26659d47298bb3a
om/android/camera/VideoCamera.java
3f63a2d895c50ae1c3a7a47ee6ead070b5bbd7fc 28-Jun-2011 Wu-cheng Li <wuchengli@google.com> Move share button beside thumbnail in phone UI.

bug:4725968

Change-Id: Iedd0b631b48bb30c27975ddc44923886e4b0d862
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/ShareIndicator.java
4a045a8e858706f56a6ffb5187960768f861f007 31-May-2011 Wu-cheng Li <wuchengli@google.com> Add camcorder zoom.

bug:2644213

Change-Id: I669966e4fd54c76d19660efa6f1700a86b4d6c07
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
3b096a491432b9904ad758fa11a6b894a03ad6ec 22-Jun-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE when video cannot be inserted to media store.

Change-Id: I9f37c9aaca22377e3f169ae126dad4f870211eee
om/android/camera/VideoCamera.java
551ce8ef001669d5e04359ab57c365082f75a905 19-Jun-2011 Wu-cheng Li <wuchengli@google.com> Reset metering area in 3 seconds.

After metering area is changed, reset it in 3 seconds
if users do not take a picture.

bug:3475893

Change-Id: I531189284053f1ede74dfe7dfafea6b682052596
om/android/camera/Camera.java
dfb6f208e3f5dd7d68bcaade644aa1d1f1f0a98f 30-May-2011 Wu-cheng Li <wuchengli@google.com> Check if device policay manager has disabled camera.

Show the corresponding message if that is the case.

bug:4185309

Change-Id: I0f4a5ac577f13331685f8e7343bab6317f96c3d8
om/android/camera/Camera.java
om/android/camera/CameraDisabledException.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
84a4d3eb7c9a3e33e1898729a66671332fe81577 16-Jun-2011 Wu-cheng Li <wuchengli@google.com> Code refactor.

1. Make Camera and VideoCamera more consistent.
2. Fix error dialog is not displayed if VideoCamera fails to connect
to camrea.
3. Move the code from onStart to onResume.

Change-Id: I7dd310718e0986c17a762ca3107924cc412f72cc
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
631191d322e0ae0fb3d5369e581cd8fd787c3b04 15-Jun-2011 Wu-cheng Li <wuchengli@google.com> Change the thumbnail folder to internal storage.

The app did not check if .thumbnail folder is created because
it used to be created by gallery a long time ago. Thumbnails
would fail to be saved if .thumbnail did not exist.

bug:4483083
Change-Id: I03c345f35ab1880878457d2537bbff18c175899c
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
585f0caa3549f5a700e9a939a9ce05ad7d1d6bb6 08-Jun-2011 Wu-cheng Li <wuchengli@google.com> am 5665e379: am 4b478c99: Merge "Camcorder HUD no longer disappears when opening slider"

* commit '5665e3790841ffc54ab3494ef6627026d5048a8c':
Camcorder HUD no longer disappears when opening slider
5665e3790841ffc54ab3494ef6627026d5048a8c 07-Jun-2011 Wu-cheng Li <wuchengli@google.com> am 4b478c99: Merge "Camcorder HUD no longer disappears when opening slider"

* commit '4b478c9940ad3e79f1c99ad70b2aa7b4643b3946':
Camcorder HUD no longer disappears when opening slider
03eeea3750b6b540b735e0f4d5d6d76c128cbacb 07-Jun-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE on launch if camera cannot be opened.

If camera cannot be opened, the app will show a dialog
and finish the acitivty. But if the screen is turned off
and on when the dialog is still there, the app will enter
onResume again.

bug:4556340

Change-Id: Icc331baa14f5e17b178e2022d61e5da55398df40
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
82b1903e5b7f1be665b645835c1eef1d1660fe8e 01-Jun-2011 Wu-cheng Li <wuchengli@google.com> am dd56e778: am a5c1d8bf: Fix some comments.

* commit 'dd56e778e4f16a615b62961bbb9588feeac9200f':
Fix some comments.
e4303f7a3925ad0bd9d66bbecef1c91d0c5ab000 18-Jan-2011 Thomas Hultgren <thomas.hultgren.x@sonyericsson.com> Camcorder HUD no longer disappears when opening slider

The camcorder head up display was incorrectly detached when opening
the slider. Changed behavior to conform with the camera head up
display.

Change-Id: Ie52ab641c0702cbae5e04530a40f992ded8923bc
om/android/camera/VideoCamera.java
b9286870d56f085e74b0142eaa138bb83b5e0eb3 27-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add share button for phone UI."
eeb820cb086875a437968960c7b79c549aa660d8 26-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Print video name for debugging."
6374ed8614a151c27d6277272e3e72769e768766 15-May-2011 Wu-cheng Li <wuchengli@google.com> Add share button for phone UI.

bug:4391419

Change-Id: I80c19f65d6f17733a9ccee6782bc035add12efc3
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/ShareIndicator.java
af40ad5126da5b116440e015fbc3cfb55ff437d4 15-May-2011 Wu-cheng Li <wuchengli@google.com> Increase the actual focus and metering area.

If users touch on a dark area, preview will be easily over-exposed.
So increase the metering area to reduce the odds. However, keep the
rectangle the same size because a huge rectangle looks strange on UI.
Now the actual focus/metering area is two times bigger than the UI.

bug:3475893
Change-Id: I1c3623b253f8c72c6180671d49f205ccb28af29a
om/android/camera/Camera.java
f63363f2885f4c16546358a612aa4cc2b98430a4 14-May-2011 Wu-cheng Li <wuchengli@google.com> Move gps indicator from the indicator bar to the corner.

bug:4391419

Change-Id: I5d4385edd51d3df21d4bcdd17a80dc778a832b94
om/android/camera/Camera.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/GpsIndicator.java
1c4edcb4f6c50997b534ac83712cc4c49531a5cb 26-May-2011 Wu-cheng Li <wuchengli@google.com> Print video name for debugging.

Sometimes stagefright crashes at AVCDecoder.cpp in monkey
test. Print the filename so we can get the file.

bug:4109304

Change-Id: I4d248c5602f3326c014ad37a4270d0e61eb53fc6
om/android/camera/Thumbnail.java
a5c1d8bf69892292d7efee102503b9d851fbf834 25-May-2011 Wu-cheng Li <wuchengli@google.com> Fix some comments.

bug:4473360
Change-Id: If87b14a1613b1c8d4095961665944ee0db70c7ca
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
63475660b8b67c503972419f35a2c7611c2a1a92 25-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Improve touch focus UI."
c3b311ea7c3718a8b8c704e29c5928c0537a0b64 24-May-2011 Wu-cheng Li <wuchengli@google.com> am 9bb90c3b: am 2049ccfd: Fix NPE in phone UI.

* commit '9bb90c3b940421a60251d2fb94b586461c544d5d':
Fix NPE in phone UI.
6fb969e2edd99340b3b77eae4e7b313a82937930 23-May-2011 Andy Stadler <stadler@google.com> Clean up package declarations & imports

No functional change. Just makes eclipse happier.

The specific fix is that RotateImageView had the wrong package declaration,
everything else is just cleanup after fixing that.

Change-Id: If862539e33af12a4cb0b24c9b7591f548340cab5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateImageView.java
04dfecf4f289e7ab888d3ff7f66588783bce2d6b 13-May-2011 Wu-cheng Li <wuchengli@google.com> Improve touch focus UI.

1. Now users can trigger touch focus if autofocus is already
in progress.
2. Autofocus is triggered in ACTION_UP. So users can drag
the focus rectangle and see exposure change.

bug:3475893

Change-Id: Ifbf586ae5ec2a11c64155e16bd25ae753220f4ce
om/android/camera/Camera.java
om/android/camera/ui/FocusRectangle.java
2049ccfd9b086f001e72c6d5e09876038fd18fa3 21-May-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in phone UI.

Phone UI assumes the on-screen icon changes when the setting
changes. Time lapse interval does not have icons yet. Remove
it from phone UI for now.

bug:4473360

Change-Id: Id413ea5fec58e26b78e44db4ac30e6c2d2a29106
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
9a663f7de4fa42ebbdf1ddaa5ee73ee9a7347f55 20-May-2011 Wu-cheng Li <wuchengli@google.com> am 41fff6e7: am e2eebff5: Fix NPE in capture intent of phone UI.

* commit '41fff6e73898387612b17737085ad2321a2727c4':
Fix NPE in capture intent of phone UI.
e2eebff5a84e6981d81d0a9ac28322867099b295 19-May-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in capture intent of phone UI.

bug:4454373
Change-Id: Icaeba621e619d826f91b6bf73a0f57e4fc520fa5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
1c24f5161cfc6a78e45da5f564626d06f6278f7c 17-May-2011 Wu-cheng Li <wuchengli@google.com> Show review image before share.

bug:4391419

Change-Id: Id357539bfe36eb3a30742dc4f8ca267ff53ff8b7
om/android/camera/Camera.java
om/android/camera/Thumbnail.java
om/android/camera/VideoCamera.java
8ab2b624d51b3b8254ece98c46a7e22a6fb5d4aa 13-May-2011 Wu-cheng Li <wuchengli@google.com> Refactor RotateImageView and thumbnail.

Change-Id: Ic435b7cd97ba775ec8f4b8342a1d4d25e2a5120c
om/android/camera/Camera.java
om/android/camera/RotateImageView.java
om/android/camera/Storage.java
om/android/camera/Thumbnail.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateImageView.java
9e1fcfe35695fd1e71d6c86f28075ca356e5bad5 15-May-2011 Wu-cheng Li <wuchengli@google.com> Remove dead code and reduce visibility.

Change-Id: Icec126d3d83f3b158d284dd63dfed8452ffa2249
om/android/camera/IconIndicator.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenHint.java
om/android/camera/Util.java
om/android/camera/ui/IndicatorWheel.java
940b813c57c6c6eb66f55d968c9cb2b28e79b24b 12-May-2011 Wu-cheng Li <wuchengli@google.com> Refactor preview frame layout.

Change-Id: Ief0acb3841078a36974e315054110bd9070a1f3f
om/android/camera/PreviewFrameLayout.java
d4594cafc86f8400012146abd48534aa9d68d92d 12-May-2011 Wu-cheng Li <wuchengli@google.com> Remove unused code and resource.

Change-Id: Ia6d98847716ef187eefd05758c5c61b530967b27
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
f5e80a8a5670798d52afe08e0c15aa4448d33316 10-May-2011 Wu-cheng Li <wuchengli@google.com> Add share button in IndicatorWheel.

Also fix a bug that warning toast is not shown when
white-balance or flash icon is pressed in scene mode.

bug:4391419
Change-Id: I724870347616a5a9a7d9007696eb08b923d18d54
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
43af5df853bdfa17715eb9abe61a7d3485aa05d7 10-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Refactor IndicatorWheel."
d50b09687918ae1c89e9c19175e217910b330c60 09-May-2011 Wu-cheng Li <wuchengli@google.com> Refactor IndicatorWheel.

Combine BasicSettingPopup and OtherSettingsPopup in
indicatorWheel for the preparation of adding share
button.

bug:4391419

Change-Id: I684890a9bf47611f25fe0f70faa0f08e6485d620
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/OtherSettingsPopup.java
0d604e2af9eeed22685fd62e2281c2cd9728d58b 09-May-2011 Wu-cheng Li <wuchengli@google.com> Add test for converting touch point to focus area.

Also add license for some files.

Change-Id: I492799aefad5afe771a082b90bf44f4301480be0
om/android/camera/Camera.java
15e50f3db82768bc6952a2007eeba3d354e37b5c 06-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Pass camera id while getting camcorder profile."
9fff0f154b8531094aa1349e0241a998c14da810 05-May-2011 Wu-cheng Li <wuchengli@google.com> Pass camera id while getting camcorder profile.

This also prevents NPE during variable initialization if camera
module fails to load. When camera module fails to load,
CamcorderProfile.get(int) will return null.

bug:4381780

Change-Id: I14a9af9e6f172cd02ef6df11ed81f1655361618a
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
f5becea4a2b2444408c022476db6556af0c0b95c 05-May-2011 Wu-cheng Li <wuchengli@google.com> Fix the bug that touch focus is cancelled unexpectedly.

Change-Id: I94d8277d07e37b41b149ec7a162b99f1d381d442
om/android/camera/Camera.java
fda645cedee5e3561f80dd9fc180052a0d902745 05-May-2011 Wu-cheng Li <wuchengli@google.com> Merge "Cancel focus after touch focus is triggered for 3 seconds."
3d108b88030763f102398487e9b9e74fb67b47a8 04-May-2011 Wu-cheng Li <wuchengli@google.com> Trigger touch focus only when the event is ACTION_DOWN.

So touch focus will not be triggered again when the
preview area is still being pressed and autofocus
completes.

bug:3475893

Change-Id: Id84c0c6328778150c66d4e766ddf11cd18be1d36
om/android/camera/Camera.java
3958d6c215643953fced0b857c4c6e20e848e093 03-May-2011 Wu-cheng Li <wuchengli@google.com> Cancel focus after touch focus is triggered for 3 seconds.

bug:4349618
Change-Id: Ia7130300fe7358b0bd937ac7ca23b73a63860466
om/android/camera/Camera.java
49bc3fd984521c8c8eed8733d9bdd7f2ccdd9057 03-May-2011 Wu-cheng Li <wuchengli@google.com> Refactor camera status and focus states.

Change-Id: I74fe291835e8f0cd9d852359463042969a801854
om/android/camera/Camera.java
51c1bbeeec7d2555debd5d2267a5ae16b076f313 03-May-2011 Wu-cheng Li <wuchengli@google.com> Tap will invoke autofocus & metering, but not snap a photo.

bug:4349618
Change-Id: I6458e24c4d7e892d51de3ecaba128195b7248b58
om/android/camera/Camera.java
7895ae7d31da363a225988ffd2e0479fece6499e 02-May-2011 Wu-cheng Li <wuchengli@google.com> Use frameworks focus area and metering area API.

bug:3475893

Change-Id: I96b958e60b93f48fd1ec27eb5e59ec3f2f11f5f7
om/android/camera/Camera.java
97d089d718dc92c0e9ccc3c923066cf4f0101c35 27-Apr-2011 Wu-cheng Li <wuchengli@google.com> Do not trigger touch focus when popup window is dismissed.

Also use getLocationInWindow instead of getLocationOnScreen.

bug:3475893
Change-Id: I6e5917cf7340a7968fd07c13bf91e3c555d0cf87
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
feaf2ccff42c44b74be814b66296f9ddedcc9aa9 27-Apr-2011 Wu-cheng Li <wuchengli@google.com> Reduce the size of focus rectangle.

Now the length of focus rectangle is 1/4 of the height of
preview frame.

bug:3475893
Change-Id: Ib1f09d5dbb25bb20343b39116c12febe08d83051
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/ui/IndicatorWheel.java
18c1ad898f3fddcd321af7ffbb32416a1b32f323 27-Apr-2011 Wu-cheng Li <wuchengli@google.com> Fix the incorrect position of focus rectangle.

1. The position of touch point should be based on the surface view,
not the parent of the surface view.
2. The original images of focus rectangle had too much blank around
the edges.

bug:3475893

Change-Id: I59cdee2b0d1efff7ede91e6482fe270e914cf77f
om/android/camera/Camera.java
bffc2038ddb61423d9dc40882f253f9207458f3b 26-Apr-2011 Wu-cheng Li <wuchengli@google.com> Set metering area when users touch on the preview frame.

bug:3475893
Change-Id: Ie399f938a2a457effed705e9996d665268458f22
om/android/camera/Camera.java
22e1d11ab2e59b672885fa5f7e5f08b1a2455225 04-Mar-2011 Wu-cheng Li <wuchengli@google.com> Add touch to focus.

bug:3475893

Change-Id: I4b23052a6e548adf5b209d46661590b79b8cb557
om/android/camera/Camera.java
d6274919641427d3062c0818943f2d55ab98c15d 18-Mar-2011 Wu-cheng Li <wuchengli@google.com> Add video capture intent tests.

Change-Id: Ic47007dae62e228267a9f4b3a037110cdf8cc52c
om/android/camera/VideoCamera.java
5df067af93e6b386167f11cdf12701b7905ee444 15-Mar-2011 Wu-cheng Li <wuchengli@google.com> Add image capture intent test.

Change-Id: Iba7ecf9054b630a14f1bf24ba223e0eecb1c3fd4
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
c9713f275106d2125867e4c0ef3c20d2fdf66022 15-Mar-2011 Wu-cheng Li <wuchengli@google.com> am bcf62003: Fix image/video capture intents are broken after switching cameras.

* commit 'bcf6200327be0b408426221767467ad2ce132a08':
Fix image/video capture intents are broken after switching cameras.
bcf6200327be0b408426221767467ad2ce132a08 10-Mar-2011 Wu-cheng Li <wuchengli@google.com> Fix image/video capture intents are broken after switching cameras.

The intent action should be kept if it is IMAGE_CAPTURE or
VIDEO_CAPTURE.

This also fixes the bug that video capture will fail after retake.
If the URI is passed in by the intent, it should not be removed
from the content resolver.

bug:4083519

Change-Id: Ia72e399ff8cd5c2a72cc6fe1500ee6922d9a4f5d
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
6091a783488b37db0822f74e2cd7841cad0fc628 10-Mar-2011 Wu-cheng Li <wuchengli@google.com> am 26ebb8e9: Make still camera and camcorder switch easier to use.

* commit '26ebb8e98e92599deec34b81623bbcb6213e5544':
Make still camera and camcorder switch easier to use.
8da3d3a262b3b6c30718c0eaee5b2bd0427baf06 09-Mar-2011 Wu-cheng Li <wuchengli@google.com> Print log while getting error from MediaRecorder.OnErrorListener.

Change-Id: Iae82d210c5c28873e886d55ed52b826a4bb46167
om/android/camera/VideoCamera.java
26ebb8e98e92599deec34b81623bbcb6213e5544 07-Mar-2011 Wu-cheng Li <wuchengli@google.com> Make still camera and camcorder switch easier to use.

1. Originally users have to touch on the horizontal bar between
camera and camcorder icons to switch modes. This is a regression
comparing to Gingerbread. Now users can touch on the icon and
drag to the other end.
2. Increase the touchable area.
3. Fix the bug that x and y of the touch events are off.

bug:4020145

Change-Id: I8ff241e1345e2c04d534ba421d977d33deb8b1cc
om/android/camera/Switcher.java
38a16262e8936afd22a83cf6b5b5a758de8f4f9e 02-Mar-2011 Owen Lin <owenlin@google.com> Fix a NPE in error handling code.

bug: 3499208
Change-Id: I45071a0d373cff2c58d9bbd89a46109750183020
om/android/camera/VideoCamera.java
4a70e66b58207703f8a705548efcd5353106e452 28-Feb-2011 Wu-cheng Li <wuchengli@google.com> Fix settings are not retained when we toggle from still & video mode.

"Restore defaults" clears the preferences of both cameras. Previously
the preferences variable was incorrectly pointed to the preferences of
front camera after restore defaults. After that, any camera setting change
were written to the front camera even if the current camera is back camera.

bug:3417946
Change-Id: I675ccd20bfdf9d44e53e90238c410228b55ee376
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
842b44f24ab621122183a149e20a852e5d8e0200 25-Feb-2011 Wu-cheng Li <wuchengli@google.com> Fix the bug that exposure is not matching with settings.

UI should be updated when exposure is reset in onResume.

bug:3398281
Change-Id: I535bac04643a684262ff756d079efc220e4bfa3d
om/android/camera/Camera.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/OtherSettingsPopup.java
44377058a0255e2944280fde5cc802e709af0d9b 25-Feb-2011 Wu-cheng Li <wuchengli@google.com> Restart the activity while switching front and back cameras.

This adds 300ms latency but the switching looks better with the
crossfade animation. We should use SurfaceTexture to do a better
and faster animation in the future.

bug:3446535
Change-Id: Ib5a5b2c049fb7c4d93769af530dd07a333ff4cb8
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
bc0127d436aa8f107100cb258ed9d058fc73dd61 25-Feb-2011 Wu-cheng Li <wuchengli@google.com> Merge "Make arc-shaped animation in time-lapse recording look better."
0565270359fe5bb01699bd9ff602b6ef949e0b72 25-Feb-2011 Wu-cheng Li <wuchengli@google.com> Merge "Ignore search and menu long press key event."
7673ada94b5e2263e7190ca246694cdee31ed03e 24-Feb-2011 Wu-cheng Li <wuchengli@google.com> Ignore search and menu long press key event.

Also ignore menu key during recording.

In phone UI, long-pressing search key will launch voice search.
Long-pressing menu key will launch software keyboard. It is annoying
to accidently launch them while taking a picture.

bug:3108635
bug:3278557

Change-Id: I87a5411d08c4bb292b5a0f78a4a0992a59e8816c
om/android/camera/ActivityBase.java
om/android/camera/Camera.java
om/android/camera/NoSearchActivity.java
om/android/camera/VideoCamera.java
248232e937007384328592e0c269b42cf03c6899 24-Feb-2011 Wu-cheng Li <wuchengli@google.com> Make arc-shaped animation in time-lapse recording look better.

Change-Id: I2bd2fca6948ae9edd6b26bee23000a41a239cbb3
om/android/camera/ui/IndicatorWheel.java
d27cd2ac1d65481d40a50dc9f0b3fe0d8e845fa0 24-Feb-2011 Wu-cheng Li <wuchengli@google.com> Close video fd after recording is done.

MediaRecorder sets the fd in prepare(). If camcorder closes fd
before that, fd will be -1 and prepare will fail.

bug:3471488

Change-Id: I72840ae8eb06a475a2d13745a15c57911558c97c
om/android/camera/VideoCamera.java
22898716834e5c08854a8ee1e71dc81a1ea8355e 21-Feb-2011 Wu-cheng Li <wuchengli@google.com> Add animation for popup windows and enable hardwareAccelerated.

Enabling hardwareAccelerated greatly improves the performance of popup windows.

bug:3446447
bug:3307722

Change-Id: I87bbabdeba63781fa8bee9aab6ca1b5cd3c0a381
om/android/camera/ui/IndicatorWheel.java
9ae00517d0258cffccdede80c1474fd532408a05 21-Feb-2011 Wu-cheng Li <wuchengli@google.com> Merge "Use crossfade transition when switching between still and video camera."
fc8589f38b3864875ee9c6de04b89d41542b53ce 20-Feb-2011 Wu-cheng Li <wuchengli@google.com> Use crossfade transition when switching between still and video camera.

bug:3446485
Change-Id: I39856a7254e3e8b3ffbea677412edbeb145e7158
om/android/camera/MenuHelper.java
232700d54651dcaefb378dc22bdb008a9815d1cd 18-Feb-2011 Wu-cheng Li <wuchengli@google.com> Fix wrong preview orientation when device is held upside down.

Suppose a user opens camera app and press home to exit.
The user holds the device upside down and opens camera again.
The animation takes some time so camera app will get the old
rotation value in onResume and surfaceChanged. Besides, framework
does not have a callback for it. The solution is to poll the
rotation value for 5 seconds. If it changes, restart the preview.

bug:3362860

Change-Id: I065e8601e321361d8db405f9c587ec2a5bce050c
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
d4a3fb30b2ef7ae03a01661041ff4735e1b4fbf1 10-Feb-2011 Wu-cheng Li <wuchengli@google.com> Make zoom more smooth.

Originally startSmoothZoom and stopSmoothZoom were called
many times even while the zoom button is being pressed.
Now startSmoothZoom is only called once when the button is
pressed and stopSmoothZoom is called once when the button
is unpressed.

Change-Id: I88a7c5027e54a3b36759ded448530cfd310aa0aa
om/android/camera/Camera.java
om/android/camera/ui/ZoomPicker.java
62776cd28a40b4c6ada4b4aa38683f45572ae266 09-Feb-2011 Wu-cheng Li <wuchengli@google.com> Fix shifted UI during HDMI output.

The background image has two problems. The ring in the image
was not aligned in the middle. The sizes of top and bottom
stretchable areas were different.

bug:3416589

Change-Id: Ibcc2c556af147267078f495f6fdc08b68f30e441
om/android/camera/ui/IndicatorWheel.java
855b4ca04f982c7110acd81b509c955df976926f 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> Fix camera preview orientation when device is held in portrait.

The problem is the rotation animation may still in progress during
onCreate. When we start the preview in onCreate, the display rotation
is still the value in portrait. So we check the display rotation
again in surfaceChanged. If it is different, restart the preview.

bug:3362860

Change-Id: Ib930c18d089114a3b5b9ca0f599e1ebdace73eb7
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
de0d58c0368407e37181c8236cc31c2da8b3491b 26-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPE in BasicSettingPopup." into honeycomb
e4ddd4c0ab7ae98541c1baa4da20a29c1915b6b5 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> Fix focus mode is not updated when scene mode changes.

bug:3382475
Change-Id: Iff8649b76443a882d9a62437e9843a71c57dcbc3
om/android/camera/ui/OtherSettingsPopup.java
75c11984594546002610c9f076520414ae4b6d4d 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> Fix NPE in BasicSettingPopup.

The monkey test sends DPAD_CENTER event and brings up the soft
keyboard. The layout will change and the basic setting popup
may have fewer children than items. In fact, setActiviated is
called by ListView and we do not need to call it.

Also add stateAlwaysHidden to make sure soft keyboard is always
hidden.

bug:3383128
Change-Id: I8032ff4680af7617c1568632af1c1678a04a04f8
om/android/camera/Camera.java
om/android/camera/ui/BasicSettingPopup.java
b5aaedd0e300f103f73907ec9bdfcc6b1231eef3 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Remove ImageCapture class to fix NPE." into honeycomb
9bd6c4687e40d86d5de95c3998eae7b079170d42 21-Jan-2011 Wu-cheng Li <wuchengli@google.com> Update video quality icons.

Also move the positions of icons by 2 pixels.

bug:3321003
Change-Id: Iab86457d4d701ef19bdd02882a1457d6c2a6b442
om/android/camera/ui/IndicatorWheel.java
edcae0ca2d9587e78cc52a58d0797d2aa28c0db9 21-Jan-2011 Wu-cheng Li <wuchengli@google.com> Remove ImageCapture class to fix NPE.

bug:3375346
Change-Id: I6b3b889dcd40e98321c5ca9987ceab424f966ff9
om/android/camera/Camera.java
9ace7a3c3af99226613c4a3a327f5726829f44a5 19-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Use arc shaped indicator to show the next frame in time lapse." into honeycomb
8da52d4bb31ad280779ec320bb86076386a485a2 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Update the recording time by time lapse frame interval.

Change-Id: I518c4e803dbe12b6dc3c8571233a2021c83de64f
om/android/camera/VideoCamera.java
a18b115b025fe0c3b046348953946c8db07e12ce 23-Dec-2010 Wu-cheng Li <wuchengli@google.com> Use arc shaped indicator to show the next frame in time lapse.

bug:3278557
Change-Id: Icee0bbe93cd5558aabc474bfba74a217fd5d4501
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
b3681fed693233f202e250ff22fed70d1bbb1932 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Remove 0.25s and 0.5s from time lapse recording.

Software encoder needs more than 0.25s to encode a frame.
Besides, we will add arc shaped indicator and it looks
bad with 0.25s and 0.5s.

Change-Id: Ic54748d91d91ad7fcc4701ede6cf1e07af73ecfb
om/android/camera/CameraSettings.java
8bed5138bb506fc743e4cd4f0dc67584802f6935 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference." into honeycomb
e64363e447ce719601f8e5b5de7ff0497a607a09 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference.

Change-Id: Ib00968c41b89733594725d2e921da2b8e4158a97
om/android/camera/CameraSettings.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
db0757dc9c627e7c5206104664028e386ade7d03 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Change AlertDialog.setIcon to setIconAttribute.

Use setIconAttribute to tell the framework you want the icon that works
with the theme you have set on your alert dialog.

Change-Id: Ie6e39f5c311f419c18d833323696363fa494aae9
om/android/camera/MenuHelper.java
om/android/camera/Util.java
07713606e48802a2516c34c9bb9df4fc7f77553f 17-Jan-2011 Wu-cheng Li <wuchengli@google.com> Correct the path of 100ANDRO.

bug:3361763
Change-Id: Ieed266fb498d41ee8dc5933d2fe8947037e09852
om/android/camera/Storage.java
4504e5b41a0f647ef3e16b1134e130fe3678aebf 12-Jan-2011 Wu-cheng Li <wuchengli@google.com> Tapping a ring control with menu opened should close it.

bug:3324333
Change-Id: I6a82db8b36b293630e6a487c22d270e23651dfe4
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
7341b9b5d8194c4ab7140977a8c5218e6d83d516 11-Jan-2011 Wu-cheng Li <wuchengli@google.com> Refactor. Move the logic from ControlPanel to IndicatorWheel.

The refactor is required to fix 3324333 properly.
bug:3324333

Change-Id: I8e4c9519cafac11bceea8dcaf22a4a92b2dd6181
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
bbe9db4d12978f220aeb0379731b548420bbd6db 17-Dec-2010 Yu Shan Emily Lau <yslau@google.com> Removed the flaky memory checking.
Added the image caputre and video recording stress test for the front facing camera.

Change-Id: Ice3abf35791e1953f70ef25375409fd5efe870b3
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
5eee0ee6fffdd2eb6a15b8c09d396973f1e63e8c 07-Jan-2011 Wu-cheng Li <wuchengli@google.com> Set CameraPicker state to pressed in ACTION_DOWN.

Switching camera takes a long time. The drawable state changes
after onClick. Set pressed state now so UI looks more responsive.

bug:3307728
Change-Id: I84b14990fe9089bb60725d6c6b2a5211f1fcf3a0
om/android/camera/ui/CameraPicker.java
d0bb5e37b110cb325ac3373843259c73ee47178e 06-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix the wrong video duration in time lapse mode."
95cd273906e0b48eb88ac422bca71662efb7c9e6 05-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Fix the state of indicator is wrong after taking pictures."
446b319606f90abedfa1927d4d47ce50e6b965c3 05-Jan-2011 Wu-cheng Li <wuchengli@google.com> Fix the wrong video duration in time lapse mode.

bug:3320235
Change-Id: I9532684b51f4a5091a27ea4d5a7d0e12d551fff1
om/android/camera/VideoCamera.java
894696f3f9f068a23696bbd05a5e9fc0d9ae5720 21-Dec-2010 Wu-cheng Li <wuchengli@google.com> Play the focus tone only when focus succeeds.

bug:3109218
Change-Id: I6110085a02931b457a8bf71b2f6c783c93fdd825
om/android/camera/Camera.java
74d035db6dc5cc98fa3e53689e469155a35aec66 05-Jan-2011 Wu-cheng Li <wuchengli@google.com> Fix the state of indicator is wrong after taking pictures.

During snapshot, indicators are disabled and enabled. But if some
indicators are overridden by scene mode, they should not be enabled.

bug:3308336
Change-Id: I1c992656b0b784ab9ae955126263c86dadec7dda
om/android/camera/ui/IndicatorWheel.java
2de93f3894b740b1af9ed3a1e2876a397f310832 04-Jan-2011 Ray Chen <raychen@google.com> Merge "Fix 3294798 MediaStore database reports duration of 0 for any video recorded using the camera"
bf5c2c192adfa62860fdcff560a458ba317e9b98 03-Jan-2011 Ray Chen <raychen@google.com> Fix 3294798 MediaStore database reports duration of 0 for any video recorded using the camera

Change-Id: I3e6a7c8af201e15dd08c86f77e75814c21a9b089
om/android/camera/VideoCamera.java
c7ee6d5e1859f788b20db6126f6a728f0016cc13 04-Jan-2011 Chung-yih Wang <cywang@google.com> Merge "Rename the resource id due to the monkey test."
9048630a1c9a37327039e6a2855636ecc065b642 29-Dec-2010 Chia-chi Yeh <chiachi@android.com> Cleanup: Remove BitmapManager, ImageManager, and gallery classes.

There are 1500 lines of code within 12 classes, which are now
completely replaced by 250-line Storage class. Hooray!

Change-Id: I9d0149cac18185972912f7b7a92f450929060274
om/android/camera/BitmapManager.java
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/LruCache.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
92e9f2c3078c4625f9531443c75e51c3dfef8b48 29-Dec-2010 Chung-yih Wang <cywang@google.com> Rename the resource id due to the monkey test.

It seems that there is another id contentPanel in alert_dialog. To
avoid this confusion, the id is renamed to 'settingList' instead.
bug:3307466

Change-Id: Ibff872369f02a8a51c32b5370d070da9d6776846
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/OtherSettingsPopup.java
0aaed976b603c56006213d196e6b0703285dafd5 29-Dec-2010 Chia-chi Yeh <chiachi@android.com> Refactoring: Remove the dependency to ImageManager.

Also polish Storage.addImage() a little bit.

Change-Id: I1001f2aeab031e39510ac513eafe85581e164b95
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
37cffb8467d1ccca719a7847582d04da36c5bc6f 27-Dec-2010 Chia-chi Yeh <chiachi@android.com> Refactoring: Remove the dependency of ExifInterface.

Since we only need the orientation information from Exif, it is
fairly simple to implement one by ourselves. This will avoid
disk access and JNI overhead, and save some CPU time since other
tags are not touched.

Change-Id: I962e2f19ec88a082bfd8eb438e255bffad2a5365
om/android/camera/Camera.java
om/android/camera/Exif.java
om/android/camera/Storage.java
75da345f6899b6e10274b9a443b32848aa34f39c 23-Dec-2010 Chung-yih Wang <cywang@google.com> Increase the resolution of video quality low.

bug:3287017
Change-Id: I7b3d814eecad5555690e1afca6e038ca43e44aeb
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
d1ec4e36667086836cd243bee38aded5e1fd88b1 22-Dec-2010 Chia-chi Yeh <chiachi@android.com> Refactoring: Reduce the dependency to the old gallery code.

Most of the functionalities will be implemented in Storage class.

Change-Id: Ibe0185978de511ead4cd91870070bdd2abce1e00
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
2e365737bc2509f65180558efee7fc57dced1843 22-Dec-2010 Chia-chi Yeh <chiachi@android.com> Merge "Check and create directories in Storage.getAvailableSpace()."
721d2d2a963799fad4bda9bb4b278c24fc469303 22-Dec-2010 Chia-chi Yeh <chiachi@android.com> Check and create directories in Storage.getAvailableSpace().

Since creating directories and files is not an atomic operation,
there is no way to prevent MediaRecorder.prepare() from throwing
exceptions. Now we let Storage.getAvailableSpace() to create the
directory and then bail out gracefully if it still fails.

Bug: 3304420
Change-Id: I98f1975b90250d63b60b36950e5813528862cc98
om/android/camera/Camera.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
0bab538de42a296cf4fa2c7f13c251c11a6f7d3b 21-Dec-2010 Chung-yih Wang <cywang@google.com> Apply the listview for other settings.

bug:3278543
Change-Id: Id528ac5b77536ef52ac29267d8c4cce481344295
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/OtherSettingsPopup.java
0217a7aeb599076b423b29232b124112363b727d 21-Dec-2010 Wu-cheng Li <wuchengli@google.com> Remove the workaround that sets preview to invisible.

The current device does not have this problem. This can
also make camera and camcorder applications consistent.

Change-Id: I857e40d0b9536e11fd018bea9f3af70bcd3c3b56
om/android/camera/VideoCamera.java
52c270d8fb59c69d635919dce4302cef9ace4230 21-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Reduce the width of control panel."
47335563ade2c03ee37621b49a16d5c6905e3531 20-Dec-2010 Wu-cheng Li <wuchengli@google.com> Reduce the width of control panel.

bug:3287095
Change-Id: Icb3b1706c9df5af76dd5df79245357b81752e8ed
om/android/camera/ui/IndicatorWheel.java
c8a7fc07e3b905a723e753b0c9144de2b0343f1f 20-Dec-2010 Chia-chi Yeh <chiachi@android.com> Refactoring: Extract the space calculating code into a new class.

Also fix several related bugs.

Bug: 2811896
Change-Id: I2ee31471ba7c67ab30516e85598190ab7630254d
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/Storage.java
om/android/camera/VideoCamera.java
11dd12bfdb800fbcb2121a81623138e89a7493ba 21-Dec-2010 Chia-chi Yeh <chiachi@android.com> Merge "Cleanup: Make Util get rid of IImage."
16bc028164dd02cea76801b9f9401f20075213d6 21-Dec-2010 Chia-chi Yeh <chiachi@android.com> Merge "Cleanup: Remove MenuHelper.closeSilently()."
6bca5289166b1444f4b98538343a24d35f46dda5 20-Dec-2010 Chia-chi Yeh <chiachi@android.com> Cleanup: Make Util get rid of IImage.

Change-Id: I1628bcae4daa4768186f08df0d328f7c5a5380df
om/android/camera/Util.java
5f039073a239fc8ebf94238c3dce24dc1cce865b 20-Dec-2010 Chia-chi Yeh <chiachi@android.com> Cleanup: Remove MenuHelper.closeSilently().

Change-Id: I449a10104615c402dbd36d615e845185063a9660
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/RotateImageView.java
om/android/camera/Util.java
f66311893cece329ecbb49161940fdc2071b1c4f 20-Dec-2010 Chung-yih Wang <cywang@google.com> Merge "Use ListView for basic setting popup windows."
222cc95121fa2f645257e55f208d23558f570e65 17-Dec-2010 Chung-yih Wang <cywang@google.com> Use ListView for basic setting popup windows.

bug:3278543
Change-Id: I4a1a31113dd5614eabb6ed5ebb0b2857f930b135
om/android/camera/ui/BasicSettingPopup.java
a25ee04fcb7be1a9aabc8bbccf044da70d4b5e88 20-Dec-2010 Hung-ying Tyan <tyanh@google.com> Update icons on the camera indicator ring.

No new icons for:
ic_viewfinder_video_quality_high
ic_viewfinder_video_quality_low
ic_viewfinder_video_quality_youtube

Copied from drawable-hdpi.

Also, don't enable/disable an indicator if the state is not changed. This is
so not to interfere with the highlight state.

Bug: 3278636

Change-Id: Ie3355c28afeabfebf951624324df38fe855a7069
om/android/camera/ui/IndicatorWheel.java
1afe2a1ff266f1ccd7fccf2c37e97d2136384896 20-Dec-2010 Wu-cheng Li <wuchengli@google.com> Avoid time-lapse recording label overlapping on review control.

1. Put time-lapse label under review control.
2. Hide review control during recording.
3. Hide time-lapse UI during review.
bug:3287027
Change-Id: If1695e5b1b0c5d222c8ae65ac721a4bb2e05a131
om/android/camera/VideoCamera.java
8303435a2466803e05dd99c60cdb2de074b79162 17-Dec-2010 Wu-cheng Li <wuchengli@google.com> Add debug messages for record location.

bug:3258991
Change-Id: I1dcac9d86e34e2b6b28e4a09a3b88bbfa77d9195
om/android/camera/Camera.java
fba0439b62f19a2a19ff6559c1ae055e910400db 16-Dec-2010 Wu-cheng Li <wuchengli@google.com> Show a toast when wb or flash is pressed in scene mode.

bug:3294395
Change-Id: Id8500a3f2abe6a7c261a4cad625a6ad3beba0b7d
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
286727c4681ccdc0b9832ff006accf569ddab172 17-Dec-2010 Wu-cheng Li <wuchengli@google.com> Remove the 30-minute limitation of video length.

New devices do not have this limitation anymore.

Change-Id: I48e30c55a5375b6926c861c5d2f2466f54e87ea9
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
7f01a4587e989b2265c9e24d9c8cb3d1a47506f9 17-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Choose the preview size that has the same aspect ratio as picture size."
0fad45d0d64569098f4daf34ff7e5ae785601304 17-Dec-2010 Wu-cheng Li <wuchengli@google.com> Choose the preview size that has the same aspect ratio as picture size.

Sometimes the camera driver has many preview sizes with close aspect
ratios. Now camera app only chooses the preview size if its aspect
ratio is an exact match of the picture size or video size.

Change-Id: I3be1189688de3ac499f7d69f4febf09c7763393a
om/android/camera/Camera.java
om/android/camera/Util.java
8dab44358e2f93b159f868e82cfac37a17269ba5 17-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Change youtube video limit from 10min to 15min."
2a58972491262e81f941293653dba81c9446fb46 15-Dec-2010 Wu-cheng Li <wuchengli@google.com> Change youtube video limit from 10min to 15min.

bug:3287031
Change-Id: I92ea46c9e3940d2537fcc89b02395928671c89f5
om/android/camera/CameraSettings.java
5849ebe2eb6463018a015cabcad3b61f1befcc9c 15-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Use the preview border images in asset git."
34fa41048a31866b3188190ec597b5a00f44269b 15-Dec-2010 Hung-ying Tyan <tyanh@google.com> Use the preview border images in asset git.

+ Append .9 to the file name.
+ Create time lapse verion.
+ Fix the 9 patch for hdpi images.
+ Remove the old images.
+ Increase margins for GPS indicator and thumbnail.

Change-Id: I4c3eb6599fe36846d4b9bb9bdf825b8aa8f1aaad
om/android/camera/VideoCamera.java
2a6febcc11326a6275a24cac9523e81cdc316a42 15-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Disable focus, flash, white-balance in scene mode."
b28ff297859deeacd9b70c0bb0299862a8606cbc 15-Dec-2010 Hung-ying Tyan <tyanh@google.com> Disable focus, flash, white-balance in scene mode.

Bug: 3273493
Change-Id: Ia900d231573620447af1f0b70cf39d0935db8b14
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/IndicatorWheel.java
ddf09d13c8e0f6756d1a5eadb971885131343a75 15-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Let front and back camera share the same time lapse preference."
13d91fc0fa66ef056397be20f013b51992e109de 15-Dec-2010 Wu-cheng Li <wuchengli@google.com> Let front and back camera share the same time lapse preference.

It is strange when users switch the camera and then time lapse mode changes.
Change-Id: I00d610ebab84ca9f200af17d1b700b81a64c1ead
om/android/camera/ComboPreferences.java
e50d2553aeb9e55504697e2a72759e8f46ee2992 14-Dec-2010 Hung-ying Tyan <tyanh@google.com> Disable camera/video controls when in certain op modes.

Covered modes are:
1. on photo/video picker review screen,
2. on snapping,
3. on auto focusing, and
4. during recording.

Bug: 3258859
Change-Id: Icc7d77c5b281c0ff04b1bffb2702a2e731d06127
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/SwitcherSet.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
0f405feacb2fa89d22e9fd8cb982cffad14af4a3 14-Dec-2010 Hung-ying Tyan <tyanh@google.com> Fix a NPE in Camera when zoom is changed

as the activity is paused.

Bug: 3285827
Change-Id: Ib5de58a66586d34226111d1197053801f08e6f8e
om/android/camera/Camera.java
5409c99b7f379d2290f584c2261e690113ad9585 14-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Ring lights up around preview frame to indicate time lapse mode."
4f4a94577d5c5024c485529c1d4c5f62cf9dd05f 14-Dec-2010 Wu-cheng Li <wuchengli@google.com> Fix the crash when setting is changed after exiting.

If users press home and change the setting, the popup
window will be dismissed and index will be -1. Ignore
the event if popup window is invisible.

bug:3279367
Change-Id: I2e783b55cc76656295053a807d6f721eceab7671
om/android/camera/ui/BasicSettingPopup.java
3e0ae4cf60e8735049aa9a276bc3c4b911537471 14-Dec-2010 Wu-cheng Li <wuchengli@google.com> Ring lights up around preview frame to indicate time lapse mode.

bug:3278551
Change-Id: Ib2acf5266f256a47bd1b5eb29c9d96c518b0a0bc
om/android/camera/VideoCamera.java
46872547dac204175ed5e017976f71efbcc3e27a 14-Dec-2010 Wu-cheng Li <wuchengli@google.com> Hide the next/previous button if the setting is the last or the first.

Other settings use next and previous button to control the settings.
If the setting is the first one, do not show the previous button.
If the setting is the last one, do not show the next button.

Also fix a bug that sometimes the state of long press is wrong.

bug:3273488
Change-Id: I45d6a5035c0175c8f1808c46078b0ff2291209cc
om/android/camera/ui/InLineSettingPicker.java
0d709c6b636e72a7b60cc03edb22cf70993f15d8 13-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Show only the actual recorded time in time lapse mode."
3da604b599211a0e3814a4238646abdee02f2786 13-Dec-2010 Wu-cheng Li <wuchengli@google.com> Show only the actual recorded time in time lapse mode.

Showing both actual recorded time and elapsed time is confusing.
bug:3278619

Change-Id: I554c89fa41daa7fd96aff669cb5ff3b2bccf99dc
om/android/camera/VideoCamera.java
cb3b8be589a23486f5fe83f4c551cb46794459df 13-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Swap back/front camera control and c/v switcher."
00ea42e26266fe1e746da5eb0b4818272084abb7 13-Dec-2010 Hung-ying Tyan <tyanh@google.com> Swap back/front camera control and c/v switcher.

+ Also make switcher horizontal with new UI elements.
+ Add HorizontalSwitcher.java and make it extend Switcher.

Bug: 3252812
Change-Id: If6af88b4904a942fa7ae32de5280e6763cd557e6
om/android/camera/HorizontalSwitcher.java
om/android/camera/Switcher.java
10208b3b4e2e9ca5af27be49356288531e3cd45b 10-Dec-2010 Wu-cheng Li <wuchengli@google.com> Remove mms quality if the device does not support voice.

bug:3272846
Change-Id: Ic573e790d323e93c9976e9985308890031d26a0b
om/android/camera/CameraSettings.java
om/android/camera/Util.java
b7893fdf578192a262dd48297c14092547c15d57 13-Dec-2010 Wu-cheng Li <wuchengli@google.com> Reset zoom to 1x in restore defaults.

bug:3176096
Change-Id: I37060279262e690b81978ba72160c58064445954
om/android/camera/Camera.java
eb852087f6cf63ad6e8a7a507070eadf398fd4ce 10-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Add dumpParameters for debugging when necessary."
373d10b91c8e736275a0bc52e247598eec0b3cea 09-Dec-2010 Hung-ying Tyan <tyanh@google.com> Implement photo/video picker mode using holo controls

Bug: 3253016
Change-Id: I0f851f2840cf1303c06921549028dcbf73d53b61
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
9bbd157589ef9ee4a525bc8bc49586c8ba45b3ae 10-Dec-2010 Wu-cheng Li <wuchengli@google.com> Enable time lapse recording UI.

Enable time lapse so people can try it.
bug:2901600
Change-Id: Idb20c25f1fc52981226dc3b5ea6e88bb9de0639d
om/android/camera/VideoCamera.java
10fb15e4b1a8cd4acae1a745ada98cf9fac5a809 10-Dec-2010 Wu-cheng Li <wuchengli@google.com> Add dumpParameters for debugging when necessary.

Change-Id: Ie21b93ddb02647df512ee0088e77c522902028f3
om/android/camera/Util.java
b6cd13cac0d29a6028c94906d596f0ea5518a980 10-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Disable camera/zoom pickers in photo picker mode."
ac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c 08-Dec-2010 Wu-cheng Li <wuchengli@google.com> Add time lapse recording code.

UI is not enabled because time lapse recording still has some problems.

bug:2901600
Change-Id: I1d60be9b11f8b98928dd5acacb79c70a3c2330e9
om/android/camera/VideoCamera.java
e9fdf5971bae4ebd6c0afe452da0b4e1be79aabb 09-Dec-2010 Hung-ying Tyan <tyanh@google.com> Disable camera/zoom pickers in photo picker mode.

The pickers should be disabled after a photo is taken and re-enabled when
the re-take button is clicked.

Bug: 3258859 (partially; this CL does not cover the settings on the wheel.)

Change-Id: I517728eb84ca6c947f268d58418188475051ab27
om/android/camera/Camera.java
ac071ecc8a6b7a88ce0be1c11142fec8529ad80c 07-Dec-2010 Chung-yih Wang <cywang@google.com> Add divider between settings in popup window.

bug:3242802
Change-Id: I37742a8db4ddaa272d0a84f395d7f6afe89a7909
om/android/camera/ui/BasicSettingPopup.java
d18f70fe9b9769242e23d04f7de8f300b4702f2e 09-Dec-2010 Hung-ying Tyan <tyanh@google.com> Fix the layout in video capture intent mode.

Side effect: camera picker is now disabled instead of disappeared during
recording. This is to make it consistent with other controls.

Bug: 3226747
Change-Id: Iecd62d83559f2df7dd544a8ecd00679473dfd4fe
om/android/camera/VideoCamera.java
74c5164d19fa213c6904639e6e6b0d9e542cbf66 08-Dec-2010 Hung-ying Tyan <tyanh@google.com> Implement camera ring/shutter control new design.

Bug: 3252941
Bug: 3252703
Change-Id: I1901fc88f6310881d8e0c864683041dbf6d986ba
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorWheel.java
003dd5a52457c024a0f99a2bb222bfc6ad70bbe5 06-Dec-2010 Wu-cheng Li <wuchengli@google.com> Add restore default in other settings.

Also change the theme to Holo.
bug:3156672
Change-Id: Ied6f2d3543c3a3282c62b2cc31e5cf4cc30c3172
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/OtherSettingsPopup.java
5030bd7b700869feb50083571a680fa55730229b 07-Dec-2010 Hung-ying Tyan <tyanh@google.com> Disable camera zoom control in video mode

instead of removing, and other fixes.

+ Add images for disabled state.
+ Remove zoom stub.
+ In ZoomPicker, increase transition period from pressed to long pressed state
to 300ms. 200ms is too short for single press and showing images in pressed
state.
+ In ZoomPicker, restore image to state list instead of normal-state image.

Bug: 3252995
Change-Id: Id9484d6e0580c023671cf96e60a099512075f656
om/android/camera/Camera.java
om/android/camera/ui/ZoomPicker.java
68c7128fb60ed5b83f7af13c02111b079218879a 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 79769585 to master

Change-Id: I8e78a4e4bd1dbd8f7f48196107ab78c915244e6e
79769585780d51499159bcb57c99fad01a80939f 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am f68b4b26: resolved conflicts for merge of cdd3e6fe to stage-korg-master

* commit 'f68b4b26dfa43b99aa20e20f534330105edc30ec':
code cleanup: unused import statements, local varaiables and ... removed from Camera app
f68b4b26dfa43b99aa20e20f534330105edc30ec 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of cdd3e6fe to stage-korg-master

Change-Id: I7f5844e0bb9a46cd8948b830712efdbc596a49f7
b03fe27d8392d190ea0dcc6d3661c117fe5e07d6 07-Dec-2010 Hung-ying Tyan <tyanh@google.com> Implement new visual design for Camera zoom control.

And overlay zoom control readout on top of preview area.

Bug: 3252827
Bug: 3252839
Change-Id: I2220a0784b94a7b80807bf7f4e29d039cb6e6f0f
om/android/camera/ui/ZoomPicker.java
95b65b1c84ad44b43bd3defbdba5d881c0881d35 07-Dec-2010 Chung-yih Wang <cywang@google.com> Don't show camera/video thumbnails if no pic/video taken.

Camera: Don't show camera roll stack control if no images were taken
yet.

bug:3252739
Change-Id: I5998ceade0172a45be637fa7c967d266e2079832
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
17bf7bc255fffcf9ae795a5b3983cd4878383613 07-Dec-2010 Hung-ying Tyan <tyanh@google.com> Reset camera zoom index in initializeZoom().

The zoom index was not reset when switching between front and back cameras.
Also fixes the following bug.

Bug: 3108968

Change-Id: If0cee2dc181463bfc97334916c07f5d2e876a5c7
om/android/camera/Camera.java
067fe861cf3402f2bef3f83995579d3411f0a8b3 03-Dec-2010 Hung-ying Tyan <tyanh@google.com> Re-load camera preferences when switching camera.

Change-Id: Iaf024bc035a4e9906082db2ae84ff6932ca9121d
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
9e76e8d6eec20739203d213ead1fe1aab3b939ae 06-Dec-2010 Chung-yih Wang <cywang@google.com> Move camera picker to control panel.

Change-Id: I5b2b0693bb3ef8e353b4b9c793583ed3e6522526
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
fa15ed300e2a487c2e305994a75fd8f162dc3be8 03-Dec-2010 Wu-cheng Li <wuchengli@google.com> Choose a separate preview size if the camera supports video output.

bug:3237021
Change-Id: I1ccda0ef2bc7cc419541699fe02f5056f024598d
om/android/camera/VideoCamera.java
d456809fe6646db9ed759ecc6457f9280d18f2a6 03-Dec-2010 Wu-cheng Li <wuchengli@google.com> Avoid the crash if the preference value is invalid.

Camera driver may have bugs. Avoid the crash if the value
is invalid.

Change-Id: Iffb168bcdfab48f7b9a4257136f0adb46c4ed528
om/android/camera/ListPreference.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/IndicatorButton.java
1970f8a3a2d03b0d0797ee9faebb2b4499c58beb 03-Dec-2010 Chung-yih Wang <cywang@google.com> Merge "Highlight the selected setting in popup windows."
8a66efdc845a5fdf0750d0fd6a2a92ecbcf77fce 03-Dec-2010 Wu-cheng Li <wuchengli@google.com> Update scene mode affected settings during initialization.

Change-Id: I41e8b0e7e48658c56f0bcc1a4c0842b946feffe2
om/android/camera/Camera.java
1d12db9c16f57894aee41d004b4e21d684cc269d 30-Nov-2010 Chung-yih Wang <cywang@google.com> Highlight the selected setting in popup windows.

bug:3242797
Change-Id: Iba2c93a2213723a16137a2083de10f3300feee2f
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicSettingPopup.java
85337c206051c2c7d33cca83255e00d92e288421 02-Dec-2010 Hung-ying Tyan <tyanh@google.com> Fix the camera layout in image capture intent mode.

Bug: 3226748
Change-Id: I0f01f4848aee7c8f82f785c5e42266d6247d06b4
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
937ea10204656beaa848df913dc9cb9b5a9b934f 30-Nov-2010 Wu-cheng Li <wuchengli@google.com> Let event fall through when users press outside popup windows.

Change-Id: I419c1436f07a91dbcdc851c891c3408ffcdd1429
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
b3babe73ce51b3842617d1690624b4d821bb30bb 02-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Fix NPE in releaseMediaRecorder. do not merge" into gingerbread
d09139b23bc06f8e0ecb90dd4048ab9ee374c253 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> Highlight icon when a camera setting is selected.

Bug: 3156690
Change-Id: I8c81345fb155d5137c349ed8b76225cfc43bb6b8
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorWheel.java
7998de9623e751e389494ab701a24455f4a868f9 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Disable IndicatorWheel when ControlPanel is disabled."
1c62e1b83c2fdda82c726bf712324444136fdc5d 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> Disable IndicatorWheel when ControlPanel is disabled.

Also removed "mEnabled" in ControlPanel as "enabled" is already a property in
the parent class (i.e., View).

Bug: 3242889
Change-Id: Ia035ed3eb068331f3d1b8184a51f2c1742710c12
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
616cbda19e4dffc71e3826f8748852c122af560b 16-Nov-2010 Wu-cheng Li <wuchengli@google.com> Fix NPE in releaseMediaRecorder. do not merge

Change-Id: I3b96bbaf3889ebf0ce825a20337196df04f11d19
om/android/camera/VideoCamera.java
2cb2c80efaecd1a2b772f9b139618c8191b24cd4 18-Nov-2010 Wu-cheng Li <wuchengli@google.com> Fix the bug that video thumbnail is not mirrored in attach mode. do not merge

bug:3208306
Change-Id: Ib0c0a873a797a8a0e03f30897d087d0ddcb1c315
om/android/camera/Util.java
266c04b7de53dffe416d5c967edb9f22fd3a8814 01-Dec-2010 Wu-cheng Li <wuchengli@google.com> Merge "Remove double tap to zoom."
dfc4793ddd07b8a80cdc9989afba006582443a01 30-Nov-2010 Wu-cheng Li <wuchengli@google.com> Remove double tap to zoom.

Double tap to zoom is not very discoverable. Now zoom control is
more obvious. It should be fine to remove double tap to zoom.
bug:3229583

Change-Id: If0cfb75bd15b4721165a8943482b836fd4fb3125
om/android/camera/Camera.java
b6be7b78d2645c6e5a377b4d118ccaf28c6b10a2 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> Fix camera/video switch position during video recording.

Use RadioGroup's OnCheckedChangeListener instead of RadioButton's to avoid
changing switch state during the transition of a RadioGroup checked state change
as a RadioGroup checked state change consists of a series of checked state
changes of its RadioButtons.

Bug: 3242656
Change-Id: I42ebd3aaffab690888b78be6d4d40afa26746db3
om/android/camera/Switcher.java
om/android/camera/SwitcherSet.java
19d029b83d65fb2e124f08aa8b98054974fc3acd 26-Nov-2010 Hung-ying Tyan <tyanh@google.com> Add highlight arc above the selected setting.

Bug: 3156690

Change-Id: I7ec745605d5fe9749b91c228bfd8ab1c70a5d423
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
823d57389b616091827059ca6401f675e416a53b 30-Nov-2010 Wu-cheng Li <wuchengli@google.com> Override other camera settings when scene mode is active.

Flash mode, focus mode, white-balance cannot be changed when scene mode is not auto.
bug:3156671
Change-Id: Iac019735e570903a1b9197ae6856cc612c7e67cb
om/android/camera/Camera.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/OtherSettingsPopup.java
36320a204da24e41041712d583fde22ed78b1155 30-Nov-2010 Wu-cheng Li <wuchengli@google.com> Merge "Move scene mode to indicator wheel."
976ac8fda15ae9f6209ccbaab3aeedb23c91281c 30-Nov-2010 Hung-ying Tyan <tyanh@google.com> Fix misplacement of camera shutter button.

mCenterX should be calculated before laying out the shutter button.

Change-Id: I23412f03314adefbbef95fba6d1035d37d1102f5
om/android/camera/ui/IndicatorWheel.java
e747919853dfcbe29969647d7bf83269056d77bc 29-Nov-2010 Wu-cheng Li <wuchengli@google.com> Move scene mode to indicator wheel.

bug:3156671
Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5
om/android/camera/Camera.java
om/android/camera/IconListPreference.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/IndicatorButton.java
8969b9f19f41c27abb942a35ee24dfcba2938a78 29-Nov-2010 Hung-ying Tyan <tyanh@google.com> Make camcorder recording time appear again.

Last CL introduces a bug making it disappear.

Change-Id: I3ed4f1777d73f130aad3c4c7a20fedf160a2c86b
om/android/camera/ui/IndicatorWheel.java
41ac285a1c97b1df78246456effb80de51033323 25-Nov-2010 Hung-ying Tyan <tyanh@google.com> Increase camera preview frame size and other changes.

+ Increase camera preview frame size and align it to the left of the screen.
+ Move thumbnail to the lower left corner of the preview frame.
+ Move GPS indicator to the lower right corner of the preview frame.
+ Replace LinearLayout and negative margin with RelativeLayout.
+ Revise the look of the settings wheel based on new UI mock.
+ Add border to preview frame.
+ Make settings popup windows align with an invisible view in the root view.
This makes it easier to adjust the location of the popup windows.

Bug: 3156693

Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99
om/android/camera/PreviewFrameLayout.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
048f1818ab5bff5ba97ea416a5166890c812ac1b 25-Nov-2010 Wu-cheng Li <wuchengli@google.com> Remove front/back camera switch from indicator wheel.

bug:3156676
Change-Id: Idb1052563356e54a27b2a5628c3db252d5f1ac54
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981 17-Nov-2010 Wu-cheng Li <wuchengli@google.com> Add title and its holo background for settings.

bug:3226752
Change-Id: I10d2430fb2db9283fa080284f9ad6c043d056865
om/android/camera/ui/AbstractSettingPopup.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/OtherSettingsPopup.java
59ddc8c1add2fcffe523e3877baad1b6cc5ba2fb 22-Nov-2010 Chung-yih Wang <cywang@google.com> Add front/back camera switch

bug:3156676
Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CameraPicker.java
623fc04dd6194559a22b8cc9305473bf9205eb58 24-Nov-2010 Hung-ying Tyan <tyanh@google.com> Merge "Highlight camera/video icon when mode is changed."
eb1f0c8299d96bad9bb449ff9e13eff4b43272cc 18-Nov-2010 Hung-ying Tyan <tyanh@google.com> Highlight camera/video icon when mode is changed.

+ Make camera/video icons on switcher radio buttons instead of RotateImageView
for x-large devices.
+ Add icons for camera and video on different states (normal and checked) for
x-large devices.
+ Add SwitcherSet.java that consists of the radio buttons and the Switcher and
replace the camera_switch_set linear layout with it.
+ Replace Switcher with SwitcherSet in Camera and VideoCamera.

Bug: 3156677
Change-Id: I1ea7b4d4149d0a8dc548086150a9ae1a616cd8de
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/SwitcherSet.java
om/android/camera/VideoCamera.java
fd2c1fb832526c9fa88858d80e53e4759ae9dec3 19-Nov-2010 Wu-cheng Li <wuchengli@google.com> Fix various UI issues.

1. Increase the left margin of other setting popup window.
2. Replace TableLayout/TableRow with LinearLayout.
3. Increase the size of previous/next buttons in other setting popup window.
4. Rows in BasicSettingPopup and OtherSettingPopup now use the same layout style.

Change-Id: I500cfed867367f997e40b559458d8d28ac27d2e2
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/OtherSettingsPopup.java
33896b2aaa53a67aa88125e818ceb20292d5f701 19-Nov-2010 Wu-cheng Li <wuchengli@google.com> Use holo.dark background on popup windows.

Change-Id: I1ed1dd3d23270d8da29bc446fa121067b98bb48e
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/OtherSettingsPopup.java
9cfab4bc18b8d9d905263c687e19c06df885dca7 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> Rotate the postview to correct orientation in video attach mode.

Manual merge from gingerbread.
bug:3208306
Change-Id: Ib7fb0a960c862527324adefd419e74224f59bc30
om/android/camera/Util.java
om/android/camera/VideoCamera.java
147bd5fe09aaed4c66967bd0b033c6c82accfbb3 17-Nov-2010 James Dong <jdong@google.com> Adapt the file extension of the recorded files to the requested file format.

bug - 3202417

Change-Id: Icb865419abc47726dc59c3fada4e4d789430b78a
om/android/camera/VideoCamera.java
80715aae46e5a7a9aa378002301ba9d76f093776 16-Nov-2010 Wu-cheng Li <wuchengli@google.com> Add background for indicator wheel.

bug:3156688
Change-Id: I91465730cc2ac9c586122573c1ac73ba48cc0cc9
om/android/camera/PreviewFrameLayout.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
53514599c5c11b6fa772f5c577d0be6f6355e3e7 16-Nov-2010 Hung-ying Tyan <tyanh@google.com> Overlay camera/camcorder switch to preview frame.

+ add new mode switch knob.
+ add new background to mode switch view.
+ add transparent background to entire switcher view.
+ adjust sizes and margins of camera_control and review_thumbnail according to
UI spec.
+ adjust sizes and margins of mode switch view according to UI spec.
+ fix a bug in Switcher where drawing the drawable should not take into account
the left/right paddings.

Bug:3156677

Change-Id: I1e452e5a519aa3fc2cfef418dde6a7c196c8547a
om/android/camera/Switcher.java
97a0ada3700cc76f999eaeb476d9a840f6f6e176 16-Nov-2010 Wu-cheng Li <wuchengli@google.com> Fix NPE in releaseMediaRecorder.

bug:3196125
Change-Id: If3f5ee415f29312366abcb775ffd5ca0cb5df184
om/android/camera/VideoCamera.java
43b6525b4aedc5e177163cab7b6f26698a19097f 13-Nov-2010 Wu-cheng Li <wuchengli@google.com> Set video orientation hint according to device orientation.

Also rotate the on-screen icons according to device orientation.
Move prepare to startVideoRecording because we need to set
the latest orientation to MediaRecorder.setOrientationHint.
setOrientationHint has to be called before prepare.

Manual merge from gingerbread.

bug:3163671
Change-Id: Ieeb4ed9a2777308a70cdd1242e5abf7867ead8c9
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
1b6cd72127f64a5306ee4acecaf6113627d35db2 13-Nov-2010 Wu-cheng Li <wuchengli@google.com> Move some classes out from Camera.java.

Change-Id: I455d6878feeacb3d44d80d899e8c948e1d28fca2
om/android/camera/Camera.java
om/android/camera/JpegEncodingQualityMappings.java
om/android/camera/ui/FocusRectangle.java
13161c7fe39bf019a334d8ea7e4eaddc1988adad 13-Nov-2010 Wu-cheng Li <wuchengli@google.com> Change the thumbnail list to a single thumbnail.

UI was re-designed.
bug:3156693

Change-Id: I766aab7dce9030f3b2800ea0995e7f4e118241a6
om/android/camera/Camera.java
om/android/camera/ThumbnailAdapter.java
om/android/camera/VideoCamera.java
70027ba6263ffc7958a24ad8524e7e0a00323816 13-Nov-2010 Wu-cheng Li <wuchengli@google.com> Various UI changes.

- Add video quality to the indicator wheel.
- Remove the head-up display in camcorder app from xlarge devices.
- Move recording time down a little bit.
- Align the zoom control to the left of control panel.
Change-Id: I0732e80edd80a703bcb2350fb4bb01a2c473e6a5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
fec1720cda1be572610c601ef6a6d929fb37be65 13-Nov-2010 Andrei Warkentin <andreiw@motorola.com> Camera App: Properly re-init ControlPanel on sensor switch.

Handle cases where there are less/more settings after switch,
for example caused by switching from a sensor without flash
to a sensor with flash.

Change-Id: I56a556f03679ab37c12f5918b09f6ac252c2ae3b
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>

bug:3166542
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorWheel.java
6eabb9b770a7c60cb92aa2e22f360754f32f39f8 11-Nov-2010 Wu-cheng Li <wuchengli@google.com> Close the camera application immediately when media server dies.

Crash the app earlier. Otherwise, the app will crash later in other
places and the log is gone. Getting a new Camera object is not good
because it's hard for the app to reset the current state. For example,
the state can be autofocus, preview, snapshot, recording, saving
thumbnail.

bug:3178948
Change-Id: Ibb38e6bfe927ed2ab9b87e2ee47044be8b96727b
om/android/camera/Camera.java
om/android/camera/CameraErrorCallback.java
om/android/camera/VideoCamera.java
a2cbd31e81bf6b4a65ade4a5c34c303546d57d8c 11-Nov-2010 Hung-ying Tyan <tyanh@google.com> Move camera UI elements to their own xml files.

Hopefully with this CL, the code doesn't need to worry about the placement of
the UI elements.

Change details:
+ Move preview frame out of camera.xml and video_camera.xml.
--> create preview_frame.xml and preview_frame_video.xml in both layout/
and layout-xlarge/.
+ Move thumbnail list view out of camera.xml and video_camera.xml.
--> create thumbnail_list.xml in layout-xlarge/.
+ Make camera.xml and video_camera.xml a pure container which includes other
UI elements.
+ Create camera_attach.xml and video_camera_attach.xml for the attachment
scenario with its own camera control and no thumbnail list.
+ Camera and VideoCamera are modified accordingly.
+ Remove redundant RelativeLayout container in camera_control.xml.
+ Also fix a layout bug in PreviewFrameLayout.java.

Change-Id: Ief556c9aa77b0322312bb46ce1d274df3a26aa4d
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
02ec7c0880ded5863d73d6f173ef35ab5c888dcd 04-Nov-2010 Wu-cheng Li <wuchengli@google.com> Change setting picker to popup window.

UI was re-designed.
bug:3156666

Change-Id: Id40fab084f59cdeca8e2991dc8b3768fcac8e0bf
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicSettingPicker.java
om/android/camera/ui/BasicSettingPopup.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/OtherSettingsPopup.java
becd4ed88304f83436403b4d785e18d1955535cb 11-Nov-2010 Wu-cheng Li <wuchengli@google.com> Check if surface holder is null in initializeRecorder. do not merge

If shutter button is pressed before surface changed,
surface holder can be null. Recording should be ignored.

bug:3187885
Change-Id: I61406f3c44342db28f0ebeddc788d2d1d621fc1b
om/android/camera/VideoCamera.java
1f09dac3d664734d099765783dae1233ef023226 11-Nov-2010 Wu-cheng Li <wuchengli@google.com> Fix the crash on tapping settings button when in front camera mode.

bug:3166485
Change-Id: I1c89a1fbfd5689d9881a7e62e4fac91770728368
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/OtherSettingsPopup.java
2c111a30c3a6bc6da85f092abb1111a24b166cb9 11-Nov-2010 Wu-cheng Li <wuchengli@google.com> Revert "Close the camera application immediately when media server dies."

This reverts commit 9cdae7b99f46a9a18bc2661d487f6f1e003f45ae.
om/android/camera/Camera.java
om/android/camera/CameraErrorCallback.java
om/android/camera/VideoCamera.java
9cdae7b99f46a9a18bc2661d487f6f1e003f45ae 11-Nov-2010 Wu-cheng Li <wuchengli@google.com> Close the camera application immediately when media server dies.

Crash the app earlier. Otherwise, the app will crash later in other
places and the log is gone. Getting a new Camera object is not good
because it's hard for the app to reset the current state. For example,
the state can be autofocus, preview, snapshot, recording, saving
thumbnail.

bug:3178948
Change-Id: I28a8b962d39d488f374a6f14550655d516a696bc
om/android/camera/Camera.java
om/android/camera/CameraErrorCallback.java
om/android/camera/VideoCamera.java
64fbf551646615592f8bd8320fef57e9aae01492 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> Rotate the recording time according to orientation. do not merge

bug:3163671
Change-Id: I87d8d8615df136d8347fb345e68eb1f8f8b6fb8b
om/android/camera/VideoCamera.java
om/android/camera/ui/RotateRecordingTime.java
f63366e6305e75ae289aaac20b397a3e9633d9df 09-Nov-2010 Hung-ying Tyan <tyanh@google.com> Add GPS on-screen indicator UI.

Bug: 3156684
Change-Id: I8985359e9f31df656cbf27024323da7ff33bac92
om/android/camera/Camera.java
d56274ad69e088a1682d33c6d414261ed080b378 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> Rotate the postview to correct orientation in video attach mode. do not merge

bug:3163671
Change-Id: I78d8de1b2fc5f15a268c94062a58b3065772b688
om/android/camera/Util.java
om/android/camera/VideoCamera.java
ec689e833e5730517d190a136710186a8f0c1445 09-Nov-2010 Hung-ying Tyan <tyanh@google.com> Add new layout file for camera.

+ Copied the layout file from res/layout and put it in res/layout-xlarge.
+ Changed FrameLayout to RelativeLayout in the new layout file.
+ Replace FrameLayout with View/ViewGroup in the code as it's not layout specific.

Bug: 3156684 (in progress)

Change-Id: Ife35528c08bc0e35793a0ff645ec9a7260c842c1
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
6897561d02003e59c038f1dc4d4669e3723e9cad 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> resolved conflicts for merge of 86b149d9 to master

Change-Id: Ida51ce14cbee3071cc26448e39bec05d505c8947
f59f7fb9870c1f285f9bdb5e3ca47a1548527837 08-Nov-2010 Wu-cheng Li <wuchengli@google.com> am c309fcde: am 35c8657f: Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread

* commit 'c309fcde67648ae483cab117a956ce11cf065ffd':
Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
6e5a8f04d04155f7e3a8681f42475ce5863ee046 08-Nov-2010 Wu-cheng Li <wuchengli@google.com> Set audio input source type to CAMCORDER in camcorder app.

Up to Froyo release, the media framework (pv opencore in particular)
was forcing the audio input source type to CAMCORDER whenever the
capture was for video and audio. This is not true anymore on
gingerbread with stagefright. The proposed solution is to specify
the audio input source as CAMCORDER in the camera app, and not
enforce it in the framework. Enforcing it in the framework removes
flexibility like recording from the front camera with a mic different
from the back mic on platforms with 2 mics and 2 cams.

bug:3171482
Change-Id: I5024ebb453054bfc0fcafedcdc78d98b0393bf81
om/android/camera/VideoCamera.java
35c8657f8b2e031e60908a06152df530e6604657 08-Nov-2010 Wu-cheng Li <wuchengli@google.com> Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread
e424c1b9176bb838feb67180a738836bb42b2a7a 06-Nov-2010 Wu-cheng Li <wuchengli@google.com> Set video orientation hint according to device orientation. do not merge

Also rotate the on-screen icons according to device orientation.
Move prepare to startVideoRecording because we need to set
the latest orientation to MediaRecorder.setOrientationHint.
setOrientationHint has to be called before prepare.

bug:3163671
Change-Id: I69efe7408aa5d47e2ef9bbab9dd4337a10d56814
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
3ecd5f5a78f828a2333457d3ee1ff5e180134fe1 05-Nov-2010 Wu-cheng Li <wuchengli@google.com> Enable front-facing camera recording. do not merge

bug:3163671
Change-Id: I88ea7c93aa6a08fb1cd529c3f5ad448399daba37
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
2b4b2a4b2ec489f93b2a98d5c90d972c50a38c7d 07-Nov-2010 Wu-cheng Li <wuchengli@google.com> Remove android.hardware.Camera.CAMERA_ID_DEFAULT.

bug:3173302
Change-Id: I2141456f3577e504e173a46efdbb343e03aaa5f5
om/android/camera/CameraSettings.java
a5ed74a5ad06f43b1129a9c698d7416ec3da4609 06-Nov-2010 Mohammad Shamsi <m.h.shams@gmail.com> code cleanup: unused import statements, local varaiables and ... removed from Camera app

Change-Id: I6480b49bffa898400b2f2f3eeea85ce3bceed457
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/Switcher.java
om/android/camera/ThumbnailController.java
om/android/camera/gallery/Image.java
om/android/camera/ui/GLRootView.java
87695169a6b54b39258f236656b31991a3dbc2f8 04-Nov-2010 Wu-cheng Li <wuchengli@google.com> Rename some classes and method names to avoid confusion.

bug:3156674
Change-Id: Ia907303880bf806e66431a527a6b778762296796
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicSettingPicker.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/OtherSettingsPicker.java
om/android/camera/ui/OtherSettingsPopup.java
1b97e31508c0d17636c6989c6fefab90ca84381e 03-Nov-2010 Wu-cheng Li <wuchengli@google.com> Remove front-facing camera recording. do not merge

The video looks upside down when the phone is held in portrait.
Remove front-facing camera recording before we have a complete fix.

bug:3163671
Change-Id: I453a21739c9ba387dd02be94bef5f92428e371f1
om/android/camera/CameraHolder.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
7f0d458b7d2ed913879db247d16abcfdec0dc897 01-Nov-2010 Wu-cheng Li <wuchengli@google.com> Add other settings to control panel.

Head-up display is removed from xlarge devices.

Change-Id: I4e05076ae368a7e288d56a092ffb92e9eee8376e
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ZoomPicker.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/InLineSettingPicker.java
om/android/camera/ui/OtherSettingsPicker.java
om/android/camera/ui/ZoomPicker.java
a365e0209d5b7059f029a7433fc0ded6a73f0983 26-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 89213eb3: am 12a1f7a2: Fix the bug that wrong profile is selected after switching camera
12a1f7a284f750ca0eb75689c9d07eaf72cd758f 25-Oct-2010 Wu-cheng Li <wuchengli@google.com> Fix the bug that wrong profile is selected after switching camera

bug:3132055
Change-Id: Ic493cf7ceef40c0e8a9cd8c2850f7b8f09b482fc
om/android/camera/VideoCamera.java
c858490003196648f5f25f56bce716cd24ba9446 25-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add other setting icon in indicator wheel.

Change-Id: Iab326b5b75cacaf6a2e70de9faed28291665d1d7
om/android/camera/Camera.java
om/android/camera/ui/ControlPanel.java
8ac3ef7835250c379acf9998b25c5f4ff7140589 24-Oct-2010 Wu-cheng Li <wuchengli@google.com> Rename some classes to avoid confusion.

Change-Id: Ie6895470d3aadd0a53fb69a3048039b7d8b4c524
om/android/camera/ui/GLLinearLayout.java
om/android/camera/ui/GLPopupWindow.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/LinearLayout.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/ZoomIndicator.java
5fda23dc5c015de8fcf9956c2fc9849a8c44b265 21-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add color effect UI to indicator wheel.

Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
9a2b75b19b46ad5a66edf9a1c97f8da281c3dfdc 19-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge 559a4151 from gingerbread-plus-aosp

Change-Id: I8ec4aa5210cb5104bedb7d5ed6f823f44517b203
c1dd72054122befb49aa1ca11ffa589b00186f80 18-Oct-2010 Wu-cheng Li <wuchengli@google.com> Fix wrong usage of setRotation and setOrientation.

bug:3105659
Change-Id: Ie2c1559cc03ece66705c1d766bea0e736f2684bc
om/android/camera/Camera.java
om/android/camera/Util.java
c4a762222cf20beee749a448be2bdf4765d06e54 19-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 03f097a0: am a7c1c50e: Merge "Fix wrong aspect ratio of camera preview." into gingerbread

Merge commit '03f097a09297ac400d340b3c4ffff4a9312da4f0'

* commit '03f097a09297ac400d340b3c4ffff4a9312da4f0':
Fix wrong aspect ratio of camera preview.
8974ca6b9412446d05f580c8d694d7e61eacb5ce 17-Oct-2010 Wu-cheng Li <wuchengli@google.com> Show indicator wheel and zoom picker earlier.

They should apeear together with switch and shutter button.

Change-Id: I5ec64cbbbabc3b5cce2bf5d0a11f11168d860faf
om/android/camera/Camera.java
om/android/camera/ZoomPicker.java
9847656580c612bee31b5b1f2256d2cad718644f 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> Change recording time position for xlarge layout.

Move recording time to the top right of the camera control
panel.
Change-Id: I8c13d2903f568d479d1aa963c6f0955e3126860c
om/android/camera/VideoCamera.java
de751a6a61b0e2806df4b2c5902aaadc7bb1aeb4 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add gallery button in thumbnail list.

Change-Id: Ide40ca003bd2454c27805e3c5a857845595ffc28
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
3966b3079aeaadbf376bee6aa0e12ff15863da4f 04-Oct-2010 Wu-cheng Li <wuchengli@google.com> Show only the images and videos under DCIM/Camera.

bug:3053286
Change-Id: Ib6c169d51c95ffae8343ea2e250150bdc43cddda
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
62bffb2f0ec34fba6f2e51087a307afa96c64dea 16-Oct-2010 Wu-cheng Li <wuchengli@google.com> Fix wrong aspect ratio of camera preview.

Surface view must match the preview size ratio. Deduct all
paddings while calculating the width and height of surface
view.

bug:3104492
Change-Id: I0d87a1c531f51fe74dd62b59f32dc40b1d1fb84d
om/android/camera/PreviewFrameLayout.java
f5bffc476b8293b30bb500bed2ab7914bb4ca411 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add more settings control in control panel.

Change-Id: I6280f5bfbcc87fde2ae046b65a9f91fa620c88bc
om/android/camera/Camera.java
om/android/camera/IconListPreference.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicSettingPicker.java
om/android/camera/ui/ControlPanel.java
om/android/camera/ui/IndicatorButton.java
om/android/camera/ui/IndicatorWheel.java
om/android/camera/ui/SettingsWheel.java
6490868a51c9b8c79f30c8d257f89adb8d26b7b9 05-Jul-2010 Owen Lin <owenlin@google.com> Implement the quick capture mode for Camera.

Bug: 2781348

Change-Id: I95d4d5bd9100061c93d1f0926877a0df13307458
om/android/camera/Camera.java
456f098f934bce0f06fb54a81fb74e0a9429e3d2 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> Double-tap to zoom should only work on preview frame.

Change-Id: I97fa06c3d03c25e4578f14e178b441c5c75814b5
om/android/camera/Camera.java
68b42c6483dfdde2ba899ba09f2122b0c2a5d556 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 323d012f: am 1f33b0ca: Merge "Do not call autoFocus in fixed and EDOF focus modes." into gingerbread

Merge commit '323d012feff1265ee67e0051605c030fa4187a5d'

* commit '323d012feff1265ee67e0051605c030fa4187a5d':
Do not call autoFocus in fixed and EDOF focus modes.
987e9b4e1849f2a3eab840de472e15ccde21d262 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> am bfc24ed9: am cec28d72: Merge "Do not show the setting if there is only one supported option." into gingerbread

Merge commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1'

* commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1':
Do not show the setting if there is only one supported option.
1f33b0ca1e2a2b08820f3e245b32110a632144e3 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Merge "Do not call autoFocus in fixed and EDOF focus modes." into gingerbread
e66f0cf3fa14c57ae18104f679ad3d98c90af11b 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Fix NPE when shutter is pressed before using setting wheel.

Change-Id: Ibaf712ca196061a61d5c5c40a80ed221ff49bf1c
om/android/camera/Camera.java
a73ebf03d722d965fc9b394bba2187a66559949f 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Do not call autoFocus in fixed and EDOF focus modes.

bug:3088128
Change-Id: I9ee656072449b7b900ba03d2afd2ff9ffd9867e0
om/android/camera/Camera.java
22216b6cc942fc3a97b99d6bce4b1a86f19c08d4 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Do not show the setting if there is only one supported option.

bug:3064986
Change-Id: I1d3a8cff955d203c2a055ee596f30035001a5c63
om/android/camera/CameraSettings.java
dfee7f813adb8de209472d24553b860d2515ea0a 11-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add white balance setting UI for xlarge layout.

Change-Id: I9775aae56cdee41232e628ebbaa87f7749d7e61f
om/android/camera/Camera.java
om/android/camera/IconListPreference.java
om/android/camera/ui/BasicSettingPicker.java
om/android/camera/ui/SettingsWheel.java
1b52934beb6e56a44cebf045d2ddb4dd510517a3 10-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 73304ce3: Increse the max height of popup window.

Merge commit '73304ce337208aa372836afa6edc4222a6dedde7'

* commit '73304ce337208aa372836afa6edc4222a6dedde7':
Increse the max height of popup window.
6f2283fbf049ad1f9870a86474af295604d95600 10-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add camera setting icons around the shutter button.

The icons are not clickable yet.

Change-Id: Ic88197386884849da32774aed932f358043b61b5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/SettingsWheel.java
73304ce337208aa372836afa6edc4222a6dedde7 08-Oct-2010 Wu-cheng Li <wuchengli@google.com> Increse the max height of popup window.

Some users do not know the other settings can scroll.
Increase the height a little bit so the bottom breaks
between two options. It looks more scrollable.

Change-Id: I350a07831ccbd23cb8d2e8b8463fb5764affe61d
om/android/camera/ui/HeadUpDisplay.java
c5019f4d58412da6227b3f2e6461bba5b7c671a3 04-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add zoom picker for xlarge layout.

The zoom of on-screen controls is not created if zoom picker
exists.

Change-Id: I229108aa8bc3eac7175acec46e14240627c7da7c
om/android/camera/Camera.java
om/android/camera/ZoomPicker.java
e6da834b082439299bb60529e690845e14dfdbc4 03-Oct-2010 Wu-cheng Li <wuchengli@google.com> Use cache to reduce thumbnail latency.

Change-Id: Ibf40c2f0e4bd229ec7065b94d439edaac6968b0f
om/android/camera/ThumbnailAdapter.java
c300a0266d634bb7a1e2df816e97bad2836991ac 03-Oct-2010 Wu-cheng Li <wuchengli@google.com> Pass camera id to CamcorderProfile.hasProfile.

In the future, android.hardware.Camera.Parameters should
have a getCameraId. It is easier for apps to know which
camera it is now.
Change-Id: Iae529c02d89b64a9158a0bdc4b4d0cfd293e7270
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
19cc9417181a1c91ae3ba879df0847933fbf2cfa 30-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 85ab5916: Fix the crash when zoom is not supported.

Merge commit '85ab591653bf09a4c851db374b000ecb18a7a970'

* commit '85ab591653bf09a4c851db374b000ecb18a7a970':
Fix the crash when zoom is not supported.
264d761a902e0f313a8124db91afc80b9e4f78e9 30-Sep-2010 Wu-cheng Li <wuchengli@google.com> am da9b3683: Merge "Fix the bug that on-screen zoom ratio is not reset." into gingerbread

Merge commit 'da9b36836565feab82573e2a1d8713caad67b061'

* commit 'da9b36836565feab82573e2a1d8713caad67b061':
Fix the bug that on-screen zoom ratio is not reset.
1efb18228a45952d699af280482e1c51a4582690 29-Sep-2010 Owen Lin <owenlin@google.com> Change review action domain to com.android.camera.

Change-Id: I21b3ef1494296671472acf3619688739861f2cff
om/android/camera/Camera.java
om/android/camera/Util.java
85ab591653bf09a4c851db374b000ecb18a7a970 30-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the crash when zoom is not supported.

Change-Id: I552f3857d52ed03a2e89e171ccb606dbf940ed44
om/android/camera/Camera.java
c6e3c7823339031096af937464cb528f53e045cf 29-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the bug that on-screen zoom ratio is not reset.

After onPause and onResume, zoom value is reset to 1x
but the on-screen text is not updated.
bug:3024097
Change-Id: I1e5be3732b79073da6582799bba54364e87e5d88
om/android/camera/Camera.java
8c5745a1ed8b825e84e4cc52b2b08b6146d621ea 29-Sep-2010 James Dong <jdong@google.com> A second patch to enable timelapse profiles for different cameras

Change-Id: I3cb6d1e0f3b90622d5ff02e7681a54e2e5d2a273
om/android/camera/VideoCamera.java
3b3b87324579d979d210b18a21600fb25ed71bfa 29-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 2d96a8e2: Merge "Hardcode package/class to switch between camera and camcorder." into gingerbread

Merge commit '2d96a8e256c556816a27e22d9f1e27a4595255d1'

* commit '2d96a8e256c556816a27e22d9f1e27a4595255d1':
Hardcode package/class to switch between camera and camcorder.
f746543692b971ce8fc41dddb646ddea07b63cb6 29-Sep-2010 James Dong <jdong@google.com> am 655327c6: Handle multiple camcorder profiles for different cameras

Merge commit '655327c6eb292b0647c603bfcf0c677a21a92fc6'

* commit '655327c6eb292b0647c603bfcf0c677a21a92fc6':
Handle multiple camcorder profiles for different cameras
2d96a8e256c556816a27e22d9f1e27a4595255d1 29-Sep-2010 Wu-cheng Li <wuchengli@google.com> Merge "Hardcode package/class to switch between camera and camcorder." into gingerbread
12a37600880bacb5207520eb74a857a75e2cddef 29-Sep-2010 Wu-cheng Li <wuchengli@google.com> Hardcode package/class to switch between camera and camcorder.

Users do not expect to choose other camera applications when they
slide the switch. If the activity is not found, fallback to the
intent without package and class names.

bug:3023951
Change-Id: Ifbd9916699255bffdc0cdfb50ed650ad26349dc4
om/android/camera/MenuHelper.java
9f73bd9a85d295091fae39dc256a122e1843e2e8 18-Sep-2010 Wu-cheng Li <wuchengli@google.com> Add last captured image thumbnails for xlarge devices.

Change-Id: I96d5472b62a7ffcc57642c09a0a7567a19f6ed42
om/android/camera/Camera.java
om/android/camera/RotateImageView.java
om/android/camera/ThumbnailAdapter.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
655327c6eb292b0647c603bfcf0c677a21a92fc6 28-Sep-2010 James Dong <jdong@google.com> Handle multiple camcorder profiles for different cameras

Change-Id: Ie15d829d20ffc0aaa470f0385e23055a95778a1b
om/android/camera/VideoCamera.java
6bf9e407d0dc0cd7e2f1f4799987523b107e8c96 28-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 141e3cc6: Fall back to standard VIEW intent if cooliris gallery does not exist.

Merge commit '141e3cc66815fafce690c889269a30ce7e06c4da'

* commit '141e3cc66815fafce690c889269a30ce7e06c4da':
Fall back to standard VIEW intent if cooliris gallery does not exist.
3de23de7b4035255714cd41ccc3d1310cbcb505c 28-Sep-2010 Wu-cheng Li <wuchengli@google.com> am a79c5e1d: Do not switch camera if the activity is pausing.

Merge commit 'a79c5e1d807e5c86f5f9ced44eac50076596e1ab'

* commit 'a79c5e1d807e5c86f5f9ced44eac50076596e1ab':
Do not switch camera if the activity is pausing.
141e3cc66815fafce690c889269a30ce7e06c4da 27-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fall back to standard VIEW intent if cooliris gallery does not exist.

bug:3039893
Change-Id: I52062ba817e2b6393df6c93f41492ca19c32f4f5
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
a79c5e1d807e5c86f5f9ced44eac50076596e1ab 29-Jul-2010 Wu-cheng Li <wuchengli@google.com> Do not switch camera if the activity is pausing.

bug:2876907
Change-Id: I581d1ebe07dae56b8e5daa5da320f19e7e531842
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
599e592e6ad7d470e090bad784a88d833a9c9a2f 30-Apr-2010 Owen Lin <owenlin@google.com> Improve the scroll bar in GLList.

Change-Id: I0d633fb7db7ea83445bf51b62f90dc5217eae746
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/RotatePane.java
8604957e95a17135dead711c98e6554a13249652 17-Sep-2010 Wu-cheng Li <wuchengli@google.com> am f17b91d9: Delete the video file if MediaRecorder.stop() throws an exception.

Merge commit 'f17b91d977b3ef91da6df83140776d93f2fa4e47'

* commit 'f17b91d977b3ef91da6df83140776d93f2fa4e47':
Delete the video file if MediaRecorder.stop() throws an exception.
f17b91d977b3ef91da6df83140776d93f2fa4e47 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> Delete the video file if MediaRecorder.stop() throws an exception.

The file may be malformed and causes problems in decoding.
bug:2934606

Change-Id: I2864584c934455a5aa01f8fc6d732494dd7c2899
om/android/camera/VideoCamera.java
2b2cbfb78e3e184b55041926c7bc7bdc18cb5934 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> am c97d2382: Update the code due to API change.

Merge commit 'c97d23826a28dd725951eccb62651244f9fb8228'

* commit 'c97d23826a28dd725951eccb62651244f9fb8228':
Update the code due to API change.
1ac6ed93a383bf2266a212e3b97ce52fa072fae8 16-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Adding ui for setting frame capture interval."
da395f80c71733e46736927f84e731066346f95e 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 50ab7fd1: Merge "Fix the wrong rotation on naturally landscape devices." into gingerbread

Merge commit '50ab7fd18e8a631237f7546cd25af974e3e30dcb'

* commit '50ab7fd18e8a631237f7546cd25af974e3e30dcb':
Fix the wrong rotation on naturally landscape devices.
f6a9ed7f6b08d0694795adc6ea6fce999e8cab87 15-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding ui for setting frame capture interval.

Currently adding a bunch of discrete options for the user
to choose from.

- Modified BasicIndicator class to allow ListPreference as well as
IconListPreference.
- Modified addIndicator() in HeadUpDisplay to take ListPreference
instead of IconListPreference.
- Modified GpsIndicator::getIcon() to return BitmapTexture instead
of ResourceTexture as its base class BasicIndicator does the same
now.
- Fixed default value of time lapse quality.

Change-Id: I9f01d8c77e9a803219c4661e10731fabbecf65a9
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
c97d23826a28dd725951eccb62651244f9fb8228 15-Sep-2010 Wu-cheng Li <wuchengli@google.com> Update the code due to API change.

bug:3001395
bug:3001399
Change-Id: Ie1347ed28aa72a3ec637867dc2226c60ef2dbd6c
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/Util.java
4aaa2130af7241f128ee561cafd17a4fb560b92c 10-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the wrong rotation on naturally landscape devices.

The orientation of on-screen icons and thumbnails are
wrong on devices that are naturally landscape in their
orientation. Display.getRotation should be used to
compensate.

Parameters.setRotation should also be compensated by
camera's orientation.

Change-Id: Ia0684fcd606252c49fa2d701ab07c73f7e29b70b
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/Util.java
b5ec9823f642decda6467e55dc1fd806d000bb75 15-Sep-2010 Nipun Kwatra <nkwatra@google.com> Switch to setCaptureRate from setTimeLapseParameters due to api change.

Switching to using setCaptureRate instead of setTimeLapseParameters due
to change in MediaRecorder API.

Change-Id: I9a838841ab55f9f968b77b2b8e518369c7e64d37
om/android/camera/VideoCamera.java
f09c56a025473647b16dcfe417fc0ecd25095d0f 14-Sep-2010 Nipun Kwatra <nkwatra@google.com> removing mUseStillCameraForTimeLapse, skipping audio for timelapse

- removing mUseStillCameraForTimeLapse as mediaRecorder whether to use
still camera automaticaly.
- don't set audio for time lapse case.

Change-Id: I3e4800639251c796e9798417a863ad8ee8163a37
om/android/camera/VideoCamera.java
035376721081f70aaf41d3da31aa50b479624ef0 12-Sep-2010 Nipun Kwatra <nkwatra@google.com> Filter out unsupported time lapse resolutions.

- Filtering out unsupported resolutions.
- Added getSupportedTimeLapseProfiles() to find the list of supported
time lapse profiles.
- added CamcorderProfile quality level values to the
pref_video_time_lapse_quality_entryvalues in arrays.xml
- removed getVideoTimeLapseQuality as can use the quality values directly.
- Use the newly added time lapse profiles for setting resolution values.

Change-Id: I0776a38e0a9bd19fff772878869e1c0504aadc8d
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
b48a6f5753d554f217bf77df97c47770f7265378 12-Sep-2010 Nipun Kwatra <nkwatra@google.com> fix filterUnsupported for null mIconIds + bugfix for largeIcons

- Allowing filterUnsupported to work when icons/largeIcons are not specified.
- bugfix: previously mLargeIconIds was getting created from iconIds instead of
largeIconIds. Fixing that.

Change-Id: I8803776896dfc4e96cf26489f6518fa34e3ad7bf
om/android/camera/IconListPreference.java
8eaa6919f0d5c10c95c99f2f937d57ea5c4a5bba 26-Aug-2010 Wu-cheng Li <wuchengli@google.com> Add switch camera on-screen button. DO NOT MERGE

Change-Id: I00895a9df69d2b29656075da1e03b1a1f684b107
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/IconListPreference.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/ZoomIndicator.java
7add00693c1ec910bc8700fe046ee18cbe4e1148 09-Sep-2010 Wu-cheng Li <wuchengli@google.com> Add switch camera on-screen button.

Change-Id: I1564fdf0f7f70f15278bdbdee6d9b5c8a6e683e0
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/IconListPreference.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/ZoomIndicator.java
77b6c6a8ef32eeca4c527ca52b04451e7458599e 08-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 4714a1cf: Use SharedPreferences.apply to reduce latency.

Merge commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0'

* commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0':
Use SharedPreferences$Editor.apply to reduce latency.
4714a1cf1d211aad2d8cf1802f85f649e744beb0 08-Sep-2010 Wu-cheng Li <wuchengli@google.com> Use SharedPreferences$Editor.apply to reduce latency.

Replace all commit with apply.
bug:2978683
Change-Id: I6c057fab588aada7c35d03f6237fb850d2a2e856
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ui/HeadUpDisplay.java
3cc5642c8dbf23e24b5f311cc96b2c0a37cf6bac 08-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 4e5aa452: Use new SharedPreferences.apply instead of commit.

Merge commit '4e5aa452a0e2438f9af1f08c56b1a7b414e561d9'

* commit '4e5aa452a0e2438f9af1f08c56b1a7b414e561d9':
Use new SharedPreferences$Editor.apply instead of commit.
4e5aa452a0e2438f9af1f08c56b1a7b414e561d9 07-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Use new SharedPreferences$Editor.apply instead of commit.

apply is the new async version when the caller doesn't care about the
return value, but is otherwise identical in observable effects.

BUG=2978683

Change-Id: I82086fc4501da53266802f95bebc624a7217fd8b
om/android/camera/ComboPreferences.java
om/android/camera/ListPreference.java
e8a08cd080fef292bde739405c9a6867b348ab37 04-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 91561bdb: Fix the crash when video quality changes.

Merge commit '91561bdb6ab42d5a262201fb4044bdc5949ca07c'

* commit '91561bdb6ab42d5a262201fb4044bdc5949ca07c':
Fix the crash when video quality changes.
91561bdb6ab42d5a262201fb4044bdc5949ca07c 04-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the crash when video quality changes.

Stop the preview in surfaceChanged before restarting the preview.

bug:2974865
Change-Id: Ie6b99c2650ee4900a277da87006950e984358d6f
om/android/camera/VideoCamera.java
65c5919bc9d1aa584717cbd9a2641151a4e41426 02-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbread

Merge commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58'

* commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58':
Remove quick capture UI. It is not used.
712a221b09dd39d7416b365aab616476d6ffb8a5 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> am d4a37518: Fix wrong orientation after suspend and resume.

Merge commit 'd4a37518c3b73fcf1860ab10fd3bb7e7ceffba99'

* commit 'd4a37518c3b73fcf1860ab10fd3bb7e7ceffba99':
Fix wrong orientation after suspend and resume.
ed8d17a1716b0c8d7d4f4451ad15de66355e9dc0 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> Remove quick capture UI. It is not used.

Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
626690482a7252c1961931a590d575884c47662e 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the build.

The change was automerged. But the master build has another
reference to showCameraBusyAndFinish.

Change-Id: Ib346321bcc95cc9d7a97adb0401a60499c48f7ac
om/android/camera/VideoCamera.java
d87cb2b7fec4fa2d4ccfb8600a5eb60bae9facf7 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 1ba127ec: Merge "Stop and restart the preview in surfaceChanged." into gingerbread

Merge commit '1ba127ec81106c9f63ef945137f315a55da59f4a'

* commit '1ba127ec81106c9f63ef945137f315a55da59f4a':
Stop and restart the preview in surfaceChanged.
d4a37518c3b73fcf1860ab10fd3bb7e7ceffba99 31-Aug-2010 Wu-cheng Li <wuchengli@google.com> Fix wrong orientation after suspend and resume.

Camera application calls setDisplayOrientation according to
Display.getRotation and sensor orientation. After power key is
pressed, camera app resumes behind the lock screen and preview
is started. Rotation is 90 at the time. After the screen is
unlocked, surfaceChanged is called because the orientation is
changed from portrait to landscape. Preview is stopped and
restarted. setDisplayOrientation should be called again because
the rotation has changed to 0.

bug:2870671
Change-Id: I1ca5106087c168d88cc8eb4f2a9f192d7fa75a8a
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
1ba127ec81106c9f63ef945137f315a55da59f4a 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> Merge "Stop and restart the preview in surfaceChanged." into gingerbread
068a2e745b284b33af161d629adb9b7839be32d1 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> Stop and restart the preview in surfaceChanged.

If surface is changed, applications should call setPreviewDisplay
again.
Change-Id: I91072e6daba841db486b54240bb85c455588aaee
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
b2e41700a6f36614d6f9dbec552a9737b6b6c174 31-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am 7bf93fe4: Renaming SharedPreferences.startCommit to apply

Merge commit '7bf93fe43dccbe31cfa6fe859ae7f9f946d8e923'

* commit '7bf93fe43dccbe31cfa6fe859ae7f9f946d8e923':
Renaming SharedPreferences$Editor.startCommit to apply
7bf93fe43dccbe31cfa6fe859ae7f9f946d8e923 31-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Renaming SharedPreferences$Editor.startCommit to apply

Change-Id: Ib31ff57f37ba08de32cd569b2bd86aee52cb64fe
om/android/camera/ComboPreferences.java
7a03ab3258d2c6baa397da09c8a98b0a23426d8c 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> am 454c6838: Remove metering mode support.

Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda'

* commit '454c6838bb220142d05fbd6f1858ba31cc034eda':
Remove metering mode support.
454c6838bb220142d05fbd6f1858ba31cc034eda 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> Remove metering mode support.

Change-Id: I624f611e19c438630bc84778332d13f0357da23f
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ui/CameraHeadUpDisplay.java
fc41c274526b34c434c32c95fbdfaad72370730a 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> am 299b0610: Merge "Fix memory leak. Camera application is leaking activities." into gingerbread

Merge commit '299b061032d7ba7d549e60175c514267f8d1d4a1'

* commit '299b061032d7ba7d549e60175c514267f8d1d4a1':
Fix memory leak. Camera application is leaking activities.
98e0be90b938b42814d3ee34e638a3f46c06fed4 27-Aug-2010 Wu-cheng Li <wuchengli@google.com> Fix memory leak. Camera application is leaking activities.

ComboPreferences.sMap (value)
-->ComboPreference (field mListeners)
-->HeadUpDisplay
-->activities

Make sure HeadUpDisplay is unregistered from ComboPreference
listener list.

bug:2949181
Change-Id: Ia0350afd6e9f23f92ce4b252a4b74709b4cd5bf7
om/android/camera/ui/HeadUpDisplay.java
678edf97c618e1699f4180815af3846380d5ee46 19-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added live diplay of recorded video time for time lapse capture.

Since the length of time lapse video is different from the length
of the actual wall clock time elapsed, we display the video length
alongside the wall clock time.

- Moved creating of hh/mm/ss string from milliseconds
to millisecondToTimeString() function.
- Added getTimeLapseVideoLengthString() which computes the video
length from elapsed time, capture rate and frame rate.

Change-Id: Ifea0a4f8376ad09f4a0a5a14aa3f96ac48fd27dd
om/android/camera/VideoCamera.java
cff180215ef0cb698808a2042163a12545063144 26-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am 20ddc205: Add SharedPreferences#startCommit() method.

Merge commit '20ddc2054b04d40b4e15e0831d3df02f30b600e8'

* commit '20ddc2054b04d40b4e15e0831d3df02f30b600e8':
Add SharedPreferences#startCommit() method.
20ddc2054b04d40b4e15e0831d3df02f30b600e8 26-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Add SharedPreferences#startCommit() method.

The interface widened.

Change-Id: I3ddf695c3d97b72eab4cfa3abe484db41d79a958
om/android/camera/ComboPreferences.java
4b0ab246e5eaf8a0650e6ee7499f97199b5d7069 24-Aug-2010 Wu-cheng Li <wuchengli@google.com> am dcd762a8: Close the video file descriptor earlier.

Merge commit 'dcd762a819f195fdbd441334ca5b97a07f1aa8dd'

* commit 'dcd762a819f195fdbd441334ca5b97a07f1aa8dd':
Close the video file descriptor earlier.
dcd762a819f195fdbd441334ca5b97a07f1aa8dd 20-Aug-2010 Wu-cheng Li <wuchengli@google.com> Close the video file descriptor earlier.

The file descriptor will be closed in finalize() eventually.
But it is better to close it as soon when we are done with it.

bug:2912676
Change-Id: I04e1abfdc946c2f218cca30d9140627444bce706
om/android/camera/VideoCamera.java
7705578d76ad0e4a181f64d52fade7694afb84f8 19-Aug-2010 Nipun Kwatra <nkwatra@google.com> Don't set max recording duration for time lapse.

Change-Id: I4752a63c77268808e5a395bff4bb5ab66e1b2a3d
om/android/camera/VideoCamera.java
d34ea4afb694b5e06906b5a431b3bdf4bfe001ca 14-Aug-2010 Nipun Kwatra <nkwatra@google.com> Use video mode for 720p time lapse.

Change-Id: I3ce834b83c633e781e4edbf245650acb1090ff46
om/android/camera/VideoCamera.java
6227fa641518492a6b660c78463da18d9ec8fcd8 06-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added support for time lapse video capture.

Changes in individual files:

VideoCamera.java:
- Added swith to time lapse option in Menu.
- initializeHeadUpDisplay(): sets up display according to the
current mode (timelapse/no timelapse).
- readTimeLapseVideoPreferences(): sets parameters according to
the chosen quality. Eventually this should move to CamcorderProfile
through media_profiles.xml files.
- switchTimeLapseMode(): handles switching between time lapse mode
normal mode.
- Since preview size may be different from video size for HD time lapse
capture, we save the desired preview size in mDesiredPreviewWidth,
mDesiredPreviewHeight and use it for comparison in
resetCameraParameters().
- Time lapse mode is enabled/disabled by calling
mMediaRecorder.setTimeLapseParameters().

CamcorderHeadUpDisplay.java: Constructor now takes in a boolean
(captureTimeLapse) telling whether to enable time lapse quality
options or the normal camcorder quality options.

Camera.java: Moved getOptimalPreviewSize() to Util.java to enable
use from VideoCamera.java. Also needed to pass activity, so that can
use getWindowManager(), getSystemService().

CameraSettings.java: added support for time lapse parameters. The
function getVideoTimeLapseQuality() returns the quality identifier
from the passed in string.

res/: added string, array values for time lapse.

res/xml/video_time_lapse_preferences.xml: contains all the preferences
for time lapse mode.

Change-Id: I194e7bc0b6218aa742d91c859a122de2b953a314
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/MenuHelper.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
8e5e83e6c5de9186e25bca70f6efc918dd2c5050 05-Aug-2010 Wu-cheng Li <wuchengli@google.com> Do not cancel autofocus when snapshot is in progress.

The bug occurred when camera key was half pressed, focus completed,
camera key was fully pressed, and camera key was released.

Change-Id: I4f25ee2e819cecbb59809de85fb450091e655927
om/android/camera/Camera.java
b13acb76f5b86f46dfe07830648ec14524e83d39 28-Jun-2010 Chih-Chung Chang <chihchung@google.com> Fix build again again.

Change-Id: I5acf4836559f265a24c1b0f26582711e6c6b06e4
om/android/camera/ComboPreferences.java
450254a7c9b30e4f36429b46895c944458f59962 28-Jun-2010 Chih-Chung Chang <chihchung@google.com> Fix build again.

Change-Id: Id0353479fef015e8b04139198607fb477d0f24ce
om/android/camera/ComboPreferences.java
d26dfad8d2f864d362230cc5357c9aa38f72138c 28-Jun-2010 Chih-Chung Chang <chihchung@google.com> Fix build.

Change-Id: Ib377c102bc0e2fde467d94ae81101417c76ce78a
om/android/camera/ComboPreferences.java
1ef634d277d550ed55b5b7089dfd56ed71815bd6 17-Jun-2010 Chih-Chung Chang <chihchung@google.com> Support multiple camera preferences.

Change-Id: I7c8440424c472c9ff61ac22692ce60234d359efe
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraPreference.java
om/android/camera/CameraSettings.java
om/android/camera/ComboPreferences.java
om/android/camera/VideoCamera.java
om/android/camera/ui/HeadUpDisplay.java
ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 15-Jun-2010 Chih-Chung Chang <chihchung@google.com> Support switching between multiple cameras.

Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/MenuHelper.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
186ff08e71d106e329171055accd4395760495ea 04-Jun-2010 Wu-cheng Li <wuchengli@google.com> Add metering mode support.

Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ui/CameraHeadUpDisplay.java
f2c905af4638db3b4aed433cc2664620704f2e6d 31-May-2010 Owen Lin <owenlin@google.com> mParameters is initialized in preview thread and could be NULL in
"initializeHeadUpDisplay()"

Bug: 2728390
Change-Id: Iaf27fa940a9758dff816c0c945ead330a2e9ec3f
om/android/camera/VideoCamera.java
0ab73a87e749477080c566cb9612cd3f25dc7574 28-May-2010 Wu-cheng Li <wuchengli@google.com> Show better message to users if camera fails to access sdcard.

Also print the exception if sdcard access fails.
bug:2713104

Change-Id: I35a553ee75a49398582b587755d097b02b144015
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
4ad1c1729d0ba95b5e96081759a96072e611df1f 14-May-2010 Owen Lin <owenlin@google.com> Refactor the code. Improve the inheritance structure of Textures.

Change-Id: I72a78f97cf54a6505cd7bff98e1db1bdf5fa84c9
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicTexture.java
om/android/camera/ui/BitmapTexture.java
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/ColorTexture.java
om/android/camera/ui/FrameTexture.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomIndicator.java
e4caca202b8dbec941a900bf470534ffc0436ce1 12-May-2010 Owen Lin <owenlin@google.com> Using GL to draw NinePatch

Change-Id: I2aa92bba691cbfde75523c196a880d0e18eeaba4
om/android/camera/ui/GLRootView.java
om/android/camera/ui/NinePatchChunk.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/Texture.java
c8e13fecea56e679418f41ba454f867c49f888aa 13-May-2010 Owen Lin <owenlin@google.com> Initialize the HeadUpDisplay only once in the life time of the activity.

And review the code so that mHeadUpDisplay won't be null when used.

Change-Id: I335a25e64035627c30ec2c6f45c17566f0ea2420
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
c4e6d563c3ae57e237952b82ad20ee693dfbf9d1 14-May-2010 Owen Lin <owenlin@google.com> resolved conflicts for merge of ec1dfcb7 to kraken

Change-Id: I5ea57293d0b34f4189983c7a9851555bcf5f5232
bef57e1d1fbb1881a7e3a22bb7567e8e7c2f0795 10-May-2010 Owen Lin <owenlin@google.com> Create a ColorTexture to draw pure color in GL.

Change-Id: I9dfa69b6037397d01a43c976b2d02acb16f2af62
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/ColorTexture.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/ZoomIndicator.java
ec1dfcb7314d10ff243a922fe4eff66ea699dd77 12-May-2010 Owen Lin <owenlin@google.com> Add copyright headers to source codes.

Bug: 2680376

Change-Id: I4d0b297f2cee13bb03104996f020732713c61e03
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/FrameTexture.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLOutOfMemoryException.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/LinearLayout.java
om/android/camera/ui/MeasureHelper.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PopupWindowStencilImpl.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/RestoreSettingsItem.java
om/android/camera/ui/RotatePane.java
om/android/camera/ui/StringTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomIndicator.java
125dee14bedc326bfbbb751278d549bafe349135 12-May-2010 Ray Chen <raychen@google.com> am e3911500: Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo http://2672651

Merge commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c' into kraken

* commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c':
Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo
e391150007300e63d3fb6e2236db3f4c9247fb9c 10-May-2010 Ray Chen <raychen@google.com> Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo
http://2672651

Change-Id: I7992574e978bba1f65c01c942220b0d435b45029
om/android/camera/Camera.java
f1672b4a703ea7600f17f451f6632f1cd399e839 06-May-2010 Owen Lin <owenlin@google.com> Initialize zoom in "InitializeSecondTime" so that we can get correct values for
zoom ratios.

Bug: 2643926

The zoom ratios are changed when the preview size changes. We need to read it i
again to get the latest values.

Change-Id: I64a248eba2aa63456f14452ffccaeaab090cc748
om/android/camera/Camera.java
0d73bccf89870682007dd32d4a84bcdb812e2cc7 05-May-2010 Owen Lin <owenlin@google.com> Handle events in the main thread and use GLThread only as a rendering thread.

Coordinate the two threads by synchronizing on the GLRootView instance.

Change-Id: I94459f6afeb468660df7219800bc48b621edecd4
om/android/camera/Camera.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CameraEGLConfigChooser.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/FrameTexture.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLOutOfMemoryException.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/LinearLayout.java
om/android/camera/ui/MeasureHelper.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/RestoreSettingsItem.java
om/android/camera/ui/RotatePane.java
om/android/camera/ui/StringTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomControllerListener.java
om/android/camera/ui/ZoomIndicator.java
cdf69cba3617c446e4fe9a92b4b4199c6ed36d01 05-May-2010 Owen Lin <owenlin@google.com> Move the texture coordinate 0.5 pixel inner so that GL won't get garbage
data.

So that GL won't get garbage data when do sampling.

Change-Id: I58a88c2fb1166e0c3991edfd320c69633c89d102
om/android/camera/Camera.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/Texture.java
7b783cb800a90b3f301374f354750292bb75f7aa 28-Apr-2010 Owen Lin <owenlin@google.com> Use our own EGLChooser so that we can fall back to use "copyImage2D" when
stencil is not supported. Also fix an issue in GLListView due to a different
behavior on Emulator, i.e., ACTION_MOVE won't be sent after ACTION_DOWN.

Bug: 2538315

Change-Id: I8eb26794656b42df1c89e675bc153879920a7155
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraEGLConfigChooser.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PopupWindowStencilImpl.java
7d16cd38466eaa850a08627552499116fb80286b 04-May-2010 Michael Chan <mchan@android.com> am 0055c650: Merge "b/2483367 Moving OneTimeInitializer to vendor/google" into froyo

Merge commit '0055c650940d5c4dbc75998e362c645ec358ec45' into kraken

* commit '0055c650940d5c4dbc75998e362c645ec358ec45':
b/2483367 Moving OneTimeInitializer to vendor/google
2275bf500f919b7f0b98a12c5078f8904d564c78 30-Apr-2010 Michael Chan <mchan@android.com> b/2483367 Moving OneTimeInitializer to vendor/google

See ee510dbe764abbc7bf74c0bb214f4c9a09b87fe8

Change-Id: I9da94242451ead99c1b26796a4dc554a9d3a6503
om/android/camera/OneTimeInitializer.java
b81d7a45d5514e0777f88c012a86c267e3f641e5 29-Apr-2010 Owen Lin <owenlin@google.com> Improve the Texture by using glTexSubImage to upload the image content.

So that we can prevent create another Bitmap just to satisfied the limit that
the width and height must be power of 2.

Change-Id: Ie0cdb1e944fb2bf928464955851fe62d00394d70
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/Texture.java
1e7d70c59c3547db7589c1cae977e98d9b4e95b9 26-Apr-2010 Owen Lin <owenlin@google.com> Avoid loading drawables in CameraSettings.

Bug: 2430326

Change-Id: Ia5e6f4320fac3a89ede5054e9ac7b6f31c973273
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/IntArray.java
om/android/camera/ListPreference.java
f86e6af0b8833f5f8a4b03fefba54b1922280d28 22-Apr-2010 Chih-Chung Chang <chihchung@google.com> Startup time improvements.
Bug: 2430326

Change-Id: I36dde4cee9f086e468caf87378ce1f2fd0d011c7
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/ui/GLRootView.java
18a0b5bb13b9dc9cdb01d03e901c0836742f7a3a 21-Apr-2010 Owen Lin <owenlin@google.com> Reset scece mode overrides in InitializeHeadUpDisplay.

bug: 2612518
Change-Id: I1b349f3b52cb2f474fa1b0790cc1f8fbecb0b9aa
om/android/camera/Camera.java
f00d421845b4ff2eca1354419889886fec5f2538 20-Apr-2010 Owen Lin <owenlin@google.com> Remove GLRootView in onPause() and put it back in onResume() to avoid OOM in
Gallery.

Bug: 2557840

Change-Id: I2d6ff6da25bfe342472278efd5fc25c38d5fd5ce
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/GLRootView.java
e5864ac46b5a776c29d6b5a47b14c6fa13070d59 21-Apr-2010 Owen Lin <owenlin@google.com> Merge "Fix bug: 2609027." into froyo
5e511f8bfe4ef16bcd4619d08eddad48f0f0deef 20-Apr-2010 Owen Lin <owenlin@google.com> Fix bug: 2609027.

Change-Id: Ic59f542f50c401492770423f98546e34a70fa2ef
om/android/camera/Switcher.java
523432315cea8f18d703a0d547b4614ce42b6918 20-Apr-2010 Chih-Chung Chang <chihchung@google.com> Don't stop user from taking pictures while the media scanner is scanning.
Bug: 2603078

Change-Id: Ic2159201434083919d7f7bc6b1ea2f3438971ebd
om/android/camera/Camera.java
29fbda065e287c87b4939a541a24e4f965e0b4f3 14-Apr-2010 Ray Chen <raychen@google.com> Always encode GpsTimeStamp in Camera.
Bug: 2596154

Change-Id: I00f40032e7db512ab09f6a66e5db7dbef8dc8e27
om/android/camera/Camera.java
b7957a87172eee9a34074bc6aec3a993dee96781 13-Apr-2010 Owen Lin <owenlin@google.com> Add aboutToChange to GLRootView.

This allow user to notify GLRootView to expect a size change in a near furture.

Change-Id: I8ea2a00c90f0d25c06ee9b292fa9defa2f379abd
Fix: 2591831
om/android/camera/VideoCamera.java
om/android/camera/ui/GLRootView.java
2acd452b2fe877b57d00278958ea4b34bad75159 09-Apr-2010 Chih-Chung Chang <chihchung@google.com> Add a hack to avoid allocating GL surface with different sizes.
Bug: 2515291

Change-Id: Ib0d886dcd355ddd3af09cc31089ed8c446911536
om/android/camera/ui/GLRootView.java
a30b554cc3707638172f8072f437cf8627dedda0 08-Apr-2010 Owen Lin <owenlin@google.com> Fix a typo in the code.

Bug: 2580309
Change-Id: I25ade485a56230b919d07698e1f9d9f25baaa5b8
om/android/camera/ui/GLRootView.java
0820de66481ba2e26c116dfa0a17ac470f11cf22 08-Apr-2010 Chih-Chung Chang <chihchung@google.com> Merge "Fix the ANR after switching between Camera and Camcorder." into froyo
37c3e754751deb849f7fe2d59743deac0d7c6392 08-Apr-2010 Chih-Chung Chang <chihchung@google.com> Merge "Make shortcut upgrading code a bit more robust. Bug: 2558040" into froyo
e6ffea291dde5adde94bf337731213e7fd3c8c56 04-Apr-2010 Wu-cheng Li <wuchengli@google.com> Do not register OneShotPreviewCallback to reduce latency.

bug:2430326
Change-Id: I14f10f1317096966edc094fc4df8691ec20fee11
om/android/camera/Camera.java
3f72c6828b2a07eed0b6a3083181d8946a7f01a0 08-Apr-2010 Chih-Chung Chang <chihchung@google.com> Make shortcut upgrading code a bit more robust.
Bug: 2558040

Change-Id: Id2fac56bd4c6082039c48648a757ff228217c713
om/android/camera/OneTimeInitializer.java
1aaf351f6bbaa0b1dc6c08bd5a590e1930e2ef07 01-Apr-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/ui/GLRootView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
e453bdb87ca7eb4e05b817774124731237a3d437 04-Apr-2010 Wu-cheng Li <wuchengli@google.com> Update the code due to API change.

bug:2553570
Change-Id: Ifa6b2ebbbd0d988deef25afdd013b5429438e52a
om/android/camera/Camera.java
82544b4564c079ece1a9065d19add36b2635bb8f 01-Apr-2010 Owen Lin <owenlin@google.com> Remove unused resources and code.

Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/Menu3DTest.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/VideoObject.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/PopupWindow.java
cba44d7c2bb86e5cbca3b0721d32547e8e70b94c 31-Mar-2010 Ray Chen <raychen@google.com> ThumbnailUtils.createVideoThumbnail API change

Change-Id: I175e722353dafac615c34e7b5b0e08c47ad6502a
om/android/camera/VideoCamera.java
3a4ef93f95bed9f812fe75ef94296450833b3997 31-Mar-2010 James Dong <jdong@google.com> 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
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
8586e6ce09565959d1857c77e52ca694fbba9d4d 30-Mar-2010 Chih-Chung Chang <chihchung@google.com> Merge "Update shortcut for VideoCamera too." into froyo
b2b23846d89c63ba0d28bbc7627022e6b9fa620b 26-Mar-2010 Owen Lin <owenlin@google.com> Fix one more NPE. (Second run)

Bug: 2529339
Change-Id: Idbfa4e6950a9e1ee3259226697d1cffa34dd23fa
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
c557947a5897106421fec68b082539317e4b25d0 18-Mar-2010 Owen Lin <owenlin@google.com> Improve GLListView UI.

1. Hide the scrollbar several seconds later.
2. Support fling operation now

Change-Id: I5ab22c91f5781ae3bc4b5aa779407ee374eddaa4
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/OtherSettingsIndicator.java
3eed8999c9fd92600c74225b671a2f03d7dd51d4 25-Mar-2010 Owen Lin <owenlin@google.com> Add some more ways to dismiss popup window(UX change).

Bug: 2538066
Change-Id: Ieb5b28500363ff5cc88b508329c84c35ebc5b230
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/IndicatorBar.java
b0601d6184b3ae784a1c3862e946eb42c03e5c7d 29-Mar-2010 Chih-Chung Chang <chihchung@google.com> Update shortcut for VideoCamera too.

Change-Id: Iaeb2f276bdcf133c4cf3c5a16ae92556de12a875
om/android/camera/OneTimeInitializer.java
29861ead0db94a40b502d81515ecb4194eac862a 27-Mar-2010 Chih-Chung Chang <chihchung@google.com> Update the shortcut for Camera to the new component name
because our uid changed.

Change-Id: Ic9f47dad348567c78b4e1d224bdc95ab14d09df6
om/android/camera/OneTimeInitializer.java
137417dade91f8a98cefa655cbd0d48b8cf52af1 25-Mar-2010 Chih-Chung Chang <chihchung@google.com> 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
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
416f65b0cc009d251a16512e7b6c3621bf62dc76 23-Mar-2010 Owen Lin <owenlin@google.com> Fix one more NPE.
Bug: 2529339

Change-Id: Ia9ea3ba839e35e1ce3e5cb3a1b1f0cc6f83f1465
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
e2c3e83c2086bd25815e05e1771ecfb95330d7d0 24-Mar-2010 Chih-Chung Chang <chihchung@google.com> Merge "Insert the "size" column with other attributes at the same time, so we don't need to spend time updating it."
c6550a0342402033d1f4b3b40f0c44a52c03c416 24-Mar-2010 Owen Lin <owenlin@google.com> Merge "Revert the icon rotation animation."
637248771a704926412c975da11a0877222e1766 23-Mar-2010 Chih-Chung Chang <chihchung@google.com> Insert the "size" column with other attributes at the same time,
so we don't need to spend time updating it.

Change-Id: I5d22f132f4d63b7a0a5bf8dfcfa04505ed324f34
om/android/camera/Camera.java
om/android/camera/ImageManager.java
35688439f40f00a1376dcfab6e6495989d82e433 22-Mar-2010 Wei-Ta Chen <weita@google.com> Fix 2533691 by using REVIEW intent added in Gallery.

Bug: 2533691

Change-Id: Ia8b7732a485bde5dec6b7cff0b80d4d6f08a8fee
om/android/camera/Camera.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
b77f928e01f24fc36ea4808b7373f502e7e6be41 22-Mar-2010 Owen Lin <owenlin@google.com> Revert the icon rotation animation.

Change-Id: If21daddd0caf6a7762ddb0478ab35d469908816b
om/android/camera/RotateImageView.java
e36da237f13cb3f31ec6fe3af98f2f838cabc6b2 22-Mar-2010 Owen Lin <owenlin@google.com> Fix several NPEs.

Bug: 2529432 and Bug: 2529344

Change-Id: I6c845da35d7fcef7b3fc38952a32793458e1f59f
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
72d0f95789afb93ea795c9e5deefcbe53d41fef7 20-Mar-2010 Wei-Ta Chen <weita@google.com> 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
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
f6b8405781b996997cab596419b5c79c8288a5bc 19-Mar-2010 Owen Lin <owenlin@google.com> Fix the startup crash.

Change-Id: Ide5dbbfe00f13cdcc09bf687e838243e579d43d0
om/android/camera/Camera.java
om/android/camera/ui/ZoomIndicator.java
ae7c3e5050bd58f57bd107cf3205f960988543fe 18-Mar-2010 Owen Lin <owenlin@google.com> Fix the zoom indicator not updated issue.

Bug: 2524432
Change-Id: I92bbbb5cc309ae8c1fff2df42691f8111a2d71f4
om/android/camera/Camera.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomIndicator.java
e41d75cb3d3ee51033c40a1a53c5edf313038e9b 19-Mar-2010 Owen Lin <owenlin@google.com> Merge "Fix the content truncated issue."
2d4f5cf0e5e20a0857a4cd478fd7aa238f16e30c 18-Mar-2010 Owen Lin <owenlin@google.com> Fix the content truncated issue.

Bug: 2514443
Change-Id: I0c4aca1b5f13d6fc499848cefcc9f5e1888602da
om/android/camera/ui/GLRootView.java
d5394c4c526a08b71d29ac1a09ffcf0e54de9caa 19-Mar-2010 Wu-cheng Li <wuchengli@google.com> Get the parameters before reading maximum zoom.

bug:2458926
Change-Id: Ie987df3ecfddc5582b101b4ead267dc2dbd7cc23
om/android/camera/Camera.java
fce06cd38c8886204981478ce505a32de2127c24 18-Mar-2010 Owen Lin <owenlin@google.com> Fix a NPE in VideoCamera.

Bug: 2520984
Change-Id: Ief7c7f58150bf7323d8ea59422ff31523a0a517a
om/android/camera/VideoCamera.java
706bd006d25aa8f322a9807eda6183a3941ad2c6 18-Mar-2010 Owen Lin <owenlin@google.com> Fix the picture size settings doesn't get initialized issue.

Bug: 2524062
Change-Id: Ia1062a23572dce7acc00a6877b92d088bc62aae6
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ui/HeadUpDisplay.java
f5876dbd29607a0e9762f88e9db6fa35ffb20067 18-Mar-2010 Owen Lin <owenlin@google.com> More improvement on UI.

1. Disable on-screen settings while video/camera is acting.
2. Reset exposure in onResume()

Change-Id: I4a58ae9c1a2ecff6d3f504de48e2504c8d86c1f3
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
59b5974a4ae078eb7628fd855db89e5be9b0fe6f 16-Mar-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/Camera.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomIndicator.java
6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec 15-Mar-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/CameraSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/RotateImageView.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
9ae7d027bb8f55b85a158cddeb7ed84c5a0a7983 13-Mar-2010 Chih-Chung Chang <chihchung@google.com> Add switch to Camera/VideoCamera menu item.

Bug: 2249997
Change-Id: I14434fb5c617a62e02eaace120157c4a9d32e681
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
ee1cf3f0509987e9c76626077bd8117399311ced 15-Mar-2010 Chih-Chung Chang <chihchung@google.com> Update camera parameters only when the camera is in idle state.

Bug: 2497176
Change-Id: I66b5c676884805fc1d3ca8c2109b8c210a66880b
om/android/camera/Camera.java
469a9ef839e38630e1e652d182f7e0ee5882e277 10-Mar-2010 Owen Lin <owenlin@google.com> New UI for camcorder.

Change-Id: Id35564836da7b4051662cccfd0920480421499b0
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/Menu3DTest.java
om/android/camera/OnScreenSettings.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CamcorderHeadUpDisplay.java
om/android/camera/ui/CameraHeadUpDisplay.java
om/android/camera/ui/HeadUpDisplay.java
c24155c65b45f554ffc29c523d7ea8e63ea10d33 10-Mar-2010 Owen Lin <owenlin@google.com> Restore Settings.

Change-Id: Ie5c26869151dd8959c122bf3c748d61420ac5c30
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RestoreSettingsItem.java
om/android/camera/ui/ZoomIndicator.java
7da52284cebf4e292033975e428b21affb661d73 13-Mar-2010 Wu-cheng Li <wuchengli@google.com> 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
om/android/camera/VideoCamera.java
1de0469fa91cee8ed0771d020042cc82576a601c 11-Mar-2010 Chih-Chung Chang <chihchung@google.com> Wait for camera idle (not focusing or snapshotting) before setting parameters.

Bug: 2497176
Change-Id: I8ac0d58e4f56042c70f30733aa6658ad4ca671b1
om/android/camera/Camera.java
e480f77352d670b2892a9b7b7cd503838b71ca9f 10-Mar-2010 Romain Guy <romainguy@android.com> Camera should have the com.android.camera package name.
Related to bug #2464545

Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/CameraSettings.java
om/android/camera/IconIndicator.java
om/android/camera/IconListPreference.java
om/android/camera/ListPreference.java
om/android/camera/Menu3DTest.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenHint.java
om/android/camera/OnScreenSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomIndicator.java
33be45a1abaf6a8d611fb87b18945c84ab76c229 06-Mar-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/ListPreference.java
om/android/camera/Menu3DTest.java
om/android/camera/Util.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/LinearLayout.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PopupWindowStencilImpl.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/ZoomController.java
om/android/camera/ui/ZoomIndicator.java
f08b1fdd1e860be0f27b277e0bbb9c2457d1abe0 10-Mar-2010 Wu-cheng Li <wuchengli@google.com> Hide the preview in onPause to avoid rotated preview.

bug:2257616
Change-Id: Ifce981831ce7022546ad1ec11527f2fe0bf36ff5
om/android/camera/VideoCamera.java
3889cf31101cfd4d336f1ce5ae5122c2cb3c0fdc 06-Mar-2010 Chih-Chung Chang <chihchung@google.com> Unbundle: change camera package name.

Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/CameraSettings.java
om/android/camera/IconIndicator.java
om/android/camera/IconListPreference.java
om/android/camera/ListPreference.java
om/android/camera/Menu3DTest.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenHint.java
om/android/camera/OnScreenSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PreferenceAdapter.java
d5be45065c4939d5a12b2294cb83230c1aaa8246 05-Mar-2010 Owen Lin <owenlin@google.com> Address the review comments.

Change-Id: Ia30be9e0081830bb05b6d7655c628d022ccd55d7
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLView.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/MeasureHelper.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/StringTexture.java
om/android/camera/ui/ZoomIndicator.java
281be5337852cb4b5d24e0a0440c426cb96bbebd 03-Mar-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/Camera.java
om/android/camera/Menu3DTest.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/GLZoomIndicator.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PopupWindowStencilImpl.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/StateListTexture.java
om/android/camera/ui/Texture.java
om/android/camera/ui/ZoomIndicator.java
9a4c2cac83f50e29063d27605c9f8d9e676a6f22 06-Mar-2010 Chih-Chung Chang <chihchung@google.com> Remove unused code.
om/android/camera/BitmapCache.java
om/android/camera/CameraSettings.java
om/android/camera/EvenlySpacedLayout.java
om/android/camera/IconIndicator.java
om/android/camera/ImageGetter.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/ReverseGeocoderTask.java
om/android/camera/RotateBitmap.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
e8697d7437c343e31e815fd4714238afafc7b1ac 05-Mar-2010 Chih-Chung Chang <chihchung@google.com> Remove unused code.

This is for unbundling, will clean more later.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
2ab82979d1701477f8aee1f78919c77edb4e1eaa 25-Feb-2010 Ray Chen <raychen@google.com> Add location provider name to gps-processing-method parameter.
om/android/camera/Camera.java
7cd2db8800fd2ad9ed09d299d9c505a338b9c4ec 02-Mar-2010 James Dong <jdong@google.com> Use unhidden public API from MediaRecorder.java class for setting parameters
This change depends on the MediaRecorder.java class change: 42513

bug - 2362412
om/android/camera/VideoCamera.java
a692ae22a3234bb0f6abdfe7a6e4244b84ef1ca1 02-Mar-2010 Horia Ciurdar <horia@google.com> Don't start recording right away, even when in quickCapture mode.
om/android/camera/VideoCamera.java
4de149ceb47f2c251f646419907424bfb67d2b64 29-Jan-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/Camera.java
om/android/camera/IconListPreference.java
om/android/camera/Menu3DTest.java
om/android/camera/RecordLocationPreference.java
om/android/camera/Util.java
om/android/camera/ui/AbstractIndicator.java
om/android/camera/ui/BasicIndicator.java
om/android/camera/ui/CanvasTexture.java
om/android/camera/ui/FrameTexture.java
om/android/camera/ui/GLListView.java
om/android/camera/ui/GLOptionHeader.java
om/android/camera/ui/GLOptionItem.java
om/android/camera/ui/GLOutOfMemoryException.java
om/android/camera/ui/GLRootView.java
om/android/camera/ui/GLView.java
om/android/camera/ui/GLZoomIndicator.java
om/android/camera/ui/GpsIndicator.java
om/android/camera/ui/HeadUpDisplay.java
om/android/camera/ui/IndicatorBar.java
om/android/camera/ui/MeasureHelper.java
om/android/camera/ui/NinePatchTexture.java
om/android/camera/ui/OtherSettingsIndicator.java
om/android/camera/ui/PopupWindow.java
om/android/camera/ui/PopupWindowStencilImpl.java
om/android/camera/ui/PreferenceAdapter.java
om/android/camera/ui/RawTexture.java
om/android/camera/ui/ResourceTexture.java
om/android/camera/ui/RotatePane.java
om/android/camera/ui/StateListTexture.java
om/android/camera/ui/StringTexture.java
om/android/camera/ui/Texture.java
02627adfa3d240d817e34af69be8d07e9c66c136 24-Feb-2010 James Dong <jdong@google.com> Set duration and still image encoding quality using Java API
- rebased

bug - 2375978
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
e7a53d0c5c3b8434e7ee8b92072ec8c47fe12cdb 25-Feb-2010 Owen Lin <owenlin@android.com> 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."
6d35fde323778d8e1725e399c80503061c200e16 04-Feb-2010 Owen Lin <owenlin@google.com> 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
om/android/camera/Camera.java
b6be8b6567cc7d758ce58bc8ba1b05e1e9debfae 24-Feb-2010 Wei-Ta Chen <weita@google.com> Enable enter and exit animations; and use overridePendingTransition
for disabling animations in switching VideoCamera and Camera.

Bug: 2416396
om/android/camera/MenuHelper.java
803afcc7dae35d6a02e8882fc5fcbcdcca4eaad4 19-Feb-2010 Chih-Chung Chang <chihchung@google.com> Move set screen brightness later so we can start preview earlier.
om/android/camera/Camera.java
ffbbd7f09b8832ce523799eec53753cd3559e53d 11-Feb-2010 Chih-Chung Chang <chihchung@google.com> Remove the use of native allocation.
om/android/camera/ImageGetter.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
e3172febb111f286a37b685938dd930856540d77 11-Feb-2010 Chih-Chung Chang <chihchung@google.com> Remove support for DRM images (they are not used now and reference to hidden classes).
om/android/camera/ImageManager.java
om/android/camera/gallery/DrmImageList.java
9eddd3ad50e2db247929e1b0cb6b324d94e3d07f 08-Feb-2010 Ray Chen <raychen@google.com> Revise due to ThumbnailUtils api change.
om/android/camera/ThumbnailController.java
f8b49e317d2d039a89ce1d0b40c75131ce661080 10-Feb-2010 Bjorn Bringert <bringert@android.com> Merge "Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES"
d297974355b4ccf25f2164965e3564d537305168 08-Feb-2010 James Dong <jdong@google.com> Replace calls to system_property with CamcorderProfile API
- rebased

bug - 2417312
om/android/camera/VideoCamera.java
c660fe4dd8b146c1d88d839bd5b26c916684fac4 08-Feb-2010 Bjorn Bringert <bringert@android.com> 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
om/android/camera/RecordLocationPreference.java
f4d298013ceeca4b44d63d01587a33cb6bbf7f52 08-Feb-2010 Wu-cheng Li <wuchengli@google.com> Remove some log messages.
om/android/camera/Camera.java
om/android/camera/Switcher.java
550f04e9cf356b5be7436447d53172895c8407b8 05-Feb-2010 Ray Chen <raychen@google.com> Fix issue 2340332 Inconsistent UI between review mode in Camera app and album view in Gallery app
http://b/2340332
om/android/camera/Camera.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
4ea5d83539da6ab77a56415f69e9d5dbe205766a 04-Feb-2010 Owen Lin <owenlin@google.com> Fix the switcher could be in wrong place some time.

Change-Id: I504978763da3da797f71ca9fd00116d8b27729ee
om/android/camera/Switcher.java
cc0a1360f79b09e34a96123b6cb26c6a0ac7c5df 28-Jan-2010 Ray Chen <raychen@google.com> Unbundle Camera: Unhide ThumbnailUtil and rename it to ThumbnailUtils.
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/VideoObject.java
3e4a5244d3ca744e7ac7e89163ac562c24e002d9 27-Jan-2010 Chih-Chung Chang <chihchung@google.com> Merge "Use public api instead of protected members."
8b1c724f385ae1973af382c500f58042f5b37466 26-Jan-2010 Owen Lin <owenlin@google.com> Fix a bug that RotateImage didn't draw the thumbnail in the center.

Change-Id: Ia46c5ecbceebd5062c76b9396f39a17ae6bc1ed2
om/android/camera/RotateImageView.java
om/android/camera/ThumbnailController.java
dbbfcecfddc1a1767cec34a1172c87f23e089261 26-Jan-2010 Chih-Chung Chang <chihchung@google.com> Use public api instead of protected members.
om/android/camera/Switcher.java
52064aa4bacfae605823b99f675649b1786e8c8a 26-Jan-2010 Owen Lin <owenlin@google.com> Fix a minor issue of "restore default" should also improve
performance as well.

Change-Id: I1a762ed78dc27bb711b652431481925c9bd1b8b5
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/ListPreference.java
om/android/camera/OnScreenSettings.java
om/android/camera/PreferenceGroup.java
om/android/camera/VideoCamera.java
8791695ba110ad0b088d2e8b3b0127c0042e1865 23-Jan-2010 Owen Lin <owenlin@google.com> Add quick capture settings for Camera application.

Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b
Bug: 2259528
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
73e782de608cbe2ddffd75c055009ff2e208f78b 19-Jan-2010 Owen Lin <owenlin@google.com> Unbundle with the PreferenceManager.

Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6
om/android/camera/Camera.java
om/android/camera/CameraPreference.java
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/ListPreference.java
om/android/camera/OnScreenSettings.java
om/android/camera/PreferenceGroup.java
om/android/camera/PreferenceInflater.java
om/android/camera/RecordLocationPreference.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
a9c2f922763d3f7d19c237f9c5bd46611b5076fd 22-Jan-2010 Wu-cheng Li <wuchengli@google.com> Fix the bug focus bracket may appear in infinite focus mode.

bug:2247217
om/android/camera/Camera.java
85f7213b44515c06fee68a085065e5d96181465c 15-Jan-2010 Owen Lin <owenlin@google.com> Add restore default settings for Camera/Camcorder app.

Bug: 2167010
Change-Id: I1b59ddd23ee9a3b9cc34f911c048e269fb872cf8
om/android/camera/Camera.java
om/android/camera/OnScreenSettings.java
om/android/camera/VideoCamera.java
e2900e1761d73aec4d269d166981278dd27dffbc 21-Jan-2010 Horia Ciurdar <horia@google.com> Adding hidden quickCapture extra.
om/android/camera/VideoCamera.java
ed32015f4a0536e842306a207d620ec5e3f665c0 24-Dec-2009 Owen Lin <owenlin@google.com> Set the brightness to a fixed value.

Bug: 2318682
Change-Id: I367fde55fab1102019accd69e69dc516c583c153
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
2a8efc192e4c8dd6fff475494591b05b92920f22 05-Jan-2010 Chih-Chung Chang <chihchung@google.com> Use public api instead of hidden member. Don't use internal resource.
om/android/camera/MenuHelper.java
om/android/camera/Switcher.java
2e862df90cac949a91634da5dce4b54d7c20d505 04-Jan-2010 Ray Chen <raychen@google.com> Fix issue 2343916 Camera application does not obey date format setting.

http://b/2343916
om/android/camera/MenuHelper.java
6d08c5d4cb3925a11a1adbfdb0e463ca6f5dca5a 05-Jan-2010 Chih-Chung Chang <chihchung@google.com> Remove "display name" and always use "title" field in display (same as Gallery).
om/android/camera/MenuHelper.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
6dfb03741e9ed0821fbd7fa6912f44bf76bebca6 14-Dec-2009 Wu-cheng Li <wuchengli@google.com> Do not set WB or effect if driver does not support it.

The app should always check if camera driver support the parameter
before setting it. Otherwise, the app will always crash if parameter
string changes.

b/2323831
om/android/camera/VideoCamera.java
59595d1cad16653e73bfdf811386b037f8925569 11-Dec-2009 Wu-cheng Li <wuchengli@google.com> Avoid initializeRecorder during onPause.

When on-screen setting is visible and home key is pressed,
onPause will set mSetting to invisible and initializeRecorder()
will be called in onVisibilityChanged(). That will cause exception
if surface holder is still null.
bug 2319111
om/android/camera/VideoCamera.java
b65537df206fd69317109ab8147440b0ba9f9c25 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ida3e9964 into eclair-mr2

* changes:
Add flash light setting in video camera.
f4823480fdda6e6a4ec7deb28199a7c9631016e5 09-Dec-2009 Wu-cheng Li <wuchengli@google.com> Do not set orientation indicator while handling image capture intent.
om/android/camera/Camera.java
69d05c5c970a83ef5f429130ad378dd00f72c30c 09-Dec-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug that -1 may be passed to setRotation.
om/android/camera/Camera.java
da3e9964a4a82a942d7f450e7c89904f5c5aa03f 07-Dec-2009 Wu-cheng Li <wuchengli@google.com> Add flash light setting in video camera.

http://b/2118298
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
ff58fb6921ccb7398ad30c8cec604c38c76be4fc 04-Dec-2009 Owen Lin <owenlin@google.com> Use icon to indicate the orientation of the taken photos.

Change-Id: I144e2dd590e98942763fc6e243da3e17cb25d88d
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/RotateImageView.java
ad9df588053caf70976de9dd29b612fdf698ee4d 03-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change If3ab51b5 into eclair-mr2

* changes:
Add check if the media is still recording when the timeup event is comming.
b15fd7eac3cdd69662cd0bbeb11a7d99b8f143cc 02-Dec-2009 Owen Lin <owenlin@google.com> Add check if the media is still recording when the timeup event is comming.

Change-Id: If3ab51b5da867378182960694dab12af3cae5da1
om/android/camera/VideoCamera.java
6cc787719e274b2b14e45232d138654bb47d0130 02-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibb62c511 into eclair-mr2

* changes:
Prevent double click for record button.
f651904fc747442f849bb084aaaf4d3245106860 01-Dec-2009 Owen Lin <owenlin@google.com> Prevent double click for record button.

http://b/2273733

Change-Id: Ibb62c511db77568aed5ae7899e2193b85a6b2e8c
om/android/camera/VideoCamera.java
86d784ba89f92835058148eaf31fb5d08ebe1bb0 10-Nov-2009 Owen Lin <owenlin@google.com> Fix the bug that the on-screen menu kept the position in last time.

http://b/issue?id=2199588

Change-Id: Ia8b423918494dcb5e71b8b4185381a22c2ab7504
om/android/camera/OnScreenSettings.java
ba4a1f660c8e7ca16dc5b2fabbf9d7466810a0d7 11-Nov-2009 Owen Lin <owenlin@google.com> Layout the menu item of second level on-screen menu.

http://b/issue?id=2203704
Change-Id: I4e7f455eb037cb1cf60e85b338229c83d62a99f2
om/android/camera/OnScreenSettings.java
4ddee78a1507b3c067745023bd2330b866b8aaf9 24-Nov-2009 Owen Lin <owenlin@google.com> Add one more picture size settings.

We need small size for the fake camera in emulator.

Change-Id: I5543936338813d575efc158c78e219da7feb9415
om/android/camera/CameraSettings.java
30055f6830b3d524cfbdfeab6536bb46e390747a 21-Oct-2009 Petri Gynther <pgynther@google.com> Camera: Clean up the image/video file naming code

1) Create 'image_file_name_format' string in strings.xml

2) Change createName() routines in Camera.java and
VideoCamera.java to use 'image_file_name_format' and
'video_file_name_format', respectively.

3) Change image filenames on SD card to format:
IMG_yyyyMMdd_HHmmss.jpg -- e.g. IMG_20091020_120000.jpg

(Old format was 'yyyy-MM-dd HH.mm.ss.jpg' which
contained undesirable space character in the filename.)

4) Similarly, change video filenames to format:
VID_yyyyMMdd_HHmmss.3gp -- e.g. VID_20091020_120000.3gp

(Old format was 'video-yyyy-MM-dd-HH-mm-ss.3gp' which
was not consistent with the image filename format.)
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
4d0f30896f412439b92f38bee204766fb5853b1a 21-Nov-2009 Owen Lin <owenlin@google.com> am 47dd2cf1: Fix black screen after resuming camera.

Merge commit '47dd2cf1dacad3687410ea6e8e4f05542a5fdc46' into eclair-mr2

* commit '47dd2cf1dacad3687410ea6e8e4f05542a5fdc46':
Fix black screen after resuming camera.
47dd2cf1dacad3687410ea6e8e4f05542a5fdc46 20-Nov-2009 Owen Lin <owenlin@google.com> Fix black screen after resuming camera.

Fix the issue that if surfaceChanged is called before onResume().
The new holder will be ignore and we will set null to the preview
display of the camera.

Change-Id: Ic563284e6302f4d174226297d1372c4ed349a084
http://b/2269582
om/android/camera/Camera.java
471fd0aa7dccebe4ac63e8202ee9227ccb52c83d 20-Nov-2009 Owen Lin <owenlin@google.com> resolved conflicts for merge of 503560f0 to eclair-mr2

Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
503560f0dc42d6185c61be06f8060dfd50d30d69 19-Nov-2009 Owen Lin <owenlin@google.com> Keep space for those empty icons but hide them if the feature is not
supported.

fix bug: http://b/2250438

Change-Id: I79eb9d575cf275c25decc6236b80f61ecfdf3042
om/android/camera/Camera.java
om/android/camera/IconIndicator.java
om/android/camera/VideoCamera.java
e1706c13d469a163d811e29d33b86cc5d4bf67e9 19-Nov-2009 Owen Lin <owenlin@google.com> am 3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.

Merge commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2

* commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f':
Use "Use My Location" settings to decide wheather we store the picture's location.
3e44f8076a16792bb295589ca4b467ba27ea2a6f 17-Nov-2009 Owen Lin <owenlin@google.com> Use "Use My Location" settings to decide wheather we store the picture's location.

However, if user has specifically assign the "Record Location" we will
follow the settings.

Bug: http://b/2265010

Change-Id: I4863d299b8f461ee73c8aeb4651740855efe3dbd
om/android/camera/BooleanListPreference.java
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/RecordLocationPreference.java
ec1b9c508c4d04d68131579c4716ff32a3e29740 18-Nov-2009 Ray Chen <raychen@google.com> am df926b6e: Fix 2265947 Blank screen when invoking gallery view intent from camera http://b/2265947

Merge commit 'df926b6e115e0f7fb4342abf0702258b8c285b7c' into eclair-mr2

* commit 'df926b6e115e0f7fb4342abf0702258b8c285b7c':
Fix 2265947 Blank screen when invoking gallery view intent from camera
df926b6e115e0f7fb4342abf0702258b8c285b7c 17-Nov-2009 Ray Chen <raychen@google.com> Fix 2265947 Blank screen when invoking gallery view intent from camera
http://b/2265947
om/android/camera/MenuHelper.java
538e2e2a3923bb614db10bd8586781b6a5c8ec0c 17-Nov-2009 Ray Chen <raychen@google.com> am 92acbf6c: Merge change Ie07be885 into eclair

Merge commit '92acbf6c5a5c654bfdaa871afc891a8723acebf8' into eclair-mr2

* commit '92acbf6c5a5c654bfdaa871afc891a8723acebf8':
Fix issue 2259506 and 2262817 by keeping a reference to MediaProvider when camera is active.
6d68a36b5da24f70e1a8d5e9529720eeb8ce6d86 16-Nov-2009 Ray Chen <raychen@google.com> Fix issue 2259506 and 2262817 by keeping a reference to MediaProvider when camera is active.
om/android/camera/Camera.java
ea7c3e6a714c6c34c0fa7c06513bbdd69d39f8f7 16-Nov-2009 Owen Lin <owenlin@google.com> resolved conflicts for merge of 4d55cb36 to eclair-mr2
9c90e4ffabcb51d340648d71ada7208bc4e2de96 12-Nov-2009 Cheng-Ru Lin <owenlin@google.com> Hide the indicator if the icon is empty.

Also change the order of on-screen icons.

http://b/issue?id=2250438

Change-Id: I25b0edfa1913aa3dacd960df87d5d7103e352bce
om/android/camera/IconIndicator.java
fb4f6c794b282f1a255f5405cf54222acb51d512 12-Nov-2009 Cheng-Ru Lin <owenlin@google.com> am cc12a303: Add icon-indicators to VideoCamera.

Merge commit 'cc12a303ad51063cee73715849a951fb5f383188' into eclair-mr2

* commit 'cc12a303ad51063cee73715849a951fb5f383188':
Add icon-indicators to VideoCamera.
cc12a303ad51063cee73715849a951fb5f383188 12-Nov-2009 Cheng-Ru Lin <owenlin@google.com> Add icon-indicators to VideoCamera.

Change-Id: Ie5ace8cf1863636ffe94f89d70525483a95b3239

http://b/2247081
om/android/camera/VideoCamera.java
91e7670d43fb5e56e2cb8c5fd7bddb1f3dbeb162 12-Nov-2009 Wu-cheng Li <wuchengli@google.com> am 9324f11a: Add postview callback to know when the captured image is shown. b2237074

Merge commit '9324f11afe9366cd5479828a214dc8de8696a5ab' into eclair-mr2

* commit '9324f11afe9366cd5479828a214dc8de8696a5ab':
Add postview callback to know when the captured image is shown. b2237074
9324f11afe9366cd5479828a214dc8de8696a5ab 10-Nov-2009 Wu-cheng Li <wuchengli@google.com> Add postview callback to know when the captured image is shown. b2237074

Some platform display the captured image to the screen in postview callback.
Some do that in raw picture callback. The camera application wants to make
sure the captured image is displayed for at least 1.2 seconds. But orginally
the app does not register postview callback and always start the timer in
raw picture callback. Currently postview callback always arrives before raw
callback. Without this change, the camera app may think the captured image
is not displyed long enough and add some delay before starting preview,
which will increase the shot-to-shot latency (ex: 0.8s) unexpectedly.
om/android/camera/Camera.java
8909442e0bde5cce301ae249ab658db22d36f093 06-Nov-2009 Owen Lin <owenlin@google.com> Remove some more unused code.

Remove unused memebers and parameters

Change-Id: I35ccef892bd711c078a45ddbd92b651f950ff864
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/OnScreenHint.java
om/android/camera/OnScreenSettings.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/ImageList.java
f497f1ea7217f197af6c8c5f981bfb738c147f6a 10-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I85381f1e into eclair-mr2

* changes:
Add a check for the case that the camera is reopened again.
dd6600e7f0adf322e5a8fcb0ed5389b14655106e 06-Nov-2009 Owen Lin <owenlin@google.com> Add a check for the case that the camera is reopened again.

fix issue: http://b/issue?id=2241430

Change-Id: I85381f1eec3ff7a5a3cbe7d2b2bccfb6effc2b50
om/android/camera/CameraHolder.java
ca99fb07777edcde4c9159c1567b95a227e916fa 10-Nov-2009 Chih-Chung Chang <chihchung@google.com> am 01ed85fb: Merge change Ic823abd0 into eclair

Merge commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0' into eclair-mr2

* commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0':
Fix 2241232: Read system properties for quality setting.
faf398ff0fa2b51348b4545505112d70ba7b47a1 09-Nov-2009 Chih-Chung Chang <chihchung@google.com> Fix 2241232: Read system properties for quality setting.

Change-Id: Ic823abd0c352b3eca0b8ef504307bd1de7d1700f
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
ff7da7918997b56fbf5f410bedf263622e014bb0 14-Oct-2009 Owen Lin <owenlin@google.com> DO NOT MERGE TO MR2. Fix the focus settings is incorrect when switch back to auto scene mode.

http://b/editIssue?id=2178247

Change-Id: Icae1d4f255106ef47766feb43481a37917e6e885
om/android/camera/Camera.java
ada28d6aed4403ea9ca8494f9fb2524681750d15 05-Nov-2009 Chih-Chung Chang <chihchung@google.com> am 05d20c0c: Improve 2237074: Make preview start earlier.

Merge commit '05d20c0c53cdb3a0381f03b160a840f84d42deef' into eclair-mr2

* commit '05d20c0c53cdb3a0381f03b160a840f84d42deef':
Improve 2237074: Make preview start earlier.
46d402ade45b258f4515c42b6940749364557fb3 04-Nov-2009 Owen Lin <owenlin@google.com> Remove some more code.

Change-Id: I5779a15fcffecd9de28e6e1c24a59d3cf0a523f7
om/android/camera/CameraHardwareException.java
om/android/camera/CropImage.java
om/android/camera/HighlightView.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/MonitoredActivity.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
05d20c0c53cdb3a0381f03b160a840f84d42deef 04-Nov-2009 Chih-Chung Chang <chihchung@google.com> Improve 2237074: Make preview start earlier.

Change-Id: I9d7416cfd7c9cbaa3bc135ac8fd67776ec1c65e3
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
111bf09fd62bd0c714ef2164c77965fb0db05a8e 03-Nov-2009 Chih-Chung Chang <chihchung@google.com> Fix 2225024: Handle the case where the sd card is unmounted while recording.
om/android/camera/VideoCamera.java
b5b1901e83564a032545bb6a3d1c521b48c15dfb 03-Nov-2009 Chih-Chung Chang <chihchung@google.com> Fix 2232894: doesn't generate thumbnails on pressing thumbnails button, while recording video
om/android/camera/VideoCamera.java
271b3095b9f763421c0547109da9de774795072d 02-Nov-2009 Chih-Chung Chang <chihchung@google.com> Clean up and add comments for classes.
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/EvenlySpacedLayout.java
om/android/camera/IconIndicator.java
om/android/camera/IconListPreference.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/NoSearchActivity.java
om/android/camera/OnScreenHint.java
om/android/camera/OnScreenSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/ReverseGeocoderTask.java
om/android/camera/ReviewImage.java
om/android/camera/RotateBitmap.java
om/android/camera/ShutterButton.java
om/android/camera/Switcher.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/LruCache.java
77c1cdc8f2cda250b1db842204efb49f87e094ae 02-Nov-2009 Chih-Chung Chang <chihchung@google.com> Clean up and add comments for classes.
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHardwareException.java
om/android/camera/CameraSettings.java
om/android/camera/IconIndicator.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MonitoredActivity.java
om/android/camera/NoSearchActivity.java
om/android/camera/ReverseGeocoderTask.java
om/android/camera/ReviewImage.java
om/android/camera/RotateBitmap.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
3f1947b04f2764b81e30cfde38468c4224f5035f 02-Nov-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.
om/android/camera/ImageGetter.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MonitoredActivity.java
om/android/camera/OnScreenSettings.java
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
324b5936db190e06ef4619f89a3deb607de3234a 30-Oct-2009 Wu-cheng Li <wuchengli@google.com> am 2c854bb9: Fix the bug that wrong zoom value is set in takePicture.

Merge commit '2c854bb917480b69630c9ab01aa9247df57a564a' into eclair-mr2

* commit '2c854bb917480b69630c9ab01aa9247df57a564a':
Fix the bug that wrong zoom value is set in takePicture.
1f5bc0cfa43fa7ee1b3e7eb75dd72d691df41379 30-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia4e7b972 into eclair-mr2

* changes:
remove unused resource files and elements
b5e85f253778337896143f3436c39b4f5d617393 30-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7b25fde1 into eclair-mr2

* changes:
Remove unused code in Camera app.
2c854bb917480b69630c9ab01aa9247df57a564a 30-Oct-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug that wrong zoom value is set in takePicture.

The application does not getParameters in takePicture due to performance.
After smooth zoom, zoom value has been changed. But mParameters of the app
still keeps the the old value. This is a regression. b2226717
om/android/camera/Camera.java
9c57ded79ff3d986acfed935865a2fc2a7f0d14e 30-Oct-2009 Owen Lin <owenlin@google.com> remove unused resource files and elements

Change-Id: Ia4e7b9724501c0a1c5c16008390e0116bb409c14
om/android/camera/ActionMenuButton.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
79bc8acc67097c09907a71c4a5a72ab85eb58087 26-Oct-2009 Owen Lin <owenlin@google.com> Remove unused code in Camera app.

Change-Id: I7b25fde19a172b6910d0217581cf61152d494a82
om/android/camera/BitmapCache.java
om/android/camera/DeleteImage.java
om/android/camera/DrmWallpaper.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/GallerySettings.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/MovieViewControl.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetConfigure.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/PickWallpaper.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
4018445b6d5e3ded6ef5677ce026ff2d16db768b 30-Oct-2009 Cheng-Ru Lin <owenlin@google.com> am 9c0f684c: Lift the upperbound of initial up-scaling.

Merge commit '9c0f684c416ff74b71c289a9c195e9a95b4f0563' into eclair-mr2

* commit '9c0f684c416ff74b71c289a9c195e9a95b4f0563':
Lift the upperbound of initial up-scaling.
9c0f684c416ff74b71c289a9c195e9a95b4f0563 29-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Lift the upperbound of initial up-scaling.

http://b/issue?id=2223577

Change-Id: I9af997b342b16c5c7bef58e779e1c9fdbb42ac92
om/android/camera/ImageViewTouchBase.java
004d7dd159d0c208caac1bc8e260f5ecd821ce75 26-Oct-2009 Wu-cheng Li <wuchengli@google.com> am 316af30d: Use zoom api. b2060030

Merge commit '316af30d026dd182edb482ef6de7a330d6b1b012' into eclair-mr2

* commit '316af30d026dd182edb482ef6de7a330d6b1b012':
Use zoom api. b2060030
0c58cdb8537c60a09f512c3a01f9234936adbecc 22-Oct-2009 Cheng-Ru Lin <owenlin@google.com> am da460876: Chagne CropImage invocation to non-explicit.

Merge commit 'da4608768624b1fb492f6676c510b37ad5f294ba' into eclair-mr2

* commit 'da4608768624b1fb492f6676c510b37ad5f294ba':
Chagne CropImage invocation to non-explicit.
316af30d026dd182edb482ef6de7a330d6b1b012 21-Oct-2009 Wu-cheng Li <wuchengli@google.com> Use zoom api. b2060030
om/android/camera/Camera.java
da4608768624b1fb492f6676c510b37ad5f294ba 16-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Chagne CropImage invocation to non-explicit.

Change-Id: I38d5e9bee524c5e63c2457751756ee800c9b1947
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
ec339e54c58aa8cf2cdfa553134363ed9860fa5c 20-Oct-2009 Owen Lin <owenlin@google.com> am 22a695f8: Fix the bug that one-item only settings still shown on menu.

Merge commit '22a695f8ca31dc2899e7206d68316c7e6d960657' into eclair-mr2

* commit '22a695f8ca31dc2899e7206d68316c7e6d960657':
Fix the bug that one-item only settings still shown on menu.
22a695f8ca31dc2899e7206d68316c7e6d960657 19-Oct-2009 Owen Lin <owenlin@google.com> Fix the bug that one-item only settings still shown on menu.

Change-Id: I6c57ed929f74d9f170b3e07c4db54134b2869e78
http://b/issue?id=2196476
om/android/camera/CameraSettings.java
9c9b0b5ae21f5c749944189fdfefb5978e58341a 19-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I58068fd6 into eclair-mr2

* changes:
Fix 2192954: Camera/camcorder switch status is wrong.
80cc58b1dc2b243b1fc450ed02d3c017a2e020b3 19-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I95bd9eb0 into eclair-mr2

* changes:
Fix 2186855: NPE in ViewImage.setImage.
58068fd6a113415cca08e4eee5deb90d5a326c10 19-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2192954: Camera/camcorder switch status is wrong.
om/android/camera/Switcher.java
95bd9eb09f84c4344a688fe32c727bc005f16c6c 19-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2186855: NPE in ViewImage.setImage.
om/android/camera/ViewImage.java
70fe12f4d0ba9c08be9e0f0bda75b172a21cf70a 14-Oct-2009 Owen Lin <owenlin@google.com> Fix the focus settings is incorrect when switch back to auto scene mode.

http://b/editIssue?id=2178247

Change-Id: Icbd4eb80b88027f538ddeb4a44316e2b2be911c9
om/android/camera/Camera.java
4916316bb9a2196cbf6cc63e531c0ce6786ed56a 14-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2185267 and 2177765: NPE after onPause.
om/android/camera/ImageGallery.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
609d8cc0c7d05aa294aeebea8dcbb9111aefc1e1 13-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Clear task stack when launch camera with the hardware button.

Bug: http://b/issue?id=2109092
Change-Id: Ia9b5cb7dfd6abd5c77e34e408cb761b4145bfd3d
om/android/camera/CameraButtonIntentReceiver.java
6e9fef5e00072acad09d7138fc992aae4bd17f90 13-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2150734.

The problem seems to be the media player is re-created when we get
window focus after onPause. We now only create media player when
the activity is resumed and has focus.
om/android/camera/MovieView.java
4d2aefbe7c108bae9e4ae735c7cd230792201098 13-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2182549: Disable search button when using camera.
om/android/camera/Camera.java
om/android/camera/DeleteImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery.java
om/android/camera/MonitoredActivity.java
om/android/camera/MovieView.java
om/android/camera/NoSearchActivity.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetConfigure.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
b7d244d022e17eed0ce52859c60bf04bc4ade69b 13-Oct-2009 Owen Lin <owenlin@google.com> am d10dda27: Fix the layout of title in Gallery-Picker.

Merge commit 'd10dda271e22fd312381eb3437b0541525498452' into eclair-mr2

* commit 'd10dda271e22fd312381eb3437b0541525498452':
Fix the layout of title in Gallery-Picker.
d10dda271e22fd312381eb3437b0541525498452 12-Oct-2009 Owen Lin <owenlin@google.com> Fix the layout of title in Gallery-Picker.

Bug number: http://b/issue?id=2180043

Change-Id: Ic852a89f6ae6c5d950c8ea93e739d17bf51680f4
om/android/camera/GalleryPicker.java
2b41cd6680f37d7cb0c482def34c2549c557d63c 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic04ffcd9 into eclair-mr2

* changes:
Fix 2177752: NPE in onShareMultipleClicked.
c04ffcd90801837244a6e1ce4b4fa2b6badf6ac3 09-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2177752: NPE in onShareMultipleClicked.
om/android/camera/ImageGallery.java
5642d51fb8f5673d3a85ddd932cef4a6b92dab35 09-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2172458: NPE in getCurrentUri.
om/android/camera/ViewImage.java
82e96d2d003bd524439f81901d1462eab6790eb1 09-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2172926: Remove unnecessary invalidate to speed up video recording.

This is tested on G1, and has no visible difference.
om/android/camera/VideoCamera.java
12f4b9a20982fa31806385d8e76f1d6da8320739 06-Oct-2009 Owen Lin <owenlin@google.com> Show flash-off indicator on the view-finder.

For those devices without flash support, we will use a new mode: NO_FLASH_MODE
and show no indicator on the view finder.
om/android/camera/Camera.java
28f3595372cfbff1a2e5e83bf59d8dff76e14215 05-Oct-2009 Ray Chen <raychen@google.com> Utilize group id to request & cancel thumbnail requests.
om/android/camera/BitmapManager.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGetter.java
om/android/camera/ImageLoader.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/VideoObject.java
5569ee858ef994970191798f326c91f95b4f91cd 06-Oct-2009 Wu-cheng Li <wuchengli@google.com> am a5d6b703: Adapt to new zoom callback.

Merge commit 'a5d6b70326c4474770d30f6e6fb3b08cacf1cdfd' into eclair-mr2

* commit 'a5d6b70326c4474770d30f6e6fb3b08cacf1cdfd':
Adapt to new zoom callback.
a5d6b70326c4474770d30f6e6fb3b08cacf1cdfd 06-Oct-2009 Wu-cheng Li <wuchengli@google.com> Adapt to new zoom callback.

b2060030
om/android/camera/Camera.java
d51fc2057caaaf5ac74e6cde5687a9869dcc47d6 06-Oct-2009 Chih-Chung Chang <chihchung@google.com> am 8d20bb47: Merge change I77245f28 into eclair

Merge commit '8d20bb47f4eacbb9438e5d3e13f89cb8a3a35e87' into eclair-mr2

* commit '8d20bb47f4eacbb9438e5d3e13f89cb8a3a35e87':
Fix 2166632: Change of wording in Camera ->Video ->Settings
8d20bb47f4eacbb9438e5d3e13f89cb8a3a35e87 06-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I77245f28 into eclair

* changes:
Fix 2166632: Change of wording in Camera ->Video ->Settings
5a0f8a8db0a20ac8fec5e33d88e43d6c6259edae 06-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2166632: Change of wording in Camera ->Video ->Settings
om/android/camera/CameraSettings.java
9af17eebb0481d8e412407bcb590531166ff0ded 06-Oct-2009 Wu-cheng Li <wuchengli@google.com> am 13874d7f: Fix the bug sometimes record counter does not increment.

Merge commit '13874d7f42be37f1c4eb94320737b10d63527c46' into eclair-mr2

* commit '13874d7f42be37f1c4eb94320737b10d63527c46':
Fix the bug sometimes record counter does not increment.
13874d7f42be37f1c4eb94320737b10d63527c46 06-Oct-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug sometimes record counter does not increment.

b2167715
om/android/camera/VideoCamera.java
56aa9c09027bbf2af8d5de9fde2ff7d37e8d31eb 05-Oct-2009 Cheng-Ru Lin <owenlin@google.com> am 542fa891: Temporally solve the overlay creation problem.

Merge commit '542fa8916296196b10d74b439304bd7fc5bf1cef' into eclair-mr2

* commit '542fa8916296196b10d74b439304bd7fc5bf1cef':
Temporally solve the overlay creation problem.
b0a7d570c1586690f5c33379c5a3172c0080ec58 05-Oct-2009 Cheng-Ru Lin <owenlin@google.com> am 7ee55b67: Merge change I8f184b8a into eclair

Merge commit '7ee55b673e2dc579bd3e904240f71a24402dae1f' into eclair-mr2

* commit '7ee55b673e2dc579bd3e904240f71a24402dae1f':
Fix the issue that focus options shown on those device without focus support.
542fa8916296196b10d74b439304bd7fc5bf1cef 02-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Temporally solve the overlay creation problem.

Fix bug: http://b/issue?id=2153980

Because of bugs of overlay and layout, we sometimes will try to layout the
viewfinder in the portrait orientation and thus get the wrong size of
mSurfaceView. When we cange the size of preview size the new overlay will be
created before the old one closed, and cause an exception. For now, just get
the screen size

Change-Id: I3daf4bce801507aaaca1f030f09d6e18cb23f0f2
om/android/camera/Camera.java
22b5c55b71947252c35cc3478a751b4976e85da4 03-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2161972: Unable to record new video on deleting all existing videos.
om/android/camera/VideoCamera.java
df3731bacfe26910a5dd0813c6aa80a6e55b85ad 02-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Fix the issue that focus options shown on those device without focus support.

This is for bug http://b/2161159

Change-Id: I8f184b8aa5040c19b4f82775b30a99fed4ca035c
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
b014f7c2b8bda2ce9f673d0f3026063ad1ec725d 01-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Make new color for on screen settings.

And also solve the divider disapear problem.

Change-Id: I2f61ee39eb3e179f7a227e56a5dd677e6f415a2d
om/android/camera/OnScreenSettings.java
1a7d45ef86666bda67a4be6e49d56bbf102eba78 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I64280ec2 into eclair

* changes:
Fix some stupid bugs.
4e38e1924a82e2ee647fe15d664cef1fc8a3eb0b 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I4b11fc53 into eclair

* changes:
Make the app can be run on those phone without scene mode.
52de1515854859600afe355d9e1672c73016d594 01-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Fix some stupid bugs.

Change-Id: I64280ec21677d84ac3ad6f29168bf9d3234d2194
om/android/camera/Camera.java
bb4beb0764fcaaa0bb0b7e825950db343c6c7aa7 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Idbc7f6b1 into eclair

* changes:
Add debug messages for b/2150734
e66fd15ae371fd2e9bffe02fb49f58434cffbfa3 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I1bd69b86 into eclair

* changes:
Utilize thumbnail api to cancel thumbnail decoding, and replace BitmapManager's existing functions with BitmapFactory.
3b90cce1e143de64b29a33828d371c9c0e36c772 01-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Make the app can be run on those phone without scene mode.

Change-Id: I4b11fc532fcd531cc93537d6b07e76f0118bb801
om/android/camera/Camera.java
301c088512a06ec5154da2d27761537b6607f986 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> More complete support for scene mode.

Now, we will disable focus mode, white balance, and flash mode settings
if scene mode is not "auto". The current settings of scene mode on those
three preference will also reflect on indicators and on screen settings.

Change-Id: I55a20ec1d43b205e35d87185e70820e9c66e5cc6
om/android/camera/Camera.java
om/android/camera/OnScreenSettings.java
d18f380d7e57f03cb775e79445cdab22b7c73f09 01-Oct-2009 Wei-Ta Chen <weita@google.com> Fixed http://b/2157791 registering OnSharedPreferenceChangeListener
when on-screen settings are visible and unregistering it
when the on-screen settings are invisible.
om/android/camera/VideoCamera.java
2f3774c974a5a044a3b32ca68182a3f2180d0124 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Revert "Revert "Add icon support for options in preference setting screen.""

This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef.

Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/OnScreenSettings.java
25156f0e1bb921d3d8f7f5cc51e141522533b502 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Add indicator for focus, white balance, and scene mode.

Change-Id: Iead8a7a28aeaa07210fd56ecac1f6f6a74fee155
om/android/camera/Camera.java
b7c32e2f8ef5b9e2a77c2b942be0df0852090f22 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Id43bcf2f into eclair

* changes:
Hide the settings when user presses the camera button.
701507459e0d49421bd4a493f2df4511ab4b6841 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I00fa4098 into eclair

* changes:
When discarding an empty image list, we need to close it first, otherwise we end up leaking Cursors
df125e7b023f2c931e0ccc647e9a26d3ac1be2cf 01-Oct-2009 Chih-Chung Chang <chihchung@google.com> Add debug messages for b/2150734
om/android/camera/MovieView.java
00fa4098b4aa953f6e5d68b63638506c45b38e20 01-Oct-2009 Marco Nelissen <marcone@google.com> When discarding an empty image list, we need to close it first, otherwise we end up leaking Cursors
om/android/camera/ImageManager.java
bde544f0f430e8458b18ba7a2e1258935b25e1d3 30-Sep-2009 Ray Chen <raychen@google.com> Utilize thumbnail api to cancel thumbnail decoding, and replace BitmapManager's existing functions with BitmapFactory.
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery.java
om/android/camera/ImageGetter.java
om/android/camera/ImageLoader.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
d39b16c6c7e92ea3a19e25642447df750aa8def0 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Hide the settings when user presses the camera button.

Change-Id: Id43bcf2f7173d5a37134448f6c4a633ea06412b8
om/android/camera/OnScreenSettings.java
abdd8a1c1f4bd5f471b62f2927399dc23a9bd33c 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Another candidate for on screen settings UI (opaque).

Make the background opaque and use slide from the whole
screen (not just inside the view finder).

Change-Id: I12b8485399553e2622c9917833dc9aca9d8ee59c
om/android/camera/Camera.java
om/android/camera/OnScreenSettings.java
om/android/camera/VideoCamera.java
c90610f56293c93f4a7c7a67d8bbf0edb96bc57d 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I65b13222 into eclair

* changes:
Fine tune some UI stuff.
f8285337113a85b00e72e9b03911449b3bcafac4 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I697e45f9 into eclair

* changes:
Try some mock icons to feel the layout.
2bc4714bcd7233cd7a3fd0bb4aa261c48d2d9f79 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Fine tune some UI stuff.

1. Use no animation between camera / review mode. Thus, we must have same
layout for three types of control panel.

2. Since we have better algorithm to calculate the preview size. Let the
gripper be the same in mdpi and hdpi devices.

3. Keep some border on the right size of image view. Otherwise, it looks
odds in HVGA devices.

Change-Id: I65b13222cace230f09e6b33f311fd2b79758e93e
om/android/camera/PreviewFrameLayout.java
27e69927ba1a69aaa7a72eab16a278221c2db273 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Try some mock icons to feel the layout.

Change-Id: I697e45f93e0c6592bdd812f84d5db189f8cf6b4d
om/android/camera/Camera.java
62eaf47d1963350d91ac97cb84e6ef61f3a03ecc 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I1fd58eb1 into eclair

* changes:
Make video record counter run more smooth. b2154768
5f3fe873999e5dca82f33f89f641914b3613d07f 30-Sep-2009 Wu-cheng Li <wuchengli@google.com> Make video record counter run more smooth. b2154768
om/android/camera/VideoCamera.java
083ccc1e5e06bde2102c50e8279178209fa9a056 30-Sep-2009 Wu-cheng Li <wuchengli@google.com> Add debug message for b2149363.
om/android/camera/Camera.java
c158bd9c793895df5cd48eb2fa643e9f326951df 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I02b644bf into eclair

* changes:
Fix 2153860: VideoCamera app have to set scene mode to auto
7af25641ec401d9f669497bd401020f2cb5933ef 29-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Revert "Add icon support for options in preference setting screen."

This reverts commit 723f84eadb3c1a79337ef20e4d0a014341537adb.

Conflicts:

res/values/arrays.xml
res/xml/camera_preferences.xml
src/com/android/camera/IconListPreference.java

Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/OnScreenSettings.java
4c9266ef8f43c6b057b6f560645475272c66ff8a 29-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2153860: VideoCamera app have to set scene mode to auto
om/android/camera/CameraHolder.java
1f0564eb75f20943d496109928b5542902d3bd61 29-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2144865 by re-positioning the on-screen setting when the size of preview frame is changed.
om/android/camera/OnScreenSettings.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/VideoCamera.java
35627500f00644aaae44c93f98f6a0cdeefe2d94 29-Sep-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.
om/android/camera/BooleanListPreference.java
om/android/camera/IconListPreference.java
om/android/camera/ImageManager.java
om/android/camera/OnScreenSettings.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/VideoObject.java
207ad85f1875dd7acb69091cbcf022646aaee818 28-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2150684: Set frame rate according to encoder fps in video camera app
om/android/camera/VideoCamera.java
35bda2dc8ab95a7baf68b544cf97826aabff6210 28-Sep-2009 Wu-cheng Li <wuchengli@google.com> Add zoom UI back.
om/android/camera/Camera.java
2a79ecbf5e5a76cfead677262deb089bd3e2e277 27-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Hide indicator when on-screen settings is shown.

Change-Id: Ib37df275a584133b326161fa5fe371697f31f8d1
om/android/camera/Camera.java
ffcca7403c9a364403357d3c76a3ff256c63c786 27-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Resize the preview frame as large as possible.

Now, we will calculate the layout by ourselves in PreviewFrameLayout.

Change-Id: I90f91f9df6d2f75fbd31fc930af624a84820bc95
om/android/camera/Camera.java
om/android/camera/PreviewFrameLayout.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
140229cc988a264d9719b8dcc41196cc87092440 28-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix orientation not stored in the database.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
bf45b96e76d84856ab510508ea5dafd9ab834eba 28-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2149062 by showing on-screen setting when clicking the menu key.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
e985b604a0fc0cea55f595ec82e96bc4ddd221da 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27210 into eclair

* changes:
Fix style issues in on-screen settings.
80b7c5bf37e032c2d75431c6d563ed4525159688 28-Sep-2009 Wu-cheng Li <wuchengli@google.com> VideoCamera should crash if media recorder prepare fails.

b2143881
om/android/camera/VideoCamera.java
78e428b016fc63621752ce4150c2179364e92df1 26-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Fix style issues in on-screen settings.

1. Make the item as high as 64dp.
2. Move the title of the second level menu to the left
3. Change 5M to 5M pixel
4. Enlarge the viewfinder and also review image

Change-Id: Iad0e05df168336ac6c80124d9b24e0e1acbfdf3e
om/android/camera/OnScreenSettings.java
d02b313115e8f4c92a377955af62478765146fb1 28-Sep-2009 Ray Chen <raychen@google.com> Fix the camera directory path issue.
om/android/camera/ImageManager.java
7e4655b1b3fcbc543430bea680872f564af098f5 26-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2144590 by honoring Intent's content when provisioning options in on-screen settings.
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
29a53cb73de41559ff36944786346487f859c485 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27149 into eclair

* changes:
Fix issue 2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
6f860e5452770e36f4f759b450b8153f4acb7f03 26-Sep-2009 Ray Chen <raychen@google.com> Fix issue 2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
om/android/camera/gallery/ImageList.java
284646a3b5e94a1f5027f20daf60a518b1c27ae0 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27277 into eclair

* changes:
Fix 2145283: Two context menus show up when long press on the center key.
b02ebbea2d3d98a3ab2c15cb152387b9d201dd18 25-Sep-2009 Ray Chen <raychen@google.com> Fix 2145588 jhead reports "Not JPEG"
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Image.java
d998ce9d6cf6f133cd22a43a22d2f5acd208c860 27-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2145283: Two context menus show up when long press on the center key.
om/android/camera/GridViewSpecial.java
30535675c79f96a64d65363e759278c7e5023567 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27145 into eclair

* changes:
Fix 2147286: Camera app should handle back key in onKeyUp
a8bbcd7ce25aada705561852ea9f356dc38c0f43 25-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Change the checkbox style to list style for record location preference.

Change-Id: Ie209887169623f090df0ee7a85f2709b4a54e202
om/android/camera/BooleanListPreference.java
om/android/camera/CameraSettings.java
om/android/camera/OnScreenSettings.java
0b8028e923b386eaa9062e076ca041914acbcd09 26-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2147286: Camera app should handle back key in onKeyUp
om/android/camera/Camera.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/VideoCamera.java
c801d7371323d59f584d8dddaae104d8775f48cd 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27109 into eclair

* changes:
Show the thumbnail box even if there is no picture taken yet.
9926791171e0ba550be21b4498043fbd15acbf35 25-Sep-2009 Wu-cheng Li <wuchengli@google.com> Remove zoom UI.
om/android/camera/Camera.java
7495e031bf29c268081cab765126c2c870524e8d 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26945 into eclair

* changes:
Change the default settings of picture size to the largest one.
039c900e6b9e8d32b41f5064fcb200ca45f9cc62 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27107 into eclair

* changes:
Change the close behavior of on screen menu.
32bfffa5822490ea0e105e9fe00b9df8db1b7b02 19-Sep-2009 Owen Lin <owenlin@google.com> Change the default settings of picture size to the largest one.

This fix issue: http://b/2140738.

Change-Id: I9d92370897df7fe392801baa068913728c7d2ffc
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
b7b36b9237c9ed8c536f33fbe94eab44952f29ce 25-Sep-2009 Chih-Chung Chang <chihchung@google.com> Show the thumbnail box even if there is no picture taken yet.
om/android/camera/ThumbnailController.java
dabf14a464f9a2bfe330c3b640c7111c5f79ec32 25-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Change the close behavior of on screen menu.

1. Click on back/menu will close the whole setting panel
2. Touch on anywhere outside the panel will also close the settings.
3. Remove the "Back" item in second level menu.

Change-Id: I015a0264b50f8abb29db1c4c5adfef07987630f1
om/android/camera/OnScreenSettings.java
6a1abe10dfff4040fa4be87ee10113ce1980c4ee 25-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2145360: NPE in ImageViewTouch.onKeyDown
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
c7e5e484f83da0d44b8f1d5639a8bfb2f53db469 25-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2140611 by adjusting the width of the preview view when video quality is changed.

The preview view's aspect ratio should be the same to that of the preview frame.
om/android/camera/VideoCamera.java
c30e5c21c3858c15473427d82608c473d44bf3e4 24-Sep-2009 Chih-Chung Chang <chihchung@google.com> Return full size image jpeg if the user provides an Uri.
om/android/camera/Camera.java
9f1480b2c27d744c816c71cb3c512d37bc48c524 28-Aug-2009 Ray Chen <raychen@google.com> Change Camera & Gallery code to use the new thumbnail APIs.
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/MiniThumbFile.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoObject.java
723f84eadb3c1a79337ef20e4d0a014341537adb 19-Sep-2009 Owen Lin <owenlin@google.com> Add icon support for options in preference setting screen.

Change-Id: I4029ef11d49922139b8aab423e9871c803ab4a82
om/android/camera/CameraSettings.java
om/android/camera/IconListPreference.java
om/android/camera/OnScreenSettings.java
71d56e21859a797ec4633f209b3605276345d44e 23-Sep-2009 Owen Lin <owenlin@google.com> Fix some warnnings reported by eclipse.

Change-Id: I40037e0735ddbca750cbe5f8364af5247992c51c
om/android/camera/Camera.java
om/android/camera/CameraHardwareException.java
om/android/camera/CameraSettings.java
om/android/camera/IconIndicator.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenSettings.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
om/android/camera/Wallpaper.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/LruCache.java
om/android/camera/gallery/UriImage.java
e15c0ad52981ba7413002b028784e09da772ec35 23-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26484 into eclair

* changes:
Fix 2129498: add a MaxNumOfPixels parameter for client to specify the captured picture size.
cd972b0cd67d7a45084d9757ebd49b8f22989edd 23-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2129498: add a MaxNumOfPixels parameter for client to specify the captured picture size.
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/Util.java
f0b7d4b0d1823ea547e4976544866fa35f577898 21-Sep-2009 Owen Lin <owenlin@google.com> Fix the problem that for too long text the UI is bad.

Change-Id: I85534ead897d676facb3ec4fa791b5bfffee350b
om/android/camera/EvenlySpacedLayout.java
0b706b8d339d6d23b32878c398097beed25c079e 22-Sep-2009 Chih-Chung Chang <chihchung@google.com> Rotate the thumbnail bitmap according the jpeg header.
om/android/camera/Camera.java
om/android/camera/ImageManager.java
ec10eee5cd5006fbf8d6327f135c91af591cc723 22-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26246 into eclair

* changes:
Update jpeg orientation tag for rotation.
949881cb1d29cb193919dc46c0720cfcfffc9658 22-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26245 into eclair

* changes:
Store orientation for pictures taken by Camera.
37acf79b1cc060f355c9cd1803c2bdd5e39deb27 17-Sep-2009 Owen Lin <owenlin@google.com> Add a icon bar to show the current state.

Change-Id: Ic0c32abffed267fa97b6b449c4dd432af3e0e591
om/android/camera/Camera.java
om/android/camera/EvenlySpacedLayout.java
om/android/camera/IconIndicator.java
78fce15b743c7cf99bebbfcc9900adf5acefc27c 21-Sep-2009 Chih-Chung Chang <chihchung@google.com> Update jpeg orientation tag for rotation.

This (mostly) reverts commit bacc4e595b85dc9fae34a47956a7ea8f6331b40a.
om/android/camera/gallery/Image.java
7db0b4c11101ad215cfc33d645198a238ef6d4c2 21-Sep-2009 Chih-Chung Chang <chihchung@google.com> Store orientation for pictures taken by Camera.
om/android/camera/ImageManager.java
8a89877f74cf08d7b5f6342721b020a31a144529 21-Sep-2009 Chih-Chung Chang <chihchung@google.com> Remove unused orientation parameter.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/gallery/Image.java
ed6661e212048dc3e143c48402b3935911c3741c 21-Sep-2009 Wu-cheng Li <wuchengli@google.com> Use new focus mode API.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
4e3fd26e176d4d74d09c94d0c4a6bd3a470584a7 21-Sep-2009 Ray Chen <raychen@google.com> Remove trailing spaces for easier code review.
om/android/camera/MenuHelper.java
om/android/camera/PhotoAppWidgetConfigure.java
fae0daa1edb499346af16c63c23d9b1d7aa2697c 20-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2130355: Enter camera settings when recording a video will cause the phone to freeze and then reset
om/android/camera/VideoCamera.java
b6ad206f53981faee04800b787569dbb60492844 21-Sep-2009 Owen Lin <owenlin@google.com> Fix a bug that we didn't check if flash modes is supported by current device.

Change-Id: Iea47f6cba6f99975e0c463b9a52e69a8b6247eff
om/android/camera/CameraSettings.java
e7eee9b19ffeaf488b3965cca026f80c005740fc 21-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26045 into eclair

* changes:
Add checking before setting parameters of Camera hardware.
a3cd0a734a5f7d0a5be13e5756f6dae1d22244d2 21-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25726 into eclair

* changes:
Change how VideoCamera uses lock() due to API change.
d0759feb7317bedff26c022bd7564f0053d483e3 18-Sep-2009 Wu-cheng Li <wuchengli@google.com> Change how VideoCamera uses lock() due to API change.
om/android/camera/VideoCamera.java
30e761ee7702cca4227502fc5adc969048c2ec20 21-Sep-2009 Mike Cleron <mcleron@google.com> Fix bug 2121734 (better guess at size of photo widget)
om/android/camera/PhotoAppWidgetConfigure.java
dbb23f7bc9d3f3807f12926ccbfe2a95a0c1355a 19-Sep-2009 Owen Lin <owenlin@google.com> Add checking before setting parameters of Camera hardware.

It is possible that some features are not availalbe with newer
Camera driver. We add check for those unsupported features.
om/android/camera/Camera.java
55345e97299810888d6efac0f5179f0700531c71 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> Update Camera to use new ExifInterface API.

Change-Id: I3e0f5dd1a34ad2cde59ed55733b4349bd4121a6e
om/android/camera/MenuHelper.java
cc529326d9369290abd6933f1d070859b3cadf75 18-Sep-2009 Wu-cheng Li <wuchengli@google.com> Set focus mode to camera driver and add macro focus.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
34a018384ee11d4c7bf629971946fdef13fd7c3e 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25719 into eclair

* changes:
Fix 2128896: The thumbnail generated is overlapped with previous thumbnail.
48065052c3aa17ac87c88e01cb47e3a833ff9daf 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25724 into eclair

* changes:
Fix the bug that we show camea preference in camcorder.
697ea6ef1d84bc707881e736ff1148e3a30ed445 18-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2128896: The thumbnail generated is overlapped with previous thumbnail.

Change-Id: I57048527912887a6f9ff10dbd59233fc73c0cc7b
om/android/camera/Util.java
75b9f0cc111153af31572af7a33ddeca54eccc6e 18-Sep-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug that sometimes scene mode parameter is not set.
om/android/camera/Camera.java
4e3c3d5d4ae6820ff14a0ca88d4fce46b23abe50 18-Sep-2009 Owen Lin <owenlin@google.com> Fix the bug that we show camea preference in camcorder.
om/android/camera/VideoCamera.java
6d12b828743cbd81767227229d6351ce412d5698 17-Sep-2009 Owen Lin <owenlin@google.com> Simplify the code. Change references of "@strings" to literals for those
non-translatable values.

Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
c7e8d264dbcd43de53e74351b6bbfab66a5d5cdd 17-Sep-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug that sometimes zoom is not working.
om/android/camera/Camera.java
c94b8f9af5402b30599c45ef313d06876ab3d8a3 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25456 into eclair

* changes:
Move flash settings from on-scren control to preference settings.
a4e3d2723156de4d03ef1e9807ca4125b166e22e 17-Sep-2009 Owen Lin <owenlin@google.com> Move flash settings from on-scren control to preference settings.

Change-Id: Id45c7321c1e60cc7e29a7e9c601082624d93c9e8
om/android/camera/Camera.java
d4d112f6b3f272be2a78bb40e39b4ff4ef5a8f9e 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25324 into eclair

* changes:
Don't change to orientation in the jpeg file. (It didn't work anyway).
b0c8e311899683da46f2e0638fd88edcf9c68d9d 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2122382: We don't handle overlay destroy and re-create properly.

Because the overlay behavior changed, the overlay will be destroyed if we hide it.
So we need to stop preview at that time. To properly handle this situation we need
to add more code and it will be slower. For now we just don't hide the overlay
because the image on top of it will obscure it anyway.

Change-Id: I5c479381a578448a712dedc1bb97ba6f36db468f
om/android/camera/VideoCamera.java
cc8d7565f1500b6db20dd7d4c8cc3b6434067e0b 16-Sep-2009 Owen Lin <owenlin@google.com> Handle the keep-screen-on more properly.

Change-Id: Iec16b1975537f69230d1c8ac19a5b0ff5a75d861
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
c1f2e3021bf7b12f2a33561e09bd0ab32530382e 14-Sep-2009 Owen Lin <owenlin@google.com> Implement the drawer UI. When user click on the drawer button, the
on-screen settings will show up.

Change-Id: I86a587969a9a01d62560e21d457d3639841ba6da
om/android/camera/Camera.java
om/android/camera/OnScreenSettings.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
83c371d93f9513d317fcabb5783cce5091274c34 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25454 into eclair

* changes:
Fix a bug that if user close the settings directly from sub menu. The summary in main menu will not be updated.
d53b8e8554655db159f972e30d60f2a830f5bc97 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24874 into eclair

* changes:
Fix NPE in resizeForPreviewAspectRadio().
f6ef7b960f610d557f0bab924b9f7928b46f6f0a 14-Sep-2009 Owen Lin <owenlin@google.com> Fix NPE in resizeForPreviewAspectRadio().

In user mode, if start preview fail, don't try to
set resizeForPreviewAspectRadio(). Also make changes in VideoCamera to prevent
similar problems.

In eng mode, reveal the exception so that test tools can detect and report the
error

Change-Id: Ice457d753dcf18e8e93cac90aa62ee1adcc332cd
om/android/camera/Camera.java
om/android/camera/CameraHardwareException.java
om/android/camera/CameraHolder.java
om/android/camera/VideoCamera.java
922273ca16db7bf57cf5a2910f5cbe9439aa5f57 17-Sep-2009 Owen Lin <owenlin@google.com> Fix a bug that if user close the settings directly from sub menu.
The summary in main menu will not be updated.
om/android/camera/OnScreenSettings.java
bacc4e595b85dc9fae34a47956a7ea8f6331b40a 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Don't change to orientation in the jpeg file. (It didn't work anyway).
om/android/camera/gallery/Image.java
f082286de4246d18fb1f1059442522efa4b9891c 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25257 into eclair

* changes:
Use the new exif interface API.
b147ba2369a9fd4c47706ec6e2e5c95f6b3a4328 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Use the new exif interface API.

Change-Id: I2aba6e09601facc1db633c57a015ea73c3eacb31
om/android/camera/MenuHelper.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
6574ad64b390e2cc889d2b68b78558567eca1c0d 16-Sep-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2115002.

generateShuffleOrder() must be called after mAllImages is populated by init().
om/android/camera/ViewImage.java
ce25062c826c35bd9f950a62cac4b8c838e9e6a6 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25034 into eclair

* changes:
Fix 2083478: Camera needs an auto-focus cancel API
ffde05cfdec09c6d04fe923b40e4a5436714ddca 15-Sep-2009 Wu-cheng Li <wuchengli@google.com> Restart preview if preview size is changed in camcorder.
om/android/camera/VideoCamera.java
62a2ae8a96495b77bd1d11420fd352cd0b8ca7c3 15-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2083478: Camera needs an auto-focus cancel API

Change-Id: I015c2ec5496dfd3921845f4974ba91a388675763
om/android/camera/Camera.java
2dabc27c42bbfeb65cd1e8b5ee1248a8bf10ee0a 14-Sep-2009 Chih-Chung Chang <chihchung@google.com> Better fix for 2117211: NPE in Camera.onFlashModeChanged

Change-Id: I03be03c5a648ced971a600c86948d827ce6360bd
om/android/camera/Camera.java
0dd2341fdf0f9aae201a71cf1dc26f03adca37c3 11-Sep-2009 Owen Lin <owenlin@google.com> Serveral improvement of OnScreenSettings.

1. Keep in submenu after changing option. Users will need to press the selected
option again or press on "back" to go back to main menu.
2. Fix a bug that when submenu show up. User cannot use traceball to select menu.
3. Simplify the code, there is no need to use "mRecorderInitialized", we can know
that by testing whether mMediaRecorder is null.

Change-Id: I2ab949e26aef7f1f9f874252295c2066688ed49d
om/android/camera/OnScreenSettings.java
om/android/camera/VideoCamera.java
1e44315c52e53c94c9b0f0b9ac0295a4d5cfb587 14-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24871 into eclair

* changes:
Fix the bug that scene mode doesn't change immediately.
d753838b1f23db2c42f3d6c64f7e0b1d2c12aaab 14-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24866 into eclair

* changes:
Fix 2113527: NPE in ViewImage.onActivityResult.
b24e33ac4f8b875d593c7c20cd15698c3edf153d 14-Sep-2009 Owen Lin <owenlin@google.com> Fix the bug that scene mode doesn't change immediately.

Change-Id: I22679cb2e25a6751021a225001247fbf03a758bb
om/android/camera/Camera.java
3e737c29c72503cc599dd6652483fa0170ccbbbc 11-Sep-2009 Owen Lin <owenlin@google.com> Add OnVisibilityChangedListener to OnScreenSettings. So that we can
release the media recorder at better timing.
Also reset the OnScreenSettings when hiding it.

Change-Id: Ica62b665d5cc087dc00ccdda71875c7aadc071f1
om/android/camera/OnScreenSettings.java
om/android/camera/VideoCamera.java
ca1f820e81d79fc58b15f66f7b04dba98ceb906e 13-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2113527: NPE in ViewImage.onActivityResult.

Change-Id: I87eca374895b1896a993ed80aa204193dce17123
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
b427f759b7097508a5f74d84d9a5efee93fe94d0 14-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24864 into eclair

* changes:
Fix 2117211: NPE in Camera.onFlashModeChanged
42be7712a3f114a7cba8f9e8adf33307509e3fc5 14-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2117211: NPE in Camera.onFlashModeChanged

Change-Id: I80326d1f4556416bfb9bb42d69626df652e6b427
om/android/camera/Camera.java
cb3e76956e6be212051cdc98ffadc8f7c1c7a42a 11-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2114487: NPE in ReviewImage.onPrepareOptionsMenu
om/android/camera/ReviewImage.java
78f160ee416ba27ba55954950473e17ba9d20052 10-Sep-2009 Owen Lin <owenlin@google.com> Remove CameraSettings. And then renmae CameraSettingsHelper to CameraSettings

Change-Id: I515c90bb5c4d49a2c4a761a933c0db6fbec0637b
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/CameraSettingsHelper.java
om/android/camera/VideoCamera.java
4a853fff135f3a1e96fcae06d266a84f63bb4043 11-Sep-2009 Owen Lin <owenlin@google.com> Remove switch menu item in both Camera and Camcorder.

Change-Id: Ic55eb043e78cc6ed7c5fea5d0a88937e964f739e
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
50c60047bf55be485fbcfa69bd0ff84e542f212a 10-Sep-2009 Owen Lin <owenlin@google.com> Enable the on-screen settings in Camcorder and also use different settings
in Camera and Camcorder.

Change-Id: I2444a2c8f7a040b2b5fc449df0fc988fba1b7aaf
om/android/camera/Camera.java
om/android/camera/CameraSettingsHelper.java
om/android/camera/VideoCamera.java
10fb5c8502759eb653b78e9a4c571b23a443ae0b 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24648 into eclair

* changes:
Add messages to help debug 2113527.
5ed81174af0ac1c26368e3d71b573369674ceb73 11-Sep-2009 Chih-Chung Chang <chihchung@google.com> Add messages to help debug 2113527.

Change-Id: I964bb8a02831a1bd89d1c74dd26283cafec9dc78
om/android/camera/ImageManager.java
om/android/camera/ViewImage.java
8bcef85b93957319ffa20d342f1bf9a69ae6e8dc 10-Sep-2009 Wu-cheng Li <wuchengli@google.com> Do not reset zoom to 1x after snapshot.
om/android/camera/Camera.java
eb9b537cf0b715354c179327020cb7cd4e0e5327 09-Sep-2009 Chih-Chung Chang <chihchung@google.com> Add double tap to zoom.

Change-Id: I11ea02685bb27b33eb73c11bea9918b5fa02e186
om/android/camera/EvenlySpacedLayout.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
cd65ac73996783ebf17e2b66b153e33fb37e6f8c 08-Sep-2009 Chih-Chung Chang <chihchung@google.com> Remove menu items already covered by the side buttons.

Change-Id: Ieae9f61e9e18f57b8ba8ac506e3fa50b210b555f
om/android/camera/ReviewImage.java
d9e32402bbc5ebaac40ccd2c4b734f8e5743343e 09-Sep-2009 Owen Lin <owenlin@google.com> Fix bug 2106774.

It seems to be a problem that we recieved the camera hardware button while
camera application is running.

Change-Id: I67dd2233e38ef530e55c116c2c70f37d026b5530
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHolder.java
8d0ba007ec6ef9bb34dc0c9f40c4c29dad2691e0 08-Sep-2009 Owen Lin <owenlin@google.com> Add scene mode preference in camera.

Change-Id: I56fe3a1fc942f18faefbbc06d0fdac013c791ed6
om/android/camera/CameraSettings.java
om/android/camera/CameraSettingsHelper.java
5f6484a74fe019337e436e6e0dcb07375a74af25 02-Apr-2009 President Li <wuchengli@google.com> Cherry pick two commits that implements color effect and white-balance
settings and then make it workable.

Change-Id: I519bff761db4b2b0acc1a61a8f901fafcd4b2586
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/CameraSettingsHelper.java
4c37a761a74d4bf9af3850894f3d919b7f272758 08-Sep-2009 Wu-cheng Li <wuchengli@google.com> Set optimal preview size.
om/android/camera/Camera.java
d189083d760820ad0b0d88e11feb897e4ab5011c 08-Sep-2009 Chih-Chung Chang <chihchung@google.com> Clean menu creation code.

Change-Id: Ie8ed04e74beef78208946688ee2f33297de0b6d1
om/android/camera/Camera.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
cc5a6356055dd8a8a4017b0af5410b53f25aaef0 07-Sep-2009 Wu-cheng Li <wuchengli@google.com> Reset frame rate to maximum in camera app.
om/android/camera/Camera.java
b5946549f73a3f49ccf163dda424a0319b4b6838 07-Sep-2009 Chih-Chung Chang <chihchung@google.com> Clean menu helper code.

Change-Id: I8c009ad9c340d7267e9d1cf43b6fc1513d44eb21
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f 07-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 1977974: For photos without location data, don't offer to "Show on Maps"

Change-Id: I7445e365ad9158312149dc80cf73361655171ba2
om/android/camera/CameraSettings.java
om/android/camera/ImageGallery.java
om/android/camera/MenuHelper.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
9b93bcbe3ccc49db5ce42de19fda1d3a9ef0011b 04-Sep-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.

Change-Id: I8814d8482df5709b03ef105f547f4981db34919a
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHardwareException.java
om/android/camera/CameraSettings.java
om/android/camera/ImageGallery.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenHint.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/MiniThumbFile.java
om/android/camera/gallery/SingleImageList.java
2c6c6174e2363fccb4e4f29b76290e99234fe140 01-Sep-2009 Owen Lin <owenlin@google.com> First version of on-screen settings for Camera.

Change-Id: I6e608b5b2d02abf3d1901160adba188399b03542
om/android/camera/Camera.java
om/android/camera/CameraSettingsHelper.java
om/android/camera/OnScreenSettings.java
om/android/camera/Util.java
c0a98e8814a39e6c6b6e87425d9fbd0585009f3f 04-Sep-2009 Owen Lin <owenlin@google.com> Use SEND instenad of SEND_MULTIPLE if only one image/video
is selected.

Change-Id: I5136194cb6cd88cc2224c34e770e714d1dbe4e5a
om/android/camera/ImageGallery.java
562f9230a5fec6ed0d126f62f498424cd47bb11e 04-Sep-2009 Chih-Chung Chang <chihchung@google.com> Change Cancelable to method call directly.

Change-Id: Id4396646e82593d9a40b3552dd2c6cd8146b29eb
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Cancelable.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ThreadSafeOutputStream.java
df30071cf2b861e108513907f17b327be8b8e8cb 04-Sep-2009 Chih-Chung Chang <chihchung@google.com> Make the grid view thumbnails smooth by using FILTER_BITMAP_FLAG.

Change-Id: Ie4242d8f5729dde920cec1ffa510761bc0c890ad
om/android/camera/ImageGallery.java
9f50102c16b6d83d881e59721e87a6a7035e2f38 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23873 into eclair

* changes:
When resuming MovieView after a pause, don't autoresume, but show the media controller instead.
829e38ad0055c27d9ef9e49e40bd04db8101e1f2 03-Sep-2009 Marco Nelissen <marcone@google.com> When resuming MovieView after a pause, don't autoresume, but
show the media controller instead.
om/android/camera/MovieView.java
om/android/camera/MovieViewControl.java
aa3cc2012a1ee0cc04e1244dd977cb8bb84683e4 03-Sep-2009 Wu-cheng Li <wuchengli@google.com> Add double tap to control digital zoom.

Double tap to zoom in to the maximum. Double tap again to zoom out to the minimum.

b1977072
om/android/camera/Camera.java
ba19d8b0011a528b38943458b2f816ed247f2793 02-Sep-2009 Wu-cheng Li <wuchengli@google.com> Use continous zoom.
om/android/camera/Camera.java
405a772ca8e919ee88157fea5bc4623717bd1027 02-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23616 into eclair

* changes:
Fix bug 2078592.
3665f924034a13014c9016be2707617d29d57f39 02-Sep-2009 Owen Lin <owenlin@google.com> Remove trailing spaces.

Change-Id: I80feb1b58c148b35b2666ef08d4b13d5aa0608b2
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/DrmImageList.java
8b3ecb2c0e1160c82d732f45d97d6b2b90762951 02-Sep-2009 Owen Lin <owenlin@google.com> Fix bug 2078592.

This bug is that the touch event location should be traslated to be related
to the "owner view" of the zoom control. However, we didn't do that. So, there
is a shift of the location in the event object.

We tried to detect if user has touched on the zoom buttons and then keep those
on-screen controls (including zoom buttons) shown. Now, we fix this bug by
changing the logic to "if user has touched the screen while those on-screen
controls are visilbe" then we keep those controls on screen.

Change-Id: I3664c47d308a76afc7d8746da8bbbc1f3afbf7ac
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
4305c70dc849156be5d79d52772ea71cd890ca40 02-Sep-2009 Wu-cheng Li <wuchengli@google.com> Use new parameters API.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
54dd1d32bbc01e9355c4a2dde555184a2d36c54e 01-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2066449: Align aspect ratio of the UI layout for video/image capture aplication

Change-Id: Ic51f6d670a8cfc692dd52e2221a4cde8d8e6f4a4
om/android/camera/VideoCamera.java
5053f25386fa8e727e981f2e5898f4ff9adaa601 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23279 into eclair

* changes:
Make the video duration preference text depend on the system property.
6f2c530d91749ff2b235125c3d134c981970f13d 31-Aug-2009 Chih-Chung Chang <chihchung@google.com> Make the video duration preference text depend on the system property.

Also upgrade old "1 minutes" duration to new "MMS video length" duration.

Change-Id: I21a975f2a3f1cde1c35a336e5552a2ae350bb6f6
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
05f6f3080862895971459a6cb6f689e8b2b84973 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23269 into eclair

* changes:
Fix 2068807: Runtime Exception in viewing DRM images downloaded by the browser.
91227ecf9382fd0af89f6e31794ba3f286e7c3c8 31-Aug-2009 Wu-cheng Li <wuchengli@google.com> Add zoom UI.
om/android/camera/Camera.java
65d719ce2ed83ba8251180ed7125a0650d1f1f3c 31-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2068807: Runtime Exception in viewing DRM images downloaded by the browser.

Change-Id: Iadbf89f53ff75ea788af2099ac09a6883353ad2d
om/android/camera/gallery/DrmImageList.java
7b645fbd40ec88dc18f4d1c9b751e8f8b48f6bfe 31-Aug-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.

Change-Id: I848708a594ee58adad404ae3c67257e74cc18e58
om/android/camera/Camera.java
om/android/camera/MonitoredActivity.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Cancelable.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/UriImage.java
3f3c857e3f34650c15d764810335024654b0fcc3 18-Aug-2009 Owen Lin <owenlin@google.com> Show error dialog when the camera hardware is busy (Eg: hijack by other
activity). We also change the behavior of the "Camera button", if the
camera is being used by others. We just ignore the request and won't start
the camera.

Change-Id: Icf3b00113aba61c9aa3f43ba07cf6944085d5d52
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraHardwareException.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
0cc79e160dded70c5986d63fc137badbd329e87e 31-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23088 into eclair

* changes:
Fix 2059728: NPE in BaseImageList.getCursor
633c16349a23b7e22c783189257444cd3c019235 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23085 into eclair

* changes:
Fix the bug flash is fired when the setting is off.
d4271821a35c87769b004991793b1928c31b41bc 28-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2059728: NPE in BaseImageList.getCursor

Return an empty image list if the cursor is not available.

Change-Id: Ib9f0b23668da7b3c29d208bd46c020e268a0b7f2
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImageList.java
5a737558964d65560e536f1f096a245f34659d08 28-Aug-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug flash is fired when the setting is off.

b2083478
om/android/camera/Camera.java
0f1e5801cbddffccf95e639b2096dd6c90b6af26 28-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2083639: Crash on Camera while previewing an attachment through Email/gmail/browser app

Change-Id: I69ca1ae148070d3428d3488416308431c82a103c
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
8b6e3943d117bff959da088ce89146d47d79ddbe 27-Aug-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.

Change-Id: I15624339790bffb078238c5a5870779dc4aa1b78
om/android/camera/BitmapManager.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/OnScreenHint.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoPreview.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/MiniThumbFile.java
522e836abc90bcb2d4e7a4ac37e269154d06c715 26-Aug-2009 Chih-Chung Chang <chihchung@google.com> Style fix.

Change-Id: I09ba86ee314e643415e41879c1d20ab1ede65a91
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/VideoList.java
f5bf8ca5870fed38fe91e3e018ebc13cc1738364 25-Aug-2009 Chih-Chung Chang <chihchung@google.com> Create ImageListParam as a spec for creating image lists.
Also merge deactivate() and close().

Change-Id: Idc76eda25bfcefab949e46412dca366228b3f437
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageManager.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
232b70ae4f02586fe39fe76513f975c4848395fc 25-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 1993400: Use the max recording duration parameter.
om/android/camera/VideoCamera.java
17dc811e88c8d0d66bb967d998f0230bedce98cd 24-Aug-2009 Chih-Chung Chang <chihchung@google.com> Show setting wallpaper message in crop image.
om/android/camera/CropImage.java
c830ac217a2ed42eee83e411ee9a04b2a3390392 24-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 1559583: Unnecessary image is created when setting a wallpaper
om/android/camera/CropImage.java
om/android/camera/Wallpaper.java
8df283a6685ee0dd18cd3276b6bb716b21f269c6 21-Aug-2009 Chih-Chung Chang <chihchung@google.com> Add on-screen flash button.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
34fe2a9d33a5b4ce49862ce4558a36c62ba6d540 19-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2052451: recycle bitmap memory as soon as possible so we won't be out-of-memory.
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
35e1be9b3239c5e47e287bd2d40779245adb829a 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21254 into eclair

* changes:
Fix the warnings shown in Eclipse. That is, removing unused field, replace deprecated methods, and removing unused imports.
e594b19809c160637f34550f27dd7ff4a3aaf5be 13-Aug-2009 Owen Lin <owenlin@google.com> Fix the warnings shown in Eclipse. That is, removing unused field,
replace deprecated methods, and removing unused imports.
om/android/camera/Camera.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/RotateBitmap.java
om/android/camera/Switcher.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
om/android/camera/Wallpaper.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/LruCache.java
om/android/camera/gallery/VideoObject.java
1f8ea050e2ef9aa4a496955d003aaa204d6c46c8 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21482 into eclair

* changes:
The DATE_TAKEN field is in milliseconds, but DATE_MODIFIED is in seconds.
9594a1e911b139df6530f46922efa3e07fda7c39 17-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21350 into eclair

* changes:
fixed encoder type string from mp4 to m4v
cce997c7726aa3881be7606d2ae3cc9a9b74beb8 17-Aug-2009 Chih-Chung Chang <chihchung@google.com> The DATE_TAKEN field is in milliseconds, but DATE_MODIFIED is in seconds.

We need to scale them before sorting.
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/VideoList.java
eb6a5532a258e3ed7a08d5e332002ff2d1437923 06-Aug-2009 Snigdha <snigdha@snigdha.(none)> fixed encoder type string from mp4 to m4v
om/android/camera/VideoCamera.java
97f078ad5a34e123ece6bb1d090be46bc602d348 13-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2039004: "Camera settings" from review screens irrelevant to Camera or Camcorder
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
87f0707a1a021857245521c775cc10f0e2a36d18 13-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 1860351: Gallery does not sort Camera photos by date.

For sorting, look at date_modified field if the datetaken field is null.
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/VideoList.java
643aa304482d52dda1217cee47d75a22b9438360 14-Aug-2009 Wei-Ta Chen <weita@google.com> am 3c21008c: Fix http://b/issue?id=2048408.

Merge commit '3c21008c953cf6177f7771c176fa81d336e74ed8' into eclair

* commit '3c21008c953cf6177f7771c176fa81d336e74ed8':
Fix http://b/issue?id=2048408.
3c21008c953cf6177f7771c176fa81d336e74ed8 12-Aug-2009 Wei-Ta Chen <weita@google.com> Fix http://b/issue?id=2048408.

(1) Set default maximum numbers of pixels for thumbails and mini thumbnails.
(2) Enfore computeSampleSize() to return a sample size that is either power of 2
or multiple of 8.
om/android/camera/BitmapManager.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
b066347ea8235fcf740b507cfb106cfcbf59f470 12-Aug-2009 Wu-cheng Li <wuchengli@google.com> Play click sound while clicking on an image in ImageGallery.

b1307676
om/android/camera/GridViewSpecial.java
5945773c664ada754ce5eb9239bd4c8bd95ee4b4 03-Aug-2009 Wu-cheng Li <wuchengli@google.com> Add flash mode setting.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
6db7f8e12af8def5ddaa49aed55d006d868f81ef 10-Aug-2009 Chih-Chung Chang <chihchung@google.com> am 781f55b2: Make the responsive region larger for the Picture/Video mode switch.

Merge commit '781f55b23ec3c3f97189efaba9d214183109f769'

* commit '781f55b23ec3c3f97189efaba9d214183109f769':
Make the responsive region larger for the Picture/Video mode switch.
60f640e3864e6d2dd52b3993f838c2461eb13e1f 10-Aug-2009 Chih-Chung Chang <chihchung@google.com> resolved conflicts for merge of 382b384e to master
781f55b23ec3c3f97189efaba9d214183109f769 10-Aug-2009 Chih-Chung Chang <chihchung@google.com> Make the responsive region larger for the Picture/Video mode switch.
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
382b384ec2cd948a82fe42294b18e4ec630bbdf6 06-Aug-2009 Chih-Chung Chang <chihchung@google.com> Removed unused resources and code. See 2036961: build size too large.
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/HighlightView.java
om/android/camera/ImageManager.java
om/android/camera/OnScreenHint.java
om/android/camera/TimeCounter.java
om/android/camera/Util.java
om/android/camera/VideoPreview.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
be1cb8546ee56ba86aae76310664f16222b36695 07-Aug-2009 repo syn && make -j4 <raychen@google.com> am 1d5ec3cb: Merge change 20382 into donut

Merge commit '1d5ec3cba971ecb2d49fef0640a221a30c707e49'

* commit '1d5ec3cba971ecb2d49fef0640a221a30c707e49':
Fix issue 2039521: Pressing back key doesn't work.
fcb65124480c7a07d8cb1b28eff3c6acd6107531 07-Aug-2009 repo syn && make -j4 <raychen@google.com> Fix issue 2039521: Pressing back key doesn't work.
om/android/camera/Camera.java
a05e3c4a2cd2032e45533c25e3a034153e394c3d 06-Aug-2009 Owen Lin <owenlin@google.com> am 69bd2716: Hide controls when return from other activities.

Merge commit '69bd2716384e95e42435268618c33902120ea8ea'

* commit '69bd2716384e95e42435268618c33902120ea8ea':
Hide controls when return from other activities.
69bd2716384e95e42435268618c33902120ea8ea 06-Aug-2009 Owen Lin <owenlin@google.com> Hide controls when return from other activities.
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
8f8cf3807d66cbd97172a262ce2da78ad2f2c2d9 29-Jul-2009 Owen Lin <owenlin@google.com> Add the function to share multiple items in gallery.
om/android/camera/ImageGallery.java
28a217917a10c0a0dad1e890faee62d6ac05edb0 05-Aug-2009 Chih-Chung Chang <chihchung@google.com> am 10df8d25: Fix 2033184: Crash on delete after downloading/previewing picture attachments.

Merge commit '10df8d25c28228ab60385a8d60e908e3e356ab88'

* commit '10df8d25c28228ab60385a8d60e908e3e356ab88':
Fix 2033184: Crash on delete after downloading/previewing picture attachments.
10df8d25c28228ab60385a8d60e908e3e356ab88 05-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2033184: Crash on delete after downloading/previewing picture attachments.
om/android/camera/ImageManager.java
om/android/camera/ViewImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
7e067ff38ac67b7a6612e576c77101e93a329c4c 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am debc5123: Merge change 9125 into donut

Merge commit 'debc51233f0b2f3de06c494319fdab00585ad31e'

* commit 'debc51233f0b2f3de06c494319fdab00585ad31e':
Fix bug 2022547. Show zoom buttons only when click on photo area.
debc51233f0b2f3de06c494319fdab00585ad31e 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9125 into donut

* changes:
Fix bug 2022547. Show zoom buttons only when click on photo area.
6f626ddd727e48c5b55aa4ed7656562405508597 31-Jul-2009 Wu-cheng Li <wuchengli@google.com> am 6b6a6d59: Make CropImage always fullscreen.

Merge commit '6b6a6d59ee9d4375a64265ff5e784f2356eabf96'

* commit '6b6a6d59ee9d4375a64265ff5e784f2356eabf96':
Make CropImage always fullscreen.
6b6a6d59ee9d4375a64265ff5e784f2356eabf96 31-Jul-2009 Wu-cheng Li <wuchengli@google.com> Make CropImage always fullscreen.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageGallery.java
om/android/camera/MenuHelper.java
om/android/camera/Wallpaper.java
71ea3a35151560d603c20ca19e6318924870a730 30-Jul-2009 Owen Lin <owenlin@google.com> Fix bug 2022547. Show zoom buttons only when click on photo area.
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
c8c50ad248c400ae8dcbf83572aea07a601cee3e 31-Jul-2009 Chih-Chung Chang <chihchung@google.com> am 048e9db0: Fix 2021864: NPE while saving picture in CropImage.

Merge commit '048e9db023de286e9576b438d4c616a53773abc8'

* commit '048e9db023de286e9576b438d4c616a53773abc8':
Fix 2021864: NPE while saving picture in CropImage.
048e9db023de286e9576b438d4c616a53773abc8 30-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 2021864: NPE while saving picture in CropImage.

The problem is if the bitmap is passed inline, we won't have a image list
to release in onDestroy.
om/android/camera/CropImage.java
0200f87cc7dcc377e88ebc34cabdc1d41401ebf7 31-Jul-2009 Chih-Chung Chang <chihchung@google.com> am 1f463a62: Make dpad left/right move to prev/next image.

Merge commit '1f463a62595ee86c7f4472d8ad69dda959b396ff'

* commit '1f463a62595ee86c7f4472d8ad69dda959b396ff':
Make dpad left/right move to prev/next image.
1f463a62595ee86c7f4472d8ad69dda959b396ff 30-Jul-2009 Chih-Chung Chang <chihchung@google.com> Make dpad left/right move to prev/next image.
om/android/camera/CropImage.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
121b2526cac5576fa7e2096f9254e031b3f8175d 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 3056316d: Merge change 9141 into donut

Merge commit '3056316d205928434c7aa57a1ce5e8c6f3a5984f'

* commit '3056316d205928434c7aa57a1ce5e8c6f3a5984f':
Lower the priority of the ImageGetter thread to avoid competing with
eb7c347833d291aca93e75c2aa8c71d388c558cf 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am e1fa766d: Merge change 9085 into donut

Merge commit 'e1fa766dee17b254c2e506c068768a601909b74f'

* commit 'e1fa766dee17b254c2e506c068768a601909b74f':
Fix bug 2022547. Show zoom buttons only when click on photo area.
af48223fc7b7b63f0dffb96e61464b4a28b0fdb7 31-Jul-2009 Wu-cheng Li <wuchengli@google.com> am 640ad87b: Make CropImage support fullscreen extra.

Merge commit '640ad87bf4945f5baa22ef1e02eb1c4ac7fd3ef7'

* commit '640ad87bf4945f5baa22ef1e02eb1c4ac7fd3ef7':
Make CropImage support fullscreen extra.
c42548557cb81a11814ba0d7a88d9f2429bb336e 30-Jul-2009 Owen Lin <owenlin@google.com> am 62f1a228: Revert "Use revised zoom widget, on the right in Gallery."

Merge commit '62f1a2287bcbc2a6928235f4e3cb8c8cefbbe6e4'

* commit '62f1a2287bcbc2a6928235f4e3cb8c8cefbbe6e4':
Revert "Use revised zoom widget, on the right in Gallery."
3056316d205928434c7aa57a1ce5e8c6f3a5984f 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9141 into donut

* changes:
Lower the priority of the ImageGetter thread to avoid competing with the UI thread.
3b45657ace1c5a0a405c3597aaba39703fa77da8 30-Jul-2009 Chih-Chung Chang <chihchung@google.com> Lower the priority of the ImageGetter thread to avoid competing with
the UI thread.
om/android/camera/ImageGetter.java
e1fa766dee17b254c2e506c068768a601909b74f 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9085 into donut

* changes:
Fix bug 2022547. Show zoom buttons only when click on photo area.
0ac86072d4670c03f5b3e98c14fec0175d04a935 30-Jul-2009 Owen Lin <owenlin@google.com> Fix bug 2022547. Show zoom buttons only when click on photo area.
om/android/camera/ReviewImage.java
640ad87bf4945f5baa22ef1e02eb1c4ac7fd3ef7 30-Jul-2009 Wu-cheng Li <wuchengli@google.com> Make CropImage support fullscreen extra.

b2022570. When returning from a full-screen activity to a non-full-screen one, screen jumps a little and scroll bars are partially off screen. This is a work-around to prevent the issue.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageGallery.java
om/android/camera/MenuHelper.java
om/android/camera/Wallpaper.java
62f1a2287bcbc2a6928235f4e3cb8c8cefbbe6e4 30-Jul-2009 Owen Lin <owenlin@google.com> Revert "Use revised zoom widget, on the right in Gallery."
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
537a96bfda3d625cf9c9c831b6767c908c93dd3d 30-Jul-2009 Ray Chen <raychen@google.com> am 012d0f38: Defer bitmap rotation until it\'s drawn on ImageView.

Merge commit '012d0f38e1fd547436675257c5cd5c62928e2ed5'

* commit '012d0f38e1fd547436675257c5cd5c62928e2ed5':
Defer bitmap rotation until it's drawn on ImageView.
e2a35c7019b5169fd8422989ce15286ea4cec2b4 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am b5386235: Merge change 8958 into donut

Merge commit 'b53862357d977643c760c4eaeb0b7dcc841727f6'

* commit 'b53862357d977643c760c4eaeb0b7dcc841727f6':
Fix http://b/2017388 by handling the corner case in computeSampleSize().
b26ef40270e09a9a6c839bc69e1dd21b03862c3c 30-Jul-2009 Wu-cheng Li <wuchengli@google.com> am 1e50968c: Check storage again after receiving storage related intents.

Merge commit '1e50968c0a9eba523efcfdda86e298e33e95687d'

* commit '1e50968c0a9eba523efcfdda86e298e33e95687d':
Check storage again after receiving storage related intents.
51db12e49d8392a7505548f53d2678283c910a36 30-Jul-2009 Wu-cheng Li <wuchengli@google.com> am d12ae209: Show "prepareing SD card" when media scanner is scanning.

Merge commit 'd12ae2098b491bb55798758da8b698ffc625d62c'

* commit 'd12ae2098b491bb55798758da8b698ffc625d62c':
Show "prepareing SD card" when media scanner is scanning.
012d0f38e1fd547436675257c5cd5c62928e2ed5 20-Jul-2009 Ray Chen <raychen@google.com> Defer bitmap rotation until it's drawn on ImageView.
om/android/camera/CropImage.java
om/android/camera/ImageGetter.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/ReviewImage.java
om/android/camera/RotateBitmap.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
b53862357d977643c760c4eaeb0b7dcc841727f6 29-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8958 into donut

* changes:
Fix http://b/2017388 by handling the corner case in computeSampleSize().
f2c7e983fafaf7639a6ad090a93d1892015777ed 29-Jul-2009 Wei-Ta Chen <weita@google.com> Fix http://b/2017388 by handling the corner case in computeSampleSize().
om/android/camera/ImageGetter.java
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
1e50968c0a9eba523efcfdda86e298e33e95687d 29-Jul-2009 Wu-cheng Li <wuchengli@google.com> Check storage again after receiving storage related intents.

Media scanner sends ACTION_MEDIA_SCANNER_STARTED if it is scanning internal. We need to check storage again after receiving intents.
om/android/camera/Camera.java
d12ae2098b491bb55798758da8b698ffc625d62c 27-Jul-2009 Wu-cheng Li <wuchengli@google.com> Show "prepareing SD card" when media scanner is scanning.

Fix 1996415.
om/android/camera/Camera.java
947455a44af2b912e9c342b36eb9ab619fab2a66 29-Jul-2009 Chih-Chung Chang <chihchung@google.com> Sets more parameters for media recorder.
om/android/camera/VideoCamera.java
ab8c77fda5b33b67d3b558e7bc49c1ca8ac29047 28-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix layout for high dpi display.
om/android/camera/GridViewSpecial.java
320558c2bc8e8b2a4fef53e2ea862d4d9bb2608f 28-Jul-2009 Ray Chen <raychen@google.com> am b0aadd00: Use revised zoom widget, on the right in Gallery.

Merge commit 'b0aadd00e7bb48316fb21369869fad8dd94ace88'

* commit 'b0aadd00e7bb48316fb21369869fad8dd94ace88':
Use revised zoom widget, on the right in Gallery.
22445b3f75d60459a57d3e0ee8326fe9eef5a0a5 27-Jul-2009 Chih-Chung Chang <chihchung@google.com> am ce033a58: Fix http://b/1991523 by limiting the size of a bitmap when we decode a full image.

Merge commit 'ce033a5871a0b678521411f9a3acaee2ab279178'

* commit 'ce033a5871a0b678521411f9a3acaee2ab279178':
Fix http://b/1991523 by limiting the size of a bitmap when we decode a full image.
b0aadd00e7bb48316fb21369869fad8dd94ace88 21-Jul-2009 Ray Chen <raychen@google.com> Use revised zoom widget, on the right in Gallery.
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
97601c7ab6aa9ec093a7d3436e99aa1571b87092 27-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1993400: Read video recorder setting from system properties.
om/android/camera/VideoCamera.java
ce033a5871a0b678521411f9a3acaee2ab279178 27-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix http://b/1991523 by limiting the size of a bitmap when we decode a full image.

computeSampleSize() now accepts not only targetWidthOrHeight but also the size of a bitmap.
om/android/camera/CropImage.java
om/android/camera/ImageGallery.java
om/android/camera/ImageGetter.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
187e9f4fd03bdba56ddb4ff4584800abdbef1952 24-Jul-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.
om/android/camera/PriorityTask.java
om/android/camera/PriorityTaskQueue.java
om/android/camera/Util.java
d52feea5b0958084a917571550ddcfbb07605a44 24-Jul-2009 Chih-Chung Chang <chihchung@google.com> Remove unused code.
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
4250e214f539a3caee1434889c5660d594b45dfd 24-Jul-2009 Chih-Chung Chang <chihchung@google.com> Simplify ImageGetter.
om/android/camera/ImageGetter.java
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
d06aa697fb037b92b40b8e1ae6ab7db5c5b64d13 23-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1996918: NPE in ViewImage.onClick.
om/android/camera/ViewImage.java
026dff889c80763fc322ed03e2d3a76750320138 19-Jul-2009 Wei-Ta Chen <weita@google.com> Fix http://b/1907995 by using native allocation in BitmapFactory.
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
2457e114dab932e23226920a83ffce15b285504f 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6510 into donut

* changes:
Fix issue 1949573. In multiselect mode, don't show the select outline for touch event.
4c2f857644e5dc3f09ac7a283590e134a8547d84 09-Jul-2009 Owen Lin <owenlin@google.com> Fix issue 1949573. In multiselect mode, don't show the select outline
for touch event.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
f68887f6ffd4b3c04975bb84429ba438e397b18b 17-Jul-2009 Owen Lin <owenlin@google.com> Fix the bug that the no images view will keep showning on screen even
when there are images.

The reason is that we only update (hide/show) the "no image view" in rebake,
which will only be invoked by media status changing (like scanning start,
eject SD card, and etc.) So, the bug will happen when the the image is add to
the card but there is no media status changing.
om/android/camera/GalleryPicker.java
92eedd640affe6bac8f8a32414d5496d7be3b643 15-Jul-2009 Ray Chen <raychen@google.com> Rollback invalidateImage to refresh individual image instead of rebuilding whole list.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
48f6cdff77fe6b0c44b7d4c4261599e1de7225f1 15-Jul-2009 Wu-cheng Li <wuchengli@google.com> Start preview earlier to let user see preview earlier.

This reverts commit 785cd00067fc822701aa5e43da00382352a90e99.
A workaround will be added in HAL for overlay case.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
61c81d0926f24fa5642488a1462644a9ebfe5bd4 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6826 into donut

* changes:
Fix bug 1970161.
52b6fc4ee03f538e3fe42a05e2ee9093aa89947d 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7015 into donut

* changes:
Cancel the thread encoding in "onStop".
d918cfa6846593ceb844196a6d0012f3f350252f 13-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1973541: The mode switcher does not correspond to the actual mode.
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
33f86b87c2eaef2352d54184a66c0b0d061b41d7 14-Jul-2009 Owen Lin <owenlin@google.com> Cancel the thread encoding in "onStop".
om/android/camera/GalleryPicker.java
24588aa2e489607b6942658f1b0ae0a6cfc2411a 10-Jul-2009 Ray Chen <raychen@google.com> Fix the issue 1972285: The image rotation does not update in thumbnail view immediately after rotation.
om/android/camera/ImageGallery.java
6fa5404fd6c34d401c56accd059a706d8a832812 10-Jul-2009 Owen Lin <owenlin@google.com> Fix bug 1970161.

I think the reason is that we post a runner to do clean up when the
background job has been done.

However, the runner could be queued when the activity finished().
So, we first see a leak window message (because we havn't close the dialog yet)
And then see a "view not attached" exception (because we try to close
it after the activity being destroyed)

Fixed now.
om/android/camera/Util.java
b2a976541515ae62021c2e8810ec386baeba5408 10-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1836138: Crash (permissions) when sharing from Email/Gmail --> Gallery --> Anywhere Else
om/android/camera/MenuHelper.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
785cd00067fc822701aa5e43da00382352a90e99 10-Jul-2009 Wu-cheng Li <wuchengli@google.com> Revert "Start preview earlier to let user see preview earlier."

This reverts commit 20e4e11c81a37e4dcc87fe501ea853bd5b699fe3.
The original change broke overlay case.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
05f863c610c1748c5fd5ca2ce0603f8c037edc31 10-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1971900: Not able to delete picture using "Delete " contextual menu option.
om/android/camera/ImageGallery.java
93f7465752ca66b583bc4880ac40bade039a96a3 09-Jul-2009 Chih-Chung Chang <chihchung@google.com> Try to fix 1962530: out of memory in CropImage.

Recycle the bitmap as much as we can.
om/android/camera/CropImage.java
aa7075cc4e2528d5869f737dc684e2a797be8da3 24-Jun-2009 repo sync <raychen@google.com> Move reverse geocoder to AsyncTask and update location information asynchronously.
om/android/camera/MenuHelper.java
om/android/camera/ReverseGeocoderTask.java
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
d5d74642d7c0b43578b43cdd46b70671b64c88e2 11-Jun-2009 Wei-Ta Chen <weita@google.com> Set bitmaps for full size images as being purgeable in viewing and reviewing images.

We increase the resolution of full size images to 2048x1536 for achieving better zoom-in quality.
Also the delay between decoding a thumbnail and decoding a full size image is set to 1000 msecs.
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
2c28c55197bd37f1f199dd9884c4bfca7ea6ff0e 09-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1962656: Going to gallery when sd card is full causes a crash.

Also simplify the thumbnail reading code.

I think we don't need to check the thumbnail magic being id
because all current thumbnail files should have random number
and not id. (see bug 1240638 for date).
om/android/camera/ImageLoader.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/MiniThumbFile.java
a274cf1800a18e94653ee999f19c7d4844ad3d80 06-Jul-2009 repo sync <raychen@google.com> Move ExifInterface to android.media package.
om/android/camera/ExifInterface.java
om/android/camera/MenuHelper.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
2f84ae81c4a44bf6097224599c8d9a722c9a4f14 08-Jul-2009 Ray Chen <raychen@google.com> Revert ContentObserver in ImageGallery.
om/android/camera/ImageGallery.java
2616d29c4c28cea59e7ec7ce63e8b2760e8cae21 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6455 into donut

* changes:
Read max file size from video capture intent.
b6ed73e152c385c10ea20c605fa231e04de38ccc 08-Jul-2009 Wu-cheng Li <wuchengli@google.com> Read max file size from video capture intent.

Fix b1660028.
om/android/camera/VideoCamera.java
cb4b88e7d62dec7c38953278d8d2facafd89a14c 07-Jul-2009 Chih-Chung Chang <chihchung@google.com> Draw the multiselect markers dynamically so we can avoid invalidating the thumbnails.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
5f2686bef342f62421747fd743cf170d22f0e190 01-Jul-2009 Owen Lin <owenlin@google.com> Use ReferenceQueue to improve LruCache.
om/android/camera/gallery/LruCache.java
588e29b6c27430ab210a197aa41a06758f2c2d82 07-Jul-2009 Owen Lin <owenlin@google.com> Fix the NPE by keeping the mDbObserver in onStop(), just unregister it.
om/android/camera/GalleryPicker.java
62ca191db25c75fea4d47a0d472d7952e795b337 01-Jul-2009 repo sync <raychen@google.com> Monitor database change by ContentObserver so we can update media data incrementally and "wait dialog" is only shown when there's no image in the current bucket.
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery.java
cede87fa23b81b49786831e90a175293e9c8bc7c 03-Jul-2009 Yu Shan Emily Lau <yslau@google.com> Added the memory measurement of the mediaserver in the camera image capture and video capture test cases.
om/android/camera/Camera.java
52aae7063493140ef91e1067c5100d9b52a48287 02-Jul-2009 Owen Lin <owenlin@google.com> Fix some warning shown in Eclipse.
om/android/camera/Camera.java
om/android/camera/DeleteImage.java
om/android/camera/ImageGallery.java
om/android/camera/gallery/Cancelable.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageListUber.java
91acfc99279d5ece7ac9cb2d7a2980eb0d3b50da 06-Jul-2009 Chih-Chung Chang <chihchung@google.com> Style fix.
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/DeleteImage.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MonitoredActivity.java
om/android/camera/MovieViewControl.java
om/android/camera/ReviewImage.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Cancelable.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/LruCache.java
0a28549a7e6db0307b2cb5d2df7444909fb03a48 03-Jul-2009 Chih-Chung Chang <chihchung@google.com> Change camera latency time variables to non-static.
om/android/camera/Camera.java
9f7388e9a31cb7560ec3009989a73aac23e36688 03-Jul-2009 Chih-Chung Chang <chihchung@google.com> Add retry if the query fails. The query fails if the media
provider is killed.
om/android/camera/gallery/BaseImageList.java
2e768c1b835a127f190395a91477144d8ae850ac 02-Jul-2009 Owen Lin <owenlin@google.com> Reset the switch state in "onStart" in both Camera and Camcorder.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
874ae5cea794f147764bcba18d58ffaaa9a4296f 02-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1956863: The border of the select image still stay on the screen
after removed all the images in gallery.
om/android/camera/GridViewSpecial.java
c476b25f50677130976c77922de4c0f6581ab649 02-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1956733: NPE in ImageManager.isImage
om/android/camera/ImageGallery.java
06f43ba80be30798801e0c4ca1cbade8ec222dd8 02-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1955365: NPE in ViewImage.updateActionIcons
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
bb1877847ae050918fe591d9b7fa63deaf645746 02-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1956859: "Set as" is not working with the downloaded image.
om/android/camera/MenuHelper.java
om/android/camera/ReviewImage.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
c613c59117c25a37456b2a346515cbcd1dfcf0e0 02-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix bug: wait for idle time before checking thumbnail only if there is still some
thumbnail to check.
om/android/camera/ImageLoader.java
482a3a54cfa8ec2cc913efc0e73a01d78453ee6d 27-Jun-2009 Owen Lin <owenlin@google.com> Fixed the OOM in crop image.

The original code of "CropImage" won't wait the save action to be complete
before exiting.

We have to hide the ProgressDialog in onStop(), otherwise, if the job is done
in background(after onStop()), a "no window token exception" will be
thrown when dialog.dismiss() is called. Thus, a new MonitoredActivity is
introduced to help us handle this, hope it will be useful in other places.
om/android/camera/CropImage.java
om/android/camera/MonitoredActivity.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
35f8af0ff228adfeec6bb40844d362f6dd62dab6 01-Jul-2009 Chih-Chung Chang <chihchung@google.com> Fix 1950477: Menu items for video review are incorrect.
om/android/camera/ImageGallery.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/ReviewImage.java
om/android/camera/SelectedImageGetter.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
387833adb5ea8ff6be37a5582ef965da839668bd 30-Jun-2009 Owen Lin <owenlin@google.com> Fix bug 1949582. If this is the last image to be deleted,
the mCurrentPosition will be -1 and getImageAt() will return null and thus
cause a NPE. If the image list is empty just return null is enough.
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
3283e049aa080c375457de46bbf180a88899228a 26-Jun-2009 Owen Lin <owenlin@google.com> Solve task flow problems in Camera and Camcorder.

1. Let "Camera" and "Camcorder" use the same task affinity, so that there
will only one task stack in the system.

2. Finish the "Camera" or "Camcorder" activity, when switch to the other,
so that it works like the same activity.
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
20e4e11c81a37e4dcc87fe501ea853bd5b699fe3 24-Jun-2009 Wu-cheng Li <wuchengli@google.com> Start preview earlier to let user see preview earlier.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
aabcd0ef769a345d61400ef2e0125f342be8860b 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5758 into donut

* changes:
Fix 1948669. The grid of multi-selected video becomes white while it is being selected
559899a2352faab0843fdb4a8dc5af345fd7d3df 30-Jun-2009 Wu-cheng Li <wuchengli@google.com> Increase image zoom speed.
om/android/camera/ReviewImage.java
om/android/camera/ViewImage.java
b21c07c384f917f42df5448e944dd9a3660a681a 30-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1948669. The grid of multi-selected video becomes white while it is being selected

Only check thumbnail when the worker thread has been idle for 1 second.
This gives the ImageBlockManager some time to figure out what to load next.
om/android/camera/ImageLoader.java
30f17b21d139f65ae1cc658e742aae121951a24b 29-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1945392. Long press a photo in gallery, choose "delete", it crashes.
om/android/camera/ImageGallery.java
a69dfb08c8e9e3bd3b29f697b9966b73e7043136 29-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3805 into donut

* changes:
Enable multiselect delete.
0e48fe644678ccdbcf8768e19961cccab726291f 26-Jun-2009 Chih-Chung Chang <chihchung@google.com> Enable multiselect delete.
om/android/camera/DeleteImage.java
om/android/camera/ImageGallery.java
om/android/camera/MenuHelper.java
baf5d9e613ce79ad444c48b5450aa7c89af6d468 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5419 into donut

* changes:
Remove unused code in ViewImage.
c08b6f77490fe0f35b68fc98d31eb71bfdb373ce 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5228 into donut

* changes:
Improve switcher to enable drag and drop operations.
6149fad9a707385e2fc3b7918a189da6f02c37c7 25-Jun-2009 Owen Lin <owenlin@google.com> Remove unused code in ViewImage.
om/android/camera/ViewImage.java
145b61a5b2e762b80695e97b22274c7d32c02656 25-Jun-2009 Owen Lin <owenlin@google.com> Retry to submit it again. It seems I changed the file "IImage" -> "Image"
before I create the commit.
om/android/camera/ViewImage.java
35bcfe4ef910bf29d5402c75e2c05ec0c255501d 25-Jun-2009 Owen Lin <owenlin@google.com> Revert "It seems that there is no quarantee that "onActivityResult()" will be called"

This reverts commit 90bbbcbdfa4f2329dfdfda867a4bd58fa27a2840.
om/android/camera/ViewImage.java
96269e0f8c2d6cad54f0ac8d3767d917f3ba7b4c 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5354 into donut

* changes:
It seems that there is no quarantee that "onActivityResult()" will be called before "onStart()". So, adding code to handle both situations. Also add checking on "mPaused" in showOnScreenControls().
90bbbcbdfa4f2329dfdfda867a4bd58fa27a2840 25-Jun-2009 Owen Lin <owenlin@google.com> It seems that there is no quarantee that "onActivityResult()" will be called
before "onStart()". So, adding code to handle both situations. Also add
checking on "mPaused" in showOnScreenControls().
om/android/camera/ViewImage.java
3d2c04f80fc4a65ec1e30811ad997461e41af0e5 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5333 into donut

* changes:
Fix 1942091: In image/video preview, the trackball should not move the image too much and show black bar.
97fc2019bc428259a452c7970a4ea6fdd99d80be 25-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1942091: In image/video preview, the trackball should not move the image
too much and show black bar.
om/android/camera/ImageViewTouchBase.java
4adbd039994dc1a28b374cfb8d3c56eafc355e50 25-Jun-2009 repo sync <raychen@google.com> Fix Issue 1942097: Delete the video show incorrect toast.
om/android/camera/ReviewImage.java
e239acc2185c5fb47b22a65f78ffa461e19f183c 24-Jun-2009 Owen Lin <owenlin@google.com> Improve switcher to enable drag and drop operations.
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/VideoCamera.java
7035b131cd0a8869f7980841988258a70ca76770 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5048 into donut

* changes:
Fix several issues with ImageList.
b0e1282810ec68fd7585beb9ab9afab9bcafe1bd 23-Jun-2009 Owen Lin <owenlin@google.com> Fix several issues with ImageList.

One is bug 1933327

It seems to be timing issue. We assign the value of mAllImages in only
"onCreate" and will set it to null in "onActivityResult".
I modified the code so that it won't be null after "onCreate()".

The other issue is the crop image won't . The reason is we don't clean
up the cache when we reopen the cache. It won't work for ImageListUber
for the original fix since "buildImageListFromUri" won't return ImageList
of type ImageListUber.

The final one is the "getImaegForUri", last time, I made a change but
cause review fails in Camera. But, I need the check if the given uri is
actually the same as the image list not just check the "id".
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/ImageListUber.java
9d86d5d9ab6ac0aa28e56f8b02cfcdd06966e32d 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5195 into donut

* changes:
Fix 1933301: NPE in ImageGallery.onImageClicked
0b803c0b817451e075243466022a137480338c35 24-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1933301: NPE in ImageGallery.onImageClicked
om/android/camera/ImageGallery.java
2bb9e74cc84b60a349ec90b34e39973b019ec0bd 24-Jun-2009 repo sync <raychen@google.com> Move storeImage back to UI thread.
om/android/camera/Camera.java
72f6518f8a47b20d9cf0896b1c156c159247d148 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5030 into donut

* changes:
Change icon for retake in video.
1af86ab03dbd9fe57fb833ddc7abce3062e4151b 23-Jun-2009 Owen Lin <owenlin@google.com> Change icon for retake in video.
om/android/camera/VideoCamera.java
50d3106db0dcb430310f5968f33213e76f3a9fff 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4905 into donut

* changes:
Address review comment in previous patch sets.
d860c968e1e8e41d53f8281e172acbc1236e3615 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5062 into donut

* changes:
Do not start preview if surface is null.
37dcfbb99d78c5179ecda79e7fd408eca4d00844 23-Jun-2009 Wu-cheng Li <wuchengli@google.com> Do not start preview if surface is null.
om/android/camera/VideoCamera.java
d59784822af97957f595ad2acd4c1e81a544c079 22-Jun-2009 Chih-Chung Chang <chihchung@google.com> Remove verbose messages.
om/android/camera/gallery/ImageListUber.java
eab15857f3829a7d26979b9604021a3cfbbc4d28 22-Jun-2009 Owen Lin <owenlin@google.com> Address review comment in previous patch sets.
om/android/camera/Camera.java
61b98317dfb7b8bad4e826e1db560128e1c37374 19-Jun-2009 Owen Lin <owenlin@google.com> UI refresh for attachment capture mode.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
84f96469f8c54fcdc61b6e854cd478abc15c4f52 19-Jun-2009 Wu-cheng Li <wuchengli@google.com> Fix attach video.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
46fc7aeec04021dfc2f4c947649888dbc7408f53 19-Jun-2009 Wu-cheng Li <wuchengli@google.com> Integrate camcorder review mode to ReviewImage.
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/ReviewImage.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/SingleImageList.java
84eaae7fbd51fe915c4a5e1daffe444b02352cdb 16-Jun-2009 Owen Lin <owenlin@google.com> Fill the size in database when insert a new item to the table.
om/android/camera/VideoCamera.java
dad4b187eec436a2716aca5af31f23ce5de95f39 12-Jun-2009 Owen Lin <owenlin@google.com> New UI for camera
om/android/camera/Camera.java
om/android/camera/Switcher.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
8d16a5c7fc75e70782efbe970a756de92b564b35 18-Jun-2009 Wu-cheng Li <wuchengli@google.com> Handle openFileDescriptor failure case.

Fix b1925294
om/android/camera/ThumbnailController.java
55319ceeef829274a95e2a41e7e365228acf5ccd 18-Jun-2009 Wu-cheng Li <wuchengli@google.com> Reduce the latency to enter camera setting.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
3339d68b7e7f5551072d20a64fb802ecccb0c422 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4450 into donut

* changes:
Fix issue 1921166: Cropped image is not displayed after cropping a picture from Gallery picture view.
b5e5722981c02926fdbeae7880e662cbbacfe173 18-Jun-2009 Wu-cheng Li <wuchengli@google.com> Remove white balance, effects, ISO, and brightness from setting.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
5e06e3fb8dd3d0ed01d6ab7a6b769ff9d8fb7c4f 17-Jun-2009 repo sync <raychen@google.com> Fix issue 1921166: Cropped image is not displayed after cropping a picture from Gallery picture view.
om/android/camera/ViewImage.java
4fc134dffebaddec5bcdb26dc1caeb4ab6f7f91c 18-Jun-2009 Chih-Chung Chang <chihchung@google.com> Try to fix 1917822.

Make sure we have a surface in the holder before proceeding.
om/android/camera/Camera.java
5f59cd962f311511f45452dc8c4428eb1ceaeabf 17-Jun-2009 repo sync <raychen@google.com> Fix NPE in issues 1921957 & 1921062.
om/android/camera/ViewImage.java
72c06b6947053044d141d8983e2cf1376bf93614 16-Jun-2009 Wu-cheng Li <wuchengli@google.com> Disable zoom until driver is ready.

If zoom is enabled and camera is zoomed in, preview cannot be started after snapshot.
om/android/camera/Camera.java
8564b8a3844d87e1ffe3d40cb8ff7ff5cb93312e 16-Jun-2009 Wu-cheng Li <wuchengli@google.com> Do not change surface view size after capture.

This is a workaround for the bug that sometimes preview is not started
when stopPreview and startPreview are called consecutively.
om/android/camera/Camera.java
ac61c19695a619182977fb66d768bf12c131c7e7 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4305 into donut

* changes:
Fix NPE in zoomIn.
05309120f233e2f3a2d6319d0efd996254e86c16 16-Jun-2009 Wu-cheng Li <wuchengli@google.com> Fix NPE in zoomIn.
om/android/camera/Camera.java
f8c1a126fdd54d32cd8d08d1ef62a64893b9ae03 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4301 into donut

* changes:
Remove unnecessary thumbnail generation in the process of saving image.
b9d3d11724c8cf5a3bf8c5ad1963e79d0af668cf 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4300 into donut

* changes:
Fix 1913780. NPE in ImageGallery.getCurrentImage.
5fa9483e0f3a31fcff7da86cdd9e32795eacf235 15-Jun-2009 Wu-cheng Li <wuchengli@google.com> Hide zoom controller during snapshot.
om/android/camera/Camera.java
8d2ae05cd02421e34b024b25bb24475374de11ba 15-Jun-2009 Chih-Chung Chang <chihchung@google.com> Remove unnecessary thumbnail generation in the process of saving image.

The original code does not work as intended because the filePath is null
at that time, and the mini thumbnail magic is cleared in execute() of
AddImageCancelable. So remove this part of code altogether.
om/android/camera/gallery/Image.java
180913601780bbff0c15d21103b3ad1f64e3f1fe 15-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1913780. NPE in ImageGallery.getCurrentImage.

Check if we can handle events in delete callback.
om/android/camera/ImageGallery.java
2e257ee4a178226f019bb173d78582536cf022d3 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4027 into donut

* changes:
fix bug 1909589 and 1903635. I think the cause root is that the LruCache is not thread safe. I change it to thread safe and add a test for this.
547caa3586633adcaddfbe766ec46a0b97ee8d4c 15-Jun-2009 repo sync <raychen@google.com> Fix issue 1880374 The thumbnail does not update in picture review mode after deleting the captured picture.
om/android/camera/Camera.java
om/android/camera/ViewImage.java
04b068b149b7645fb007d2bfb5302567819124f0 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4039 into donut

* changes:
Fix 1911405: Captured JPEG image size is only 512x384.
832276d7aecb5917086890c8512a7fdf0f79b882 12-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1911405: Captured JPEG image size is only 512x384.

The problem is the thumbnail is written to the same file as the original image.
The bug is made visible by the new camera driver because the thumbnail in the jpeg
file is not readable (I'll file another bug for that).
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
827fac7640e0aa20ec9301ec3c9fe9bd9b318f15 12-Jun-2009 Wu-cheng Li <wuchengli@google.com> Add log message for debugging.
om/android/camera/Camera.java
0e9396270cfe12cf7a3804103db5f69cb76c2af5 12-Jun-2009 Owen Lin <owenlin@google.com> fix bug 1909589 and 1903635. I think the cause root is that the LruCache is not
thread safe. I change it to thread safe and add a test for this.
om/android/camera/gallery/LruCache.java
6795ff166eea7205e33fe2f160e639c39365f373 09-Jun-2009 Owen Lin <owenlin@google.com> Extract MovieViewControl from MovieView. The first step to integrate
movie view into ViewImage.
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/MovieViewControl.java
6cc6daff9d7cb02805cd9ce71176c7b49655f8a8 10-Jun-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug when surfaceChanged comes after onPause.

b1903651
om/android/camera/Camera.java
c5609c3c7c00fb01344a4064c6428392f06aded8 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3871 into donut

* changes:
Fix 1909891. Allow keep() to be called without open().
5075f53df86f3dcb0a46fd6353057260ad480f43 11-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1909891. Allow keep() to be called without open().
om/android/camera/CameraHolder.java
fa1dfa2f3f1385e98cf8bdac5c48f8d13a400a8a 10-Jun-2009 Wu-cheng Li <wuchengli@google.com> Throw exception if startPreview or setPreviewDisplay fails.
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
f51ec3a8294aa7bf331d9bf21690de23afa86b6f 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3836 into donut

* changes:
Fix issue 1906618.
5fea2317a4ab775c96467d6958b6ed2e1c3c1418 11-Jun-2009 repo sync <raychen@google.com> Fix issue 1906618.
om/android/camera/gallery/BaseImageList.java
b5098fb85b28b02c5ceb515d4dd7ad0c7ae5a947 10-Jun-2009 Chih-Chung Chang <chihchung@google.com> Fix 1820711 Preview ratio is wrong after returning from camera setting.
om/android/camera/Camera.java
cd65be31531717fb032b7423f8d5a77df465cfca 09-Jun-2009 Chih-Chung Chang <chihchung@google.com> Share Camera between Camera and VideoCamera.
om/android/camera/Camera.java
om/android/camera/CameraHolder.java
om/android/camera/CameraSettings.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
7154563350337b36b0cfe386dcc27e6990e919cf 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3410 into donut

* changes:
Move storeImage to worker thread so we can start preview in parallel.
6c28119cb169369f9394d5e4e46bc7f29fc38e46 06-Jun-2009 repo sync <raychen@google.com> Move storeImage to worker thread so we can start preview in parallel.
om/android/camera/Camera.java
f97bf4d85b65f5973cdb9cba2ea7cf55995bdfeb 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3291 into donut

* changes:
Revert the workaround for the buggy driver. The original change is d55a5e92d6065bd36a60925221d8cc9a773572eb.
f0abe5881abfa1662989eb1bd4965be90994e532 09-Jun-2009 Owen Lin <owenlin@google.com> Hide Action Icon panel for MMS images.
om/android/camera/ViewImage.java
1fb8ac4e3e03f31e6e099776d1026b9cadf57610 05-Jun-2009 Chih-Chung Chang <chihchung@google.com> Revert the workaround for the buggy driver.
The original change is d55a5e92d6065bd36a60925221d8cc9a773572eb.
om/android/camera/VideoCamera.java
317fe84be91efd6789caba48d31a53320fbaa99d 06-Jun-2009 Owen Lin <owenlin@google.com> Add correct action icons to ViewImage for video
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
9a6cb73c6eb5f67416587b8065352719ac343038 08-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3393 into donut

* changes:
Use a week reference to trace all the items which are in used. By doing so, we can make sure there are only item of the given key in the system.
edbebe1fae8d677184b47976af69e927fbc48936 05-Jun-2009 Owen Lin <owenlin@google.com> Use a week reference to trace all the items which are in used.
By doing so, we can make sure there are only item of the given key in
the system.
om/android/camera/gallery/LruCache.java
95fc5b2c5b14bb81332570f6d74f75cd63ea04b5 06-Jun-2009 Wu-cheng Li <wuchengli@google.com> Add camera zoom UI.
om/android/camera/Camera.java
e6378074f505cb459f3a945b2ab8a46b09e0906d 06-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3282 into donut

* changes:
Reduce VideoCamera start-up time.
b128446b7ef264c33e91e119391045156a19439b 05-Jun-2009 Wu-cheng Li <wuchengli@google.com> Reduce VideoCamera start-up time.
om/android/camera/VideoCamera.java
11cac263ec966e5a5ac751c53acb851de841c62e 03-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Exposed the camera latency measurement to the test.
Added the camera latency to the StressTest runner.
om/android/camera/Camera.java
7c2eb95660f25619742bf73b51d0c75ac37fe4e9 04-Jun-2009 Owen Lin <owenlin@google.com> Fix bug 1897802 in two parts.

1. Override the getImageIndex in SingleImageList (This is a potential bug)
2. Fallback to the original code if no ImageList is pass over the intent
om/android/camera/ViewImage.java
om/android/camera/gallery/SingleImageList.java
e2950602fffe90b69552b1d270673a839e560513 22-May-2009 Owen Lin <owenlin@google.com> Make the action icons show on Gallery
om/android/camera/ViewImage.java
f271893766a8ade5eea73fc65831f0dd678e3705 04-Jun-2009 Owen Lin <owenlin@google.com> Pass image list from ImageGallery to ViewImage to support the uber type
image list.
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/VideoObject.java
0f9c339253b0fabed60efd731869e68d18893837 29-May-2009 Owen Lin <owenlin@google.com> Make ImageList parcelable so that they can pass by intent.
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
deb57259b0055c08a44cd43933276ccf485dcd2d 27-May-2009 Owen Lin <owenlin@google.com> Fixes some warnings shown in Eclipse.
om/android/camera/Camera.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageManager.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
d6111ce639ceb5a34d21406e253fc5742d8259b7 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2720 into donut

* changes:
Add a new category "Camera medias" to gallery.
fbdbae6005e1720f2108d9bb345196cb87b22572 02-Jun-2009 Wu-cheng Li <wuchengli@google.com> Lock camera before releasing it. Skip keys after pausing.

Fix 1715862, 1882912, 1890705, and 1889929.
om/android/camera/VideoCamera.java
6d1226eeb40b7c55f6f49c7254b0dd3b7e656ef0 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2901 into donut

* changes:
Fix NPE issue 1885257,1879113, and 1888919.
cd34001f2717ed31eb75d749f4dfedb70335252f 01-Jun-2009 repo sync <raychen@google.com> Fix NPE issue 1885257,1879113, and 1888919.
om/android/camera/ImageGallery.java
b653f90f33c6f9e6b48dfab018dece9dd021a476 01-Jun-2009 Chih-Chung Chang <chihchung@google.com> Issue 1860338: Remove the video size check for "share".
So the receiving end applications can queue the video to MediaUploader.
This is basically a revert of perforce CL 137817.
om/android/camera/ActionMenuButton.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
fb8a7fe39b134880bf9c702a4b68b7a14d5ab87b 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2724 into donut

* changes:
Fix the order bug in ImageListUber and add unit test for ImageListUber.
ec34bb218db1f6b3b11716ba53f84184aa35d252 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1283 into donut

* changes:
Simplify the database code by keeping small data in memory.
98334d24526bbbab8c5f33e426173488216c9092 26-May-2009 Chih-Chung Chang <chihchung@google.com> Add picture orientation debug message to help investigate 1877705.

Also clean the code if the orientation is unknown.
om/android/camera/Camera.java
1d5babbd38027256b0241122483c3ec8b63011d1 29-May-2009 Owen Lin <owenlin@google.com> Fix the order bug in ImageListUber and add unit test for ImageListUber.
om/android/camera/gallery/ImageListUber.java
59b09dbbf2ad1b7be7e0391e09943f3a879ac680 29-May-2009 Owen Lin <owenlin@google.com> Add a new category "Camera medias" to gallery.
om/android/camera/GalleryPicker.java
bbc2f2f15a865cf0330cd78a6ea67177c5863b3b 06-May-2009 Owen Lin <owenlin@google.com> Simplify the database code by keeping small data in memory.
om/android/camera/ImageGallery.java
om/android/camera/ImageManager.java
om/android/camera/TimeCounter.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/LruCache.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
aaa50f933dfbc8e2378b6f989704fd0f0bf02a69 27-May-2009 Owen Lin <owenlin@google.com> Fix bug 1873866: removing unused member mShutterButton.
om/android/camera/ViewImage.java
3b63aaa8fcd64b79dfd9f6921df538c313133474 25-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1850846.

Drop the result from a previous request.
om/android/camera/ViewImage.java
059daa36dc6e83ca24a16d9b99925e71010bcceb 19-May-2009 Owen Lin <owenlin@google.com> New UI for donut's camera !!
om/android/camera/Camera.java
om/android/camera/MenuHelper.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
om/android/camera/ViewImage.java
938aad0bd611642c121c4ca28f2d79502aa3cff9 22-May-2009 Chih-Chung Chang <chihchung@google.com> Fix ImageGallery bug 1871294, 1871295, 1871299.

We ignore UI events if we are in the stopped state.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
4f9c7d0bac1e0e9d80878e0028258bb9ff173e61 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2173 into donut

* changes:
Fix bug 1866604: by fixing the output file URI, change it from "file://" to "file:///"
33025344deac60971337533cd1cc58df05e1039f 21-May-2009 Owen Lin <owenlin@google.com> Fix bug 1866604: by fixing the output file URI,
change it from "file://" to "file:///"
om/android/camera/CropImage.java
om/android/camera/Wallpaper.java
e621186e76be9e44e5c981e0219f7b0d69afc3c0 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2169 into donut

* changes:
Fix 1868147 (Image cropping is broken in Gallery) and clean up the code.
605f7e6b6b3d4f2c1421e96423e3c2fa4d02db6b 21-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1868147 (Image cropping is broken in Gallery) and clean up the code.
om/android/camera/ImageGallery.java
cb79ab13392eae4919f4dde5d109d76f78eaab9a 20-May-2009 repo sync <raychen@google.com> Fix Issue 1750544.
om/android/camera/VideoCamera.java
82ded2070a47fff16e1de1c78b516eb25888b91e 20-May-2009 Chih-Chung Chang <chihchung@google.com> Implement 1746508: add duration limit settings to camcorder.
om/android/camera/CameraSettings.java
om/android/camera/VideoCamera.java
acdd1d7d819d17f9690d9bfddb7a9aec9dd2210d 20-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1864421.

Handle the situation that startPreview fails.
om/android/camera/VideoCamera.java
f0666590162507e8b372b32c55dca3835392196a 20-May-2009 Chih-Chung Chang <chihchung@google.com> Fix crash seen in monkey run.

We should not call restartPreview in onPause.
om/android/camera/Camera.java
724e9b3db93677b753c1267a716e30e6cf5ff3b6 19-May-2009 Chih-Chung Chang <chihchung@google.com> Clean CropImage.
om/android/camera/CropImage.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/UriImage.java
4177add422a041ea9f1007c05ff42361bf529d52 15-May-2009 Chih-Chung Chang <chihchung@google.com> Clean BitmapManager.
om/android/camera/BitmapManager.java
om/android/camera/CropImage.java
om/android/camera/Util.java
f1474b0c449d0b6d7620d5e02fd46f78cf0cdc02 15-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1851972. Handle the zero images case in GridViewSpecial.
om/android/camera/GridViewSpecial.java
f6e6d2b5815106c406cdca52eaa75de7c5998be1 14-May-2009 Chih-Chung Chang <chihchung@google.com> Fix problems identified by findbugs fixit.
om/android/camera/BitmapManager.java
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/MiniThumbFile.java
5de4e421e17f1c2ed35fa1ccf8777838e884f66b 14-May-2009 Owen Lin <owenlin@google.com> Disalbe multiselect function
om/android/camera/ImageGallery.java
896182a590fc1bbed5dfb78a74e9a71b30d8f9aa 13-May-2009 Ray Chen <raychen@google.com> remove cancelAllDecodingThreads and allowAllDecodingThreads.
om/android/camera/BitmapManager.java
om/android/camera/CropImage.java
om/android/camera/ImageGallery.java
om/android/camera/ViewImage.java
e43adb123b34432b977f57943c3c42614ccfd985 14-May-2009 Wu-cheng Li <wuchengli@google.com> Delay snapshot related initialization after surfaceChanged.

Reduce start-up time (b1656298) and ANR.
om/android/camera/Camera.java
4952a3f526809e07e1efaad24927a57354ae5aa8 14-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1850842.
om/android/camera/GridViewSpecial.java
3343507109a7e2fd0579719380c358e313f1885f 13-May-2009 Chih-Chung Chang <chihchung@google.com> findbugs fixit.

remove unused variable and code.
om/android/camera/Camera.java
om/android/camera/ExifInterface.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MovieView.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
9a89ef73f7d91180c4f16add7cce53449e3184f5 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1635 into donut

* changes:
Restart preview after recording to avoid the bug in driver.
d55a5e92d6065bd36a60925221d8cc9a773572eb 14-May-2009 Chih-Chung Chang <chihchung@google.com> Restart preview after recording to avoid the bug in driver.
om/android/camera/VideoCamera.java
dd42edfae98465a19aefba49f558e0b43ceca4c4 13-May-2009 Chih-Chung Chang <chihchung@google.com> Tweak to speed up Gallery.
om/android/camera/ImageGallery.java
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImageList.java
77e110b93d904a19d9d454c825688cf1706f2392 13-May-2009 Owen Lin <owenlin@google.com> Fix bug 1707148 by disabling long press if it is not running.
om/android/camera/GridViewSpecial.java
109829cbb69ac526be34510ff37fb1680f5988aa 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1532 into donut

* changes:
Put scrolling position in the valid range.
d16a06161fe9e10ae8f656bca4d4482b235cd172 13-May-2009 Wu-cheng Li <wuchengli@google.com> Remove messages in onPause. Remove onStop.
om/android/camera/Camera.java
56a8643a84a829ba9de36e6b4fb2137f42da5a32 13-May-2009 Chih-Chung Chang <chihchung@google.com> Put scrolling position in the valid range.
om/android/camera/GridViewSpecial.java
dfedc5bad4632e3128af96933883257ea0718d6b 07-May-2009 Chih-Chung Chang <chihchung@google.com> Show the folder icon first, then fill in the thumb bitmaps.
om/android/camera/GalleryPicker.java
4af352aa53952e4c69563aee95c87140bd528f71 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1440 into donut

* changes:
Make ImageLoader load image in order.
bdaaf5ea009b8b652c7a638e6bc94bfc01da921b 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1525 into donut

* changes:
new file: ic_menu_3d_globe.png modified: ../../src/com/android/camera/MenuHelper.java
1e99d7c1ef8a9b2afdeb7b34974c8f587b119338 13-May-2009 Ray Chen <raychen@google.com> new file: ic_menu_3d_globe.png
modified: ../../src/com/android/camera/MenuHelper.java
om/android/camera/MenuHelper.java
341ad98e59d92769e1cc8ba68fa86c72dce0543b 12-May-2009 Chih-Chung Chang <chihchung@google.com> Make ImageLoader load image in order.

Split high and low priority tasks in ImageLoader.
Add adjustPriority function.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
om/android/camera/Util.java
61dda55be77d31382ebcf01745f12bab611a1cda 13-May-2009 Owen Lin <owenlin@google.com> Fix bug 1841837. By updating the zoom controller after zoom in/zoom out.
om/android/camera/ViewImage.java
ac3a8c8ae81482867daa897d5d763e777430de9e 12-May-2009 Wu-cheng Li <wuchengli@google.com> Move things out of surfaceChanged to reduce ANR.
modified: res/layout/video_camera.xml
modified: src/com/android/camera/VideoCamera.java
om/android/camera/VideoCamera.java
4268d70710d4edfcc708032278b4add27fb21862 12-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1351 into donut

* changes:
new file: ../CameraAppUnitTestRunner.java new file: BitmapManagerUnitTest.java modified: ../../../../../../src/com/android/camera/BitmapManager.java
9c61b2c47d2e27b6e39de731af6fe19147cfed68 11-May-2009 Chih-Chung Chang <chihchung@google.com> Remove unused parameters in ImageLoader.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
a3be1aae46a4d5d915187e885c78bd8c600ee7c1 11-May-2009 Chih-Chung Chang <chihchung@google.com> Make GridViewSpecial faster.

Allocate ImageBlock on-demand.
Draw the "gray image" on-demand.
Try to keep the queue of ImageLoader non-empty.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
60550bd901342c7367d18ef19d36c575b6d4dc35 11-May-2009 Ray Chen <raychen@google.com> new file: ../CameraAppUnitTestRunner.java
new file: BitmapManagerUnitTest.java
modified: ../../../../../../src/com/android/camera/BitmapManager.java
om/android/camera/BitmapManager.java
383e1628910068229ba3df34100d99574236603e 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1335 into donut

* changes:
Fix 1826959.
f12972eb92b2121f17c6b957a8092f6cb1461825 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1334 into donut

* changes:
Temporarily change max duration for video recording to 600 minutes for testing.
3d7169c720249b5cc037a7979f56fa3343907fd8 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1126 into donut

* changes:
Fix ClassCastException in Issue 1833558
e842de4a3db05061dbb1116fe735a06d3b7e2c96 09-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1826959.

Need to learn Java.
om/android/camera/ImageManager.java
c0701504237478f810e43012a155b3461b640e54 07-May-2009 Chih-Chung Chang <chihchung@google.com> Temporarily change max duration for video recording to 600 minutes for testing.

(b/1681159)
om/android/camera/VideoCamera.java
d5142de4d6997b05e1e05d85e1f49b7c910b5ae8 07-May-2009 Ray Chen <raychen@google.com> Fix ClassCastException in Issue 1833558
om/android/camera/MenuHelper.java
8463583af0c3a049ab2b691bb3e4a603ee4d812c 07-May-2009 Wu-cheng Li <wuchengli@google.com> Change type of "return-data" type to Boolean.
om/android/camera/ImageGallery.java
f340c78f45cff69d167048744efac533db468565 07-May-2009 Owen Lin <owenlin@google.com> Remove @override for interface's functions
om/android/camera/ImageGallery.java
601ce56b034f111b2875e7636776f2f359f6a156 30-Apr-2009 Owen Lin <owenlin@google.com> Add progress dialog for delete operation and make the close button work
om/android/camera/ImageGallery.java
om/android/camera/PriorityTask.java
om/android/camera/Util.java
36d0da60b1b4ab021303584d76833bdc7da0d517 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1022 into donut

* changes:
One last bit to get rid of the duplicated roation ....
0ce26e03b0b10fc28824518f3e703aa4b1dc02af 06-May-2009 Owen Lin <owenlin@google.com> One last bit to get rid of the duplicated roation ....
om/android/camera/Camera.java
om/android/camera/ViewImage.java
a61075a82bd242205f60ba7b219c8a7df9c8c6e8 07-May-2009 Chih-Chung Chang <chihchung@google.com> Fix 1836309.

Remove all remaining messages in the handler in onStop.
om/android/camera/GalleryPicker.java
ebbf4905eb58be484f9f6c9ee9eb80257cce0b24 06-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 964 into donut

* changes:
Fix bug 1710951. By moving image cleanning code to onStop.
453392c1c0614c0a91faf51e09adaec4a2dc66bd 06-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1060 into donut

* changes:
Reduce GalleryPicker start up time.
eb99d4e1ac070a897b55ecc4da5877883ed549c7 06-May-2009 Chih-Chung Chang <chihchung@google.com> Reduce GalleryPicker start up time.

Push time-consuming operations to a worker thread,
and update the View each time when a image list is found.
om/android/camera/GalleryPicker.java
8edec93f6d0b617c1e51a7aff07aa0a61456d41e 06-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 969 into donut

* changes:
fix bug 1496878
9e0bda23b8889b2149dbf47c8ec2de788a7f2bc9 05-May-2009 Owen Lin <owenlin@google.com> Fix bug 1710951. By moving image cleanning code to onStop.
om/android/camera/ViewImage.java
f32ca41748bb0b84835f2bf851a3ad14b6fd7f72 05-May-2009 Chih-Chung Chang <chihchung@google.com> Fix bug found in stability test.

Implement getRow for UriImage.
om/android/camera/gallery/UriImage.java
0c2f2865622af03ffe42cd75c784d5b0b19fe17e 05-May-2009 Owen Lin <owenlin@google.com> fix bug 1496878
om/android/camera/ImageGallery.java
4904e9713a0118af6321dfe0e77a388fe8c3f45d 04-May-2009 Wu-cheng Li <wuchengli@google.com> Close camera immediately in onPause().

Otherwise, other clients may fail to connect to camera.
om/android/camera/Camera.java
fd6da32fb470ed6159088d83d05c0e33c6bf4c1a 04-May-2009 Chih-Chung Chang <chihchung@google.com> Reduce ViewImage start up time.

On an sdcard with ~800 images, the start up time is reduced by about 1 sec.
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/VideoList.java
b24c0398fbebebd1ae6d6f7ee927db33eea94b6b 04-May-2009 Chih-Chung Chang <chihchung@google.com> Check for device != null before setting brightness.
om/android/camera/Camera.java
f4faf45be7bcf3fcb919b1368fe4c09f733b8b2c 30-Apr-2009 Chih-Chung Chang <chihchung@google.com> Add a TimeCounter for measure time for code fragment.
om/android/camera/TimeCounter.java
3d6c628d8cb0334165b7d49aa5b924b938a0bc4b 30-Apr-2009 Chih-Chung Chang <chihchung@google.com> Cache NinePatch to Bitmap to reduce drawing time.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
58e7c4584fbb4bdd1b3475186ae8eabac3946bce 30-Apr-2009 Ray Chen <raychen@google.com> Fix NPE in Camera onKeyDown event.
om/android/camera/Camera.java
6cff66e1131b4fc385eb4e18afc7a7f8a8898d27 30-Apr-2009 Owen Lin <owenlin@google.com> Fix the last thumbnail problem
om/android/camera/GridViewSpecial.java
0e27f8d394cf9be76b7793dcbca09bca01451370 29-Apr-2009 Owen Lin <owenlin@google.com> Fix the gallery position issues.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
d1173fa1ef599622dae07260e4afe676478fa57e 30-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 515 into donut

* changes:
Improve the design of ICancelable.
41a8578529dedf1e81218d4429954d6ccd9d67af 20-Apr-2009 Owen Lin <owenlin@google.com> Improve the design of ICancelable.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/PriorityTask.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Cancelable.java
om/android/camera/gallery/CanceledException.java
om/android/camera/gallery/ICancelable.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoObject.java
e2482201d5d832005c23efa2d9dc2b10dae4cb68 29-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/BitmapThread.java
om/android/camera/GalleryPicker.java
om/android/camera/GridViewSpecial.java
9d2a11f05460a7608cf62b0d0748951b3d7e79a8 28-Apr-2009 Chih-Chung Chang <chihchung@google.com> Remove unnecessary allowThreadDecoding.
om/android/camera/BitmapThread.java
om/android/camera/CropImage.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
om/android/camera/ViewImage.java
6b270508bdbc78a52a825c2d934465d99fb779f7 29-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/Camera.java
om/android/camera/GalleryPicker.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/PriorityTask.java
om/android/camera/PriorityTaskQueue.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
27576d1b5abbddfc3da7add5a9b9f602d9e9e954 29-Apr-2009 Ray Chen <raychen@google.com> All threads are allowed to decode by default.
om/android/camera/BitmapManager.java
228f1322c6dcbd324ecf1b927db6b9ef10c7868c 24-Apr-2009 Owen Lin <owenlin@google.com> More UI on multiselect. A grayout checkbox for unselected images and a dynamic button pannel shows when user
select some images.
om/android/camera/ImageGallery.java
2716078c6252f926cea467be4202855d491f8cf7 28-Apr-2009 Chih-Chung Chang <chihchung@google.com> Avoid too many progress updates from ImageLoader.
om/android/camera/ImageGallery.java
b03f3bb03dd19163be05a8841ce78af3cb92b88d 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 637 into donut

* changes:
Reduce GalleryPicker start up time.
7b0dca4d5d9ad6ace76cbe2872abe44d469b141f 28-Apr-2009 Chih-Chung Chang <chihchung@google.com> Reduce GalleryPicker start up time.

Cache image list to reduce number of calls to allImages.
This reduces GalleryPicker start up time by about 200ms.
om/android/camera/GalleryPicker.java
ab0bb9724f3274a0a7e477850f94a7ed78cda3d8 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 636 into donut

* changes:
Disable 'acqureResourceLock' and 'releaseResourceLock' in BitmapManager.
e278a8c8e448f91b20a42da7017f693da3387cad 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 577 into donut

* changes:
Add ISO setting. modified: res/values/arrays.xml modified: res/values/strings.xml modified: res/xml/camera_preferences.xml modified: src/com/android/camera/Camera.java modified: src/com/android/camera/CameraSettings.java
2ad5991b4e92250326ea0abd5e93987647fc4de8 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 630 into donut

* changes:
fix issue 1815454
42ed1cc74cd9616ca3141d97182060e1f71c116a 28-Apr-2009 Ray Chen <raychen@google.com> Disable 'acqureResourceLock' and 'releaseResourceLock' in BitmapManager.
om/android/camera/BitmapManager.java
om/android/camera/gallery/BaseImageList.java
73367867c547b78e18c5cab342af3db52d61a54c 27-Apr-2009 Chih-Chung Chang <chihchung@google.com> Optimize allImages() to use ImageListUber only when necessary.
om/android/camera/ImageManager.java
ff9922fb1a15f70ba34f35bc50c5b5ef52c174b2 27-Apr-2009 Chih-Chung Chang <chihchung@google.com> In Gallery, make visible thumbnails appear faster.

Put checkThumbnails and getBitmap to the same thread in ImageLoader,
and only do checkThumbnails when there are no getBitmap requests.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageListUber.java
74c3bd38d4155c694bbb575f389597ee60aec7d3 28-Apr-2009 Owen Lin <owenlin@google.com> fix issue 1815454
om/android/camera/Util.java
48b71ca522b5915b1163d91cd41875878692ab18 26-Apr-2009 Wu-cheng Li <wuchengli@google.com> Add ISO setting.
modified: res/values/arrays.xml
modified: res/values/strings.xml
modified: res/xml/camera_preferences.xml
modified: src/com/android/camera/Camera.java
modified: src/com/android/camera/CameraSettings.java
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
ebd325f9fd8fec33e7961a876c7f5d5934f36411 24-Apr-2009 Chih-Chung Chang <chihchung@google.com> Simplify ImageLoader.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageLoader.java
9576940f3da1e719b9d80bd5b773153679e0f7b3 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 540 into donut

* changes:
Add image routing feature.
0a5a78cd03025885f567b46a437df3209036ba9d 24-Apr-2009 Ray Chen <raychen@google.com> Add image routing feature.
om/android/camera/MenuHelper.java
fa021af9397011cf180003139e80a88902c4b70a 24-Apr-2009 Chih-Chung Chang <chihchung@google.com> Fix bitmap decoding in CropImage.

Call allow decoding function so it can decode bitmaps.
Add log in BitmapManager so we can fix callers which forget to call it.
om/android/camera/BitmapManager.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/Util.java
819fa006a0094f1bd926bbe5a7d4995f15d87ec3 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 538 into donut

* changes:
Rename ImageGallery2 to ImageGallery.
91acb5bf006f665b7b4b03285156668c44e0d664 23-Apr-2009 Ray Chen <raychen@google.com> Rename ImageGallery2 to ImageGallery.
om/android/camera/ImageGallery.java
om/android/camera/ImageGallery2.java
ef033b289a3ee3da5f6350bd7dc38d6cdd4e1e4e 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 412 into donut

* changes:
Issue 1799299: Display picture details.
0f0af52aa851d761521699e423f0c3249b5dc849 22-Apr-2009 Ray Chen <raychen@google.com> Issue 1799299: Display picture details.
om/android/camera/ExifInterface.java
om/android/camera/MenuHelper.java
om/android/camera/gallery/Image.java
6d8ecc2f036922d6a5eb7c5d00d16ea1812c3204 23-Apr-2009 Chih-Chung Chang <chihchung@google.com> Make PhotoAppWidgetConfigure public so it can be invoked by
Home screen -> Widgets -> Picture Frame.
om/android/camera/PhotoAppWidgetConfigure.java
b5d87cf9660067d1826470463948948cd60bde20 22-Apr-2009 Owen Lin <owenlin@google.com> The first step of multiselect. Now, you can multiselect images, but can do nothing.
om/android/camera/GridViewSpecial.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
75ae09f4ee606960fb1740e3ad4b5b46931ef520 23-Apr-2009 Chih-Chung Chang <chihchung@google.com> Make focus rectangle to become green after focused.
om/android/camera/Camera.java
2687ac3dc7764260692223a247b19f9a189ace46 23-Apr-2009 Chih-Chung Chang <chihchung@google.com> Take user to video preview after the video button is clicked in review mode.
BUG=1737969
om/android/camera/VideoCamera.java
845acccf672f6b5f64381859cf932132ceaca0e1 23-Apr-2009 Chih-Chung Chang <chihchung@google.com> Enable hot camera preview.
om/android/camera/VideoCamera.java
5e5aa7e1e8bd03e9919d5f14b9f5df75cf68ff8f 21-Apr-2009 Chih-Chung Chang <chihchung@google.com> The new focus UI.
om/android/camera/Camera.java
f310a3d9ec76ece01801f7bb55a5be8d2d28659a 20-Apr-2009 Owen Lin <owenlin@google.com> Refactor code: decouple ImageGallery2 and GridViewSpecial.
om/android/camera/Camera.java
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery2.java
ecf076b28499c20615c91e9f0f48e26983f43a1b 21-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 354 into donut

* changes:
Add log messages to measure shot-to-shot latency.
bcd13fa071abe75b3275e3bc314601f33e33972a 20-Apr-2009 Wu-cheng Li <wuchengli@google.com> Add log messages to measure shot-to-shot latency.
om/android/camera/Camera.java
b05be85099d2f886882c44791c8a37511f2cc691 20-Apr-2009 Chih-Chung Chang <chihchung@google.com> Make CameraButtonIntentReceiver public so it can be invoked.
Fix bug 1786722 (Camera button should use the existing activity if there is one).
om/android/camera/CameraButtonIntentReceiver.java
6258c6fa96284a719f1ed35e2ce2da1f1eadebc1 20-Apr-2009 Chih-Chung Chang <chihchung@google.com> Make sure button layout look ok in languages other than English (tested on Spanish).
om/android/camera/ActionMenuButton.java
02e2b0b7e9b84e3647816737774f167cf3daf7bd 19-Apr-2009 Chih-Chung Chang <chihchung@google.com> Fix Bug 1797171: Capture Video menu option is missing if try to attach video in messaging.

BUG=1797171
om/android/camera/ImageGallery2.java
a6e21440a229e270fdc1ad5e1c02cb10970e5442 17-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
1153ba1f81e76ac8419c1e84317f56d76cf6be83 17-Apr-2009 Owen Lin <owenlin@google.com> Move GridViewSpecial to a new file. Prepare for refactoring.
om/android/camera/GridViewSpecial.java
om/android/camera/ImageGallery2.java
bbc560b5216bbb2e3028020e426ce6a6e0e5df08 17-Apr-2009 Owen Lin <owenlin@google.com> Code cleanup. Try to remove some depercated usage of cursor.commitUpadtes()
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ExifInterface.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/OnScreenHint.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
c8cd9098d9ca174f5a0374789145faf1f15d503d 17-Apr-2009 Ray Chen <raychen@google.com> Two remaining files for brightness control.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
3333a0c7f7df0156002e09bd7f5bd0d6a717cf93 16-Apr-2009 Chih-Chung Chang <chihchung@google.com> Remove remaining reference to ImageManager.instance().
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
cd74867668f59ac3f1add73a577021f18c15713a 16-Apr-2009 Chih-Chung Chang <chihchung@google.com> Fix valid brightness range before we decide the parameter interface to driver.
om/android/camera/Camera.java
58e94eddd371a9bb7c04936dbeb99615fd1a0c2c 17-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/gallery/MiniThumbFile.java
d30b5877fbdedcebc0af5cccffddccfe9b11cb0b 16-Apr-2009 Owen Lin <owenlin@google.com> Refactoring the code.
om/android/camera/BitmapManager.java
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/UriImage.java
d857d2ae4601129d8f4bde1f9ec2ca06ffa28f43 16-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 214 into donut

* changes:
Move transform to Util.java
79a2a66e46d951c1004b70c97c2a4ea767913bf4 16-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 177 into donut

* changes:
Add brightness control to Camera application.
96b3c6ee6d93c136bb8270521158a989584966b1 16-Apr-2009 Chih-Chung Chang <chihchung@google.com> Move transform to Util.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageLoader.java
om/android/camera/Util.java
c396ca0bd5129bc6ae754ea7366e410c5bac41b0 15-Apr-2009 Ray Chen <raychen@google.com> Add brightness control to Camera application.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
10d42849356a2b2789591196965d09b425b07b40 16-Apr-2009 Chih-Chung Chang <chihchung@google.com> Decode to smaller size so mini-thumb generation is faster.
om/android/camera/gallery/BaseImageList.java
74be0529f993a8284feae5ee8b29e79296e92762 14-Apr-2009 Chih-Chung Chang <chihchung@google.com> Clean verbose logging messages.
Extract UriImage to a separate file.
om/android/camera/ImageGallery2.java
0a475e11e2ceadbaa70308b52e06f4e6d9e56f12 16-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/BitmapThread.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraSettings.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/CanceledException.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
2094670d60f1d8feb70e0e1b7dd70d130ec89886 16-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 208 into donut

* changes:
Code clean up.
0f56ef5704b7f1a0874528367147487c051876d9 15-Apr-2009 Wu-cheng Li <wuchengli@google.com> Add infinity focus mode.
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
1e48aaec1c8bc82fac130698a7fbbba827abf2c7 15-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
8b54dc65d26c58ed7f42475de79454cbcfd609fb 15-Apr-2009 Chih-Chung Chang <chihchung@google.com> Code clean up.
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
c1c20e9ce386c1f660059acaede591d2d718995a 15-Apr-2009 Chih-Chung Chang <chihchung@google.com> Move makeBitmap to Util.
om/android/camera/Util.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
4689e593dc416fe1ec016f5ae1bb2e65bd7cfe0e 15-Apr-2009 Owen Lin <owenlin@google.com> Fix bug 1744766. By setting the file length into DB.
om/android/camera/Camera.java
om/android/camera/ImageManager.java
2b82c4a17abfe926dc2942a6d1bf7982b006de6d 14-Apr-2009 Chih-Chung Chang <chihchung@google.com> Clean verbose logging messages.
Extract UriImage to a separate file.
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/OnScreenHint.java
om/android/camera/Util.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/MiniThumbFile.java
om/android/camera/gallery/SimpleBaseImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/UriImage.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
14c3da178d14d461f93036b3c2471bc6471ae249 14-Apr-2009 Owen Lin <> Merge branch 'readonly-p4-donut' into donut
937fc48b37fafe3ffc8f4b52bd9a171bbb4d3a37 14-Apr-2009 Owen Lin <> AI 146099: 1. Use ICancelable<T> to replace several different interfaces, such as IGetBooleanCancelable.
2. Remove some warnings.

Automated import of CL 146099
om/android/camera/BitmapManager.java
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/DrmWallpaper.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/PhotoAppWidgetConfigure.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/ThumbnailController.java
om/android/camera/Util.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/IAddImageCancelable.java
om/android/camera/gallery/ICancelable.java
om/android/camera/gallery/IGetBitmapCancelable.java
om/android/camera/gallery/IGetBooleanCancelable.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/MiniThumbFile.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/Util.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
89a596bbc4525a3e600ad4624688fde5ec078804 14-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
9d6fbf9660a0c3d289c539e0275272d31b0ef596 14-Apr-2009 Chih-Chung Chang <> AI 146085: Extract mini-thumb handling code to a separate class.

Automated import of CL 146085
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/MiniThumbFile.java
f6330f8ebc985fd4098cb61e3cb1988a74f38afb 14-Apr-2009 Owen Lin <> Merge branch 'readonly-p4-donut' into donut
96f917e4ce07855341d31684c1ba51aad80d9e5a 14-Apr-2009 Owen Lin <> AI 146084: Add a PriorityTask to let cancel/prioritize tasks much easier.
The first unit test for camera is also here.

Automated import of CL 146084
om/android/camera/PriorityTask.java
om/android/camera/PriorityTaskQueue.java
6daf24884c0691f0f8b8c84d8293e649d27db035 13-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
019a6a29ca978e677b8bcad75b9ce3833672bc29 13-Apr-2009 Chih-Chung Chang <> AI 145868: Code clean up.

Automated import of CL 145868
om/android/camera/ImageManager.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SimpleBaseImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
c6b84a41226d54988f2def467e2986fc2d94dbfa 13-Apr-2009 Wu-cheng Li <> Merge branch 'readonly-p4-donut' into donut
e0770004600f76cc4b440104e98e14712b4fd1c6 13-Apr-2009 Wu-cheng Li <> AI 145839: Add UI for JPEG quality setting.
BUG=1761244

Automated import of CL 145839
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
1f51090f270ffd59fc933b2a4d7a1e92f7092578 13-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
73b7a3a18a2e4ab0302c60a486f244acebe64883 13-Apr-2009 Chih-Chung Chang <> AI 145823: Remove unused code.

Automated import of CL 145823
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SimpleBaseImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
6aad95227d814fae94c149851b4419a76aa1d2cc 13-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
7db87ab06d97b8e57df5b10ab2b3dc554ac5eee2 13-Apr-2009 Chih-Chung Chang <> AI 145815: Simplify ViewImage.

Automated import of CL 145815
om/android/camera/CropImage.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/ViewImage.java
e9c6ce7cc0ae4d2b83aa6263c927690d733289b3 13-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
84b4787df0163b621fb06de734f16b02f486ff18 13-Apr-2009 Chih-Chung Chang <> AI 145810: Remove unused SlideShow activity.

Automated import of CL 145810
om/android/camera/SlideShow.java
63a4b2e9a49cbcf7954bab87edc38749c4f16635 10-Apr-2009 Ray Chen <> Merge branch 'readonly-p4-donut' into donut
23c51b794e95c201290e36737f379c4bb8eefeae 10-Apr-2009 Ray Chen <> AI 145700: Style fix.

Automated import of CL 145700
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/ExifInterface.java
om/android/camera/HighlightView.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MovieView.java
om/android/camera/OnScreenHint.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetConfigure.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/SlideShow.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
b84285382796282b1280141ce7b27fe00a0139f0 10-Apr-2009 Ray Chen <> Merge branch 'readonly-p4-donut' into donut
993105a927b1b67ce04cd56a597d3d6742e7c205 10-Apr-2009 Ray Chen <> AI 145696: Utilize BitmapManager to control bitmap related resources, making
decoding cancelable, thus reduce activities switch latency and gallery related ANR.
BUG=1692286

Automated import of CL 145696
om/android/camera/BitmapManager.java
om/android/camera/BitmapThread.java
om/android/camera/CameraThread.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/MenuHelper.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SingleImageList.java
4ea566fe55564c72ddfe148cf611966b053e0fd8 10-Apr-2009 Wu-cheng Li <> Merge branch 'readonly-p4-donut' into donut
9dacf7b214339440c16f3d66e12d6afef1248f68 10-Apr-2009 Wu-cheng Li <> AI 145679: Add picture size settings.
BUG=1761248

Automated import of CL 145679
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
bff6161fc5cd9f0f9f76971ea42b724379e859be 09-Apr-2009 Owen Lin <> Merge branch 'readonly-p4-donut' into donut
0e841fe509c3b61ced7ddf4bee4728b382eae62f 09-Apr-2009 Owen Lin <> AI 145318: Fix style for Camera.java.

Automated import of CL 145318
om/android/camera/Camera.java
65fbfef260b72006bbad6197053ff9abc5c4d4e9 09-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
8f7c4a4f45fa83740a612e33ad87bea48150bcba 09-Apr-2009 Chih-Chung Chang <> AI 145270: Code clean up.

Automated import of CL 145270
om/android/camera/ActionMenuButton.java
om/android/camera/CropImage.java
om/android/camera/HighlightView.java
494c73969870addfc08c2087e637393d74b73301 08-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
233b3b9a01f9ddabf5dd7100d4fdd267263c8651 08-Apr-2009 Chih-Chung Chang <> AI 145049: Fix text padding for action menu button.

Automated import of CL 145049
om/android/camera/ActionMenuButton.java
4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65 08-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
272c3fdc60d4b4f773dfdff46ad3dd643ce22d5c 08-Apr-2009 Chih-Chung Chang <> AI 145048: Code clean up.

Automated import of CL 145048
om/android/camera/CameraSettings.java
om/android/camera/DrmWallpaper.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
6542db336dfec1ab05827cc8da88c2cb0dab525a 08-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
885e55815c304efe199bc220fd8473c69ece1138 08-Apr-2009 Chih-Chung Chang <> AI 145045: Code clean up.

Automated import of CL 145045
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/GalleryPicker.java
om/android/camera/GallerySettings.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/SimpleBaseImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
5a80104487d559ff5ba3cf679773778493879f15 08-Apr-2009 Chih-Chung Chang <> Merge branch 'readonly-p4-donut' into donut
9ae6df03a2d07ef400ec80f60cf14263649bcba1 08-Apr-2009 Chih-Chung Chang <> AI 145029: Style fix.

Automated import of CL 145029
om/android/camera/ImageGallery2.java
om/android/camera/MenuHelper.java
693f415a6653eb6091be69487f03df7c3fda3f40 08-Apr-2009 Ray Chen <> Merge branch 'readonly-p4-donut' into donut
403e82bd940231d26041bff179da98eabaddc60c 08-Apr-2009 Ray Chen <> AI 145007: A centralized control for resource-intensive bitmap decoding.
BUG=1692286

Automated import of CL 145007
om/android/camera/BitmapManager.java
d359d40bc4a06839a68828d5602b72ccd767e0b9 08-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 34 into donut

* changes:
Simple style fix to practice "Super-simple" work flow introduced by jbq.
d8209aa01ae56ea27f551f621b419251bf80b265 07-Apr-2009 Chih-Chung Chang <> AI 144837: Style fix.

Automated import of CL 144837
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/VideoCamera.java
d4247bc43702d5ccda5dde40e948fffd6c4445ee 07-Apr-2009 Ray Chen <raychen@google.com> Simple style fix to practice "Super-simple" work flow introduced by jbq.
om/android/camera/CameraSettings.java
d53513404618b7e28f3d5726e481faeb051c80d9 07-Apr-2009 Wu-cheng Li <> AI 144770: Fix the crash when camera settings are entered during capture.
BUG=1742461,1753515

Automated import of CL 144770
om/android/camera/Camera.java
101d528d59f447847d5c6b7578642132c2b76f4f 04-Apr-2009 Owen Lin <> AI 144530: Refactor the huge codes in ImageManager. Extract member classes to top level.
Fix style issue.

Automated import of CL 144530
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/SelectedImageGetter.java
om/android/camera/SlideShow.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/gallery/BaseCancelable.java
om/android/camera/gallery/BaseImage.java
om/android/camera/gallery/BaseImageList.java
om/android/camera/gallery/CanceledException.java
om/android/camera/gallery/DrmImageList.java
om/android/camera/gallery/IAddImageCancelable.java
om/android/camera/gallery/ICancelable.java
om/android/camera/gallery/IGetBitmapCancelable.java
om/android/camera/gallery/IGetBooleanCancelable.java
om/android/camera/gallery/IImage.java
om/android/camera/gallery/IImageList.java
om/android/camera/gallery/Image.java
om/android/camera/gallery/ImageList.java
om/android/camera/gallery/ImageListUber.java
om/android/camera/gallery/SimpleBaseImage.java
om/android/camera/gallery/SingleImageList.java
om/android/camera/gallery/ThreadSafeOutputStream.java
om/android/camera/gallery/Util.java
om/android/camera/gallery/VideoList.java
om/android/camera/gallery/VideoObject.java
3321d40ad1ad69070478e43c582d9289257cd232 03-Apr-2009 Chih-Chung Chang <> AI 144377: Style fix.

Automated import of CL 144377
om/android/camera/ViewImage.java
a3afed26ea0f7777a6ff78642edbb53a31f5bcdd 02-Apr-2009 Ray Chen <> AI 144215: Remove reference to BitmapDecoder which is in another CL.

Automated import of CL 144215
om/android/camera/CameraThread.java
254590bf04374a225875bbd778c65c9cb96cedb0 02-Apr-2009 Ray Chen <> AI 144214: Style fix.

Automated import of CL 144214
om/android/camera/CameraThread.java
om/android/camera/GalleryPickerItem.java
om/android/camera/ImageLoader.java
2ac0387bbd6792187aeaacf10e40688f4260e316 02-Apr-2009 Wu-cheng Li <> AI 144213: Initial implementation of effect settings.
BUG=1753515

Automated import of CL 144213
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
87341536812081826656040ac81f8f386c6c1407 02-Apr-2009 Wu-cheng Li <> AI 144187: Initial implementation of manual white-balance setting.
BUG=1742461

Automated import of CL 144187
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
063f09da3fe6e7ff3587be07574ab234ecf7048e 01-Apr-2009 Chih-Chung Chang <> AI 143978: Style fix.

Automated import of CL 143978
om/android/camera/ErrorScreen.java
om/android/camera/HighlightView.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/SlideShow.java
om/android/camera/ViewImage.java
b8af1c56debb56bad213e39245c79915c9dfece4 01-Apr-2009 Chih-Chung Chang <> AI 143975: Style fix.

Automated import of CL 143975
om/android/camera/DrmWallpaper.java
om/android/camera/ExifInterface.java
om/android/camera/GallerySettings.java
om/android/camera/MovieView.java
om/android/camera/OnScreenHint.java
om/android/camera/PhotoAppWidgetConfigure.java
5ceee696eb926984228b1c44ff613f64f28b7aaf 01-Apr-2009 Chih-Chung Chang <> AI 143958: Style fix.

Automated import of CL 143958
om/android/camera/ActionMenuButton.java
om/android/camera/ErrorScreen.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/PickWallpaper.java
om/android/camera/VideoPreview.java
0435bac841f165b3bda6e8ef38ce6b5ac6f0f2a5 01-Apr-2009 Chih-Chung Chang <> AI 143951: Style fix.

Automated import of CL 143951
om/android/camera/ShutterButton.java
om/android/camera/ThumbnailController.java
om/android/camera/Wallpaper.java
31817e9f8ce6215307ff0bdc33c28bde2de2f867 28-Mar-2009 Owen Lin <> AI 143178: am: CL 142891 Fix issue 1578783. Show the on screen controlls when user tap on the screen
so that it won't get dissapeared.
Also fix layout issue in camera review mode. The shutter button is misplaced
by 5 pixel in both X, Y coordinate.
Use next/prev buttons to go to next/prev images in all cases. Also set the
height these buttons as screen's height so that it works as same as before.
Original author: owenlin
Merged from: //branches/cupcake/...

Automated import of CL 143178
om/android/camera/ViewImage.java
eb9d8a271a8c16514cc75a0ba1c54cfcf5d311fd 28-Mar-2009 Chih-Chung Chang <> AI 143170: am: CL 142872 Remove the share button if the image is shared from MMS.
This is based on CL 142524.
Original author: chihchung
Merged from: //branches/cupcake/...

Automated import of CL 143170
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
9b2e912a037a44eb19e7186b7a829b94808c09d8 27-Mar-2009 Owen Lin <> AI 143152: am: CL 142832 1. Fix issue 1727303. Detect orientation change in only one place and
make sure the images will be drawn after clean.
2. Also fix an issue that the zoom buttons could be placed in wrong position
after orientation changes.
Original author: owenlin
Merged from: //branches/cupcake/...

Automated import of CL 143152
om/android/camera/ViewImage.java
47bf4ced40df23a26db78fe5aec5dfce98ed797e 25-Mar-2009 Chih-Chung Chang <> Automated import from //branches/donutburger/...@142525,142525
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
095afa19556bf550262e3cccb9edacc04e6f726a 25-Mar-2009 Owen Lin <> Automated import from //branches/donutburger/...@142517,142517
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
11c53782ca0a7be5e033bafdf0be6ac124bde8cb 25-Mar-2009 Dave Sparks <> Automated import from //branches/donutburger/...@142272,142272
om/android/camera/Camera.java
f5e26bbc592503f28933941740c29070fa6222ae 25-Mar-2009 Dave Sparks <> Automated import from //branches/donutburger/...@142121,142121
om/android/camera/Camera.java
72e1dfd3b6ddbd87f281c42b6d31f7f0c3e85aac 25-Mar-2009 Ray Chen <> Automated import from //branches/donutburger/...@141972,141972
om/android/camera/ViewImage.java
c0f54d75e5ca53fc9e3a32b7818a2858b8c81452 25-Mar-2009 Ray Chen <> Automated import from //branches/donutburger/...@141969,141969
om/android/camera/ImageGallery2.java
087497fca0f048f0191cb02e2838819bf210a875 25-Mar-2009 Chih-Chung Chang <> Automated import from //branches/donutburger/...@141961,141961
om/android/camera/Camera.java
3593747655858b7a98ce98129421d6261ef79131 25-Mar-2009 Ray Chen <> Automated import from //branches/donutburger/...@141619,141619
om/android/camera/ViewImage.java
3102f06e1da9e80c05eea6b53c0a8054b9c0fc10 25-Mar-2009 Owen Lin <> Automated import from //branches/donutburger/...@141607,141607
om/android/camera/ViewImage.java
7638a541959f3f371b9998844a0bbef2df4aa3ee 25-Mar-2009 Ray Chen <> Automated import from //branches/donutburger/...@141603,141603
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
66e144311dcc35620990bd5d0ec6528b75a840c4 25-Mar-2009 Jason Sams <> Automated import from //branches/donutburger/...@141469,141469
om/android/camera/Camera.java
314f9a79f1395af71f2c2bb629435bfda07a55ae 25-Mar-2009 Andreas Huber <> Automated import from //branches/donutburger/...@141400,141400
om/android/camera/VideoCamera.java
07c90568c7b0568e6cb75559bd13e5d000ac040f 25-Mar-2009 Owen Lin <> Automated import from //branches/donutburger/...@141143,141143
om/android/camera/Camera.java
om/android/camera/ThumbnailController.java
9bc8d1b47e5bab978cc9571ddfdedc8309a0b65d 25-Mar-2009 Chih-Chung Chang <> Automated import from //branches/donutburger/...@141053,141053
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/ThumbnailController.java
om/android/camera/VideoCamera.java
5ae6532b568d0be90e5b1b53178e7d7927529201 25-Mar-2009 Andreas Huber <> Automated import from //branches/donutburger/...@140831,140831
om/android/camera/ViewImage.java
de365d87520c97d6b1636442e6b5c82a3e036f29 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
om/android/camera/Camera.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
8d0dd0e2ee9a9f8d729ed96597102777cf14701f 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
om/android/camera/ActionMenuButton.java
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
e3f4516c2154539cb5778ef061abf8a0ccf90a5e 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/PhotoAppWidgetBind.java
om/android/camera/PhotoAppWidgetConfigure.java
om/android/camera/PhotoAppWidgetProvider.java
om/android/camera/PhotoGadgetBind.java
om/android/camera/PhotoGadgetConfigure.java
om/android/camera/PhotoGadgetProvider.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
9a379bd668227d3dcea30312025f304fd248f6e3 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
d7e9d1916fbabaecd4be9dacb4472fa3ffe62ed4 06-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136745
om/android/camera/Camera.java
om/android/camera/ViewImage.java
9c9be2eb4a86fc3468dbba1ec5f7bfdb37d22c74 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
om/android/camera/Camera.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
b64d345c9d51cabce43b5191532a0c185d2a70a5 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
om/android/camera/ActionMenuButton.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraSettings.java
om/android/camera/CameraThread.java
om/android/camera/CropImage.java
om/android/camera/DrmWallpaper.java
om/android/camera/ErrorScreen.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/GallerySettings.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/OnScreenHint.java
om/android/camera/PhotoGadgetBind.java
om/android/camera/PhotoGadgetConfigure.java
om/android/camera/PhotoGadgetProvider.java
om/android/camera/PickWallpaper.java
om/android/camera/SelectedImageGetter.java
om/android/camera/ShutterButton.java
om/android/camera/SlideShow.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
becfb351a5bc43050128f44eb1bcfbcc0c6dcb7a 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
om/android/camera/ActionMenuButton.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraSettings.java
om/android/camera/CameraThread.java
om/android/camera/CropImage.java
om/android/camera/DrmWallpaper.java
om/android/camera/ErrorScreen.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/GallerySettings.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/OnScreenHint.java
om/android/camera/PhotoGadgetConfigure.java
om/android/camera/PhotoGadgetProvider.java
om/android/camera/PickWallpaper.java
om/android/camera/SelectedImageGetter.java
om/android/camera/ShutterButton.java
om/android/camera/SlideShow.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
a6aa03f5bd2270bcc52ba1899c22d881955e8e7e 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/PhotoGadgetBind.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
2ec6be554f06b2568eb38f7ea5ba4570b1ecfb8d 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
om/android/camera/Camera.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/PhotoGadgetBind.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
c4ef8241b05b9266de77defcfdf1154f400c77f4 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
om/android/camera/Camera.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/ViewImage.java
d8bccef54d490ce562e61fc907201da0c666314e 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
om/android/camera/Camera.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/OnScreenHint.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
5055ba62e22becc9c8d03898b80cda8ed68cfe80 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/PhotoGadgetConfigure.java
om/android/camera/PhotoGadgetProvider.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
dee42a6e53cb1d0c7194b0cb92028cca353d7c5c 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/SlideShow.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
8250896ab37545f4499da79f54c19af2e5018b80 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/ShutterButton.java
om/android/camera/VideoCamera.java
om/android/camera/Wallpaper.java
33e3e0b3f4f1f54e067bbc54c9b8b5a26660f9f0 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
om/android/camera/Camera.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
9c061072c8f4ec16acf25e0af7ca3d8317d1026f 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
om/android/camera/Camera.java
om/android/camera/CropImage.java
om/android/camera/GalleryPicker.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/VideoCamera.java
b97ccf3f20bee44daf70f10966809e39e30ab4f7 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
om/android/camera/Camera.java
om/android/camera/CameraSettings.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/GallerySettings.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/MenuHelper.java
om/android/camera/VideoCamera.java
om/android/camera/ViewImage.java
om/android/camera/Wallpaper.java
0eaec58e292ce4eaa6baadecf643f0f65e48d278 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
om/android/camera/ActionMenuButton.java
om/android/camera/BufferedInputStream.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraSettings.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/GallerySettings.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/MovieView.java
om/android/camera/PwaUpload.java
om/android/camera/SlideShow.java
om/android/camera/UploadAction.java
om/android/camera/UploadService.java
om/android/camera/VideoCamera.java
om/android/camera/VideoPreview.java
om/android/camera/ViewImage.java
om/android/camera/ViewVideo.java
om/android/camera/YouTubeUpload.java
1d4c75065966c4f6f56900e31f655bfd1b334435 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
om/android/camera/BufferedInputStream.java
om/android/camera/Camera.java
om/android/camera/CameraButtonIntentReceiver.java
om/android/camera/CameraSettings.java
om/android/camera/CameraThread.java
om/android/camera/CropImage.java
om/android/camera/DrmWallpaper.java
om/android/camera/ErrorScreen.java
om/android/camera/ExifInterface.java
om/android/camera/GalleryPicker.java
om/android/camera/GalleryPickerItem.java
om/android/camera/GallerySettings.java
om/android/camera/HighlightView.java
om/android/camera/ImageGallery2.java
om/android/camera/ImageLoader.java
om/android/camera/ImageManager.java
om/android/camera/ImageViewTouchBase.java
om/android/camera/MenuHelper.java
om/android/camera/PickWallpaper.java
om/android/camera/PwaUpload.java
om/android/camera/SelectedImageGetter.java
om/android/camera/SlideShow.java
om/android/camera/UploadAction.java
om/android/camera/UploadService.java
om/android/camera/ViewImage.java
om/android/camera/ViewVideo.java
om/android/camera/Wallpaper.java
om/android/camera/YouTubeUpload.java