• Home
  • History
  • Annotate
  • only in /packages/apps/Camera2/src/com/android/camera/
History log of /packages/apps/Camera2/src/com/android/camera/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f9b2d0c7775b43996a9b9f51c6fc5ab266042c72 05-Dec-2013 Alan Newberger <alann@google.com> Remove TRIM support

Remove the ability to trim a video with the quick menu action.

Bug: 11884080
Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
ameraActivity.java
d75b9aee9a205d6c4d96aa8913131430a0d9a399 30-May-2013 Michael Kolb <kolby@google.com> Fix samsung video recording

Patching Bryce CL into Carlsbad

Bug: 9056573

Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9

Conflicts:
src/com/android/camera/VideoModule.java
ideoModule.java
13350e5e46db241b4f6d1ad3f371ac7292c12e65 24-Jun-2013 Michael Kolb <kolby@google.com> Fix WB indicator override

Patching into Carlsbad from Bryce.

Bug: 9372794

Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
hotoUI.java
0f7d5488d33988c1ee3636fe3a7d6472bed84f00 11-Jul-2013 Michael Kolb <kolby@google.com> Revert fixed focus area in CAF mode

Bug: 9306098

This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.

Cherrypick of Bryce CL into Carlsbad.

Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0

Conflicts:
src/com/android/camera/FocusOverlayManager.java
ocusOverlayManager.java
7993f4521011869a794da69e4d0057fe3b0886c3 12-Jul-2013 Michael Kolb <kolby@google.com> Always set focus mode first before applying scene mode

cherrypick from Bryce branch

Bug: 9577903
Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
hotoModule.java
88f9b3e75c313d181c49ac644930627c40b2138d 27-Nov-2013 Seth Raphael <magicseth@google.com> Reduce logging of flattened Preferences

Bug: 11901390

Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
hotoModule.java
7dc6e97c508125b94fffc15c4a8f0b6c989f396c 20-Nov-2013 Andy Huibers <andyhuibers@google.com> Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.

Bug: 11773268

Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
hotoModule.java
3bf1cda53ebd85152fa9eed3ea8c9652a944df9b 16-Nov-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Clean up placeholders, and add deletion robustness.

Bug: 11708734
Change-Id: I8a017a382f12165be27afbf78e733bcc1fc0ef6f
torage.java
9db4ac802c6f635bdc56c69f20be08e054ba2926 14-Nov-2013 Sascha Haeberling <haeberling@google.com> Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
b7dcf9f20708376dfd14f9db6b41addc2f92e5c6 14-Nov-2013 Sascha Haeberling <haeberling@google.com> Fix issue of focus indicator staying on without being hidden

Bug: 11505806

A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.

Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
i/PieRenderer.java
i/ProgressRenderer.java
fc7b834155f3a15939b0dcfaf7140a9da21b876c 14-Nov-2013 Doris Liu <tianliu@google.com> Ensure view size gets updated after phone decors change.

Bug: 11661906
Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403
i/CameraRootView.java
ff3a994a2f33c493024b82023bfa910686c4d1de 13-Nov-2013 Sascha Haeberling <haeberling@google.com> Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
9c861f7a5a033275729e69116d980ec0a0aacc35 13-Nov-2013 Seth Raphael <magicseth@google.com> Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
54d24c3f82e979b7851e2c0f8b2a4dc69122a7c3 13-Nov-2013 Sascha Haeberling <haeberling@google.com> Show the 100% state of the progress at least one frame.

Bug: 11505806

Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
i/PieRenderer.java
i/ProgressRenderer.java
77775f170a4596421fd566005522f56f82b1c276 12-Nov-2013 Seth Raphael <magicseth@google.com> Add parameters and deduplicate parameter changes

Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
omboPreferences.java
istPreference.java
hotoModule.java
cc70702cc06d98f011f0d9e80b2afa12e6762c8a 12-Nov-2013 Erin Dahlgren <edahlgren@google.com> Revert parallel opening camera in photo mode.

Reverts:
* ag/386409
* ag/386206
* ag/385573

Bug: 11598948
Bug: 11625767
Bug: 11627454
Bug: 11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
hotoModule.java
a7c84bacfd76e5e865655bd5a9b248d64f970af1 12-Nov-2013 Andy Huibers <andyhuibers@google.com> Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
aae09fb1ab292932504233da4be5181ce74db763 12-Nov-2013 ztenghui <ztenghui@google.com> Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
8e64647afd70d6306ab638e25f47623c85b5fac0 12-Nov-2013 ztenghui <ztenghui@google.com> Differentiate the InProgressData from the normal PhotoData.

When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.

bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
ata/CameraDataAdapter.java
249653e41763cffbd9bd5ef2298c5120488897fb 12-Nov-2013 Andy Huibers <andyhuibers@google.com> Close mode menus if another control is touched

Bug: 11598901
Bug: 11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
ameraActivity.java
hotoUI.java
ideoUI.java
baffb73ca83d9d81c379f9f3b9f46cdac7355a0d 11-Nov-2013 Ruben Brunk <rubenbrunk@google.com> Start gcam module directly when handling capture intent.

Bug: 11609971

- Prior behavior for capture intents when in HDR+ mode was
to resume into the PhotoModule and switch to the GcamModule.
Following this change, we resume directly into the GcamModule.

- Fixes the bad lockscreen behavior caused by the sequence:
onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
onPause->onResume, where handler queuing order could get in a
state where the GcamModule onResume is called twice in a row,
resulting in duplicate requests being queued for each capture.

Change-Id: Ibd632d74836224288270f5342e45e523e25ca429
ameraActivity.java
6a42c3ae157c4495db56541ef87f6ee56b5d10b3 09-Nov-2013 ztenghui <ztenghui@google.com> Add a null check to fix NPE

bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
i/FilmStripView.java
cbd8267ee99e457f72822e8d8187b5e6823104f8 05-Nov-2013 Seth Raphael <magicseth@google.com> Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
ameraActivity.java
omboPreferences.java
ocusOverlayManager.java
hotoModule.java
ideAnglePanoramaModule.java
i/FilmStripView.java
til/CameraUtil.java
36d84c1d273faf24c6907e173cf95f233db71592 08-Nov-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
acf9ab7c3ddc976bc9d6239ae54523b9805c876d 08-Nov-2013 Ruben Brunk <rubenbrunk@google.com> Ensure mOpenCameraThread has been setup before dereferencing.

Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
hotoModule.java
2b78c0c048fe906beaeadeee3e267524c808c340 08-Nov-2013 Sascha Haeberling <haeberling@google.com> Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
e0ecc64979a29e5bbdd1084712b231070b1d57bf 07-Nov-2013 Sascha Haeberling <haeberling@google.com> Add GCam progress indicator.

Bug: 11505806

Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
i/PieRenderer.java
i/ProgressRenderer.java
fccf83bd342a3a83dc284525488e69f25e4667c4 06-Nov-2013 Andy Huibers <andyhuibers@google.com> hide preview cover on arrival of new preview data if hidden

Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
hotoUI.java
ideoUI.java
ideAnglePanoramaUI.java
2f878d54ecbb62ef09aa2b0152dea983e598724f 07-Nov-2013 Erin Dahlgren <edahlgren@google.com> Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
c5effbada57112445656bf4929f13f9942afb14c 07-Nov-2013 Erin Dahlgren <edahlgren@google.com> Fix photo mode is getting stuck in a single CameraState.

Bug: 11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
hotoModule.java
05a04924312fbcda2161da01e0749eb80c2663d1 07-Nov-2013 Erin Dahlgren <edahlgren@google.com> Show chooser on EDIT intents that have no activity for action.

Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
ameraActivity.java
7e6e947f0e530c14b32785bdb3094ea473000a12 07-Nov-2013 Erin Dahlgren <edahlgren@google.com> Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
b09b53efcd179d55836014dcd054cff6f7d688d8 06-Nov-2013 Erin Dahlgren <edahlgren@google.com> Parallelize opening the camera with view handling in photo mode.

Bug: 11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
hotoModule.java
hotoUI.java
9070def99369ccdffb1cf5e006ed30646297f490 07-Nov-2013 ztenghui <ztenghui@google.com> Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
17f1e65142df55ebccfa30720cd1265f9ab67e96 06-Nov-2013 ztenghui <ztenghui@google.com> Decouple the visibility check for system UI from action bar

And make sure we toggle system UI when reload.

bug:11539377

Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
ameraActivity.java
eb605b4a27be212915db5bc23e9a82b857036a1c 06-Nov-2013 Sascha Haeberling <haeberling@google.com> Don't crash Photo Sphere on back button press in filmstrip.

Bug: 11554580

Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
urfaceTextureRenderer.java
982542701ef5737456f5ee204684a36620db5475 06-Nov-2013 Erin Dahlgren <edahlgren@google.com> Merge "Make image editor intent general." into gb-ub-photos-carlsbad
404d7eb0029e1dcb94d38b0595fdd84345207b0a 06-Nov-2013 Ruben Brunk <rubenbrunk@google.com> Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4 06-Nov-2013 Doris Liu <tianliu@google.com> Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
c883a30eff16435909471874d2106acbb63eba03 06-Nov-2013 Erin Dahlgren <edahlgren@google.com> Make image editor intent general.

Bug: 11372979
Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
ameraActivity.java
5914783e3f0a1c1c5581361cbf6e0d9ab2cf789d 06-Nov-2013 Ruben Brunk <rubenbrunk@google.com> camera: Ensure camera release for lockscreen transition.

Bug: 11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
hotoModule.java
95405749e5a96ff680b9bcafbfe2bab33c16e1ee 06-Nov-2013 Doris Liu <tianliu@google.com> Make sure preview aspect ratio is updated

Bug: 11509233
Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
hotoModule.java
b0288ec84e06b83923180a04e1b546724fcfd258 04-Nov-2013 Doris Liu <tianliu@google.com> Preserve high resolution image on touch during zoom

Bug: 11477449
Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
i/FilmStripView.java
ba1b30b7793a8a881493a9fc48f27d503db2405b 04-Nov-2013 Sascha Haeberling <haeberling@google.com> Check for media service being present before capture.

Bug: 11508325

Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
hotoModule.java
6ff701f5c8744583a73588f301374ff7e683ff15 31-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
761306fadfa94b538f43e8cf3463bf6d22814947 30-Oct-2013 Alan Newberger <alann@google.com> Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon

CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY
category intent. Since we're using Gallery icon we should go direct to Gallery,
which IntentHelper already does. Simply removed the util class and call the
helper direct from the activity. Also noticed during testing that the SecureCamera
was not correctly showing the Gallery icon, though its behavior would take user
to Gallery. Finally, removing restriction that the video player intent should
go to Gallery, instead it should route to system preferred intent.

Bug: 11065256
Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
ameraActivity.java
til/CameraUtil.java
2a74dfd414217d9a774e0bf95c5991daa5f53e4c 30-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Add generic preview fps range selection.

Bug: 11433097
Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
til/CameraUtil.java
cec75e408a2d451b90bac5f06e10906ffcafff33 30-Oct-2013 Andy Huibers <andyhuibers@google.com> Fix rotation bug for animated thumbnail shown after capture.

Bug: 11420737

Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
hotoUI.java
af714f9ec3264211cb00139ffe0f05d55085ffc2 29-Oct-2013 Doris Liu <tianliu@google.com> Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
e546d48b4acfbf2441b685b2c7d6a4e14241f34b 28-Oct-2013 ztenghui <ztenghui@google.com> Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
cfc148d8373ab69d352c274374ffb34caf4a8d2c 28-Oct-2013 ztenghui <ztenghui@google.com> Fix crash when trying to reopen the camera.

In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.

bug:11258139

Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
ndroidCameraManagerImpl.java
hotoModule.java
36ebcb11b15fb00d3a641499c0f8a16745a2fbb0 28-Oct-2013 Doris Liu <tianliu@google.com> Fix the mapping between preview UI and camera sensor

Bug: 11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
ocusOverlayManager.java
hotoController.java
hotoModule.java
hotoUI.java
til/CameraUtil.java
0a64e00e88514ae07c3514e19126c166dda0ca82 28-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
7cfcafdf8f4a439c8fa87b612616fe409979e8a4 18-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Add placeholder image.

Bug: 11050749

Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
ameraActivity.java
torage.java
ideAnglePanoramaModule.java
pp/AppManagerFactory.java
pp/PlaceholderManager.java
ata/InProgressDataWrapper.java
5250fb28143d45c41673a572b4c5b350e6563eb0 28-Oct-2013 ztenghui <ztenghui@google.com> Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
e1aa59ba7b3a9fb578995ee8ffcd232c11a97842 25-Oct-2013 ztenghui <ztenghui@google.com> Fix memory leak due to inner class for handler.

To keep the existing interface, we just overwrite the handler here.

bug:11336965

Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
ndroidCameraManagerImpl.java
d053a5b2aa8cd9cb09bd40962b305ef34e7d404b 26-Oct-2013 Doris Liu <tianliu@google.com> Update aspect ratio when preview aspect ratio changes

Bug: 11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
hotoModule.java
hotoUI.java
5737b93254f451859c7924792c46354d385da946 25-Oct-2013 Doris Liu <tianliu@google.com> Fix skipped hide review layout calls

Bug: 11338381

Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
ideAnglePanoramaModule.java
65e2389b3de5992c49732d95902e6e742e44821b 21-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
fd7f0a9ffd8e7db21e556b1a60a7602ef5d0fe29 21-Oct-2013 Erin Dahlgren <edahlgren@google.com> Update preview controls on deleting all items.

Bug: 11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
ameraActivity.java
68c1c1e02143e3d2c2dbc658645a3a981f58cdd5 21-Oct-2013 ztenghui <ztenghui@google.com> The initial focus value should be true.

Every time when we enter the wide angel (SRI) module, the preview should be
in focus.

bug:11234723
Change-Id: I218573946609f1e0e4415621a71b96a20775237d
ideAnglePanoramaModule.java
56e44af257d65d730f04d1e90c87f5674abd7f26 16-Oct-2013 ztenghui <ztenghui@google.com> Don't call onCurrentDataChanged for CameraPreview when reloading.

In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.

bug:11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
i/FilmStripView.java
891a80756166a8621f063c727000c9a943cf5465 19-Oct-2013 Doris Liu <tianliu@google.com> Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
209a165bd776c938cad388fcf0b1ed27eef4ed83 19-Oct-2013 Doris Liu <tianliu@google.com> Fix SRI orientation on manta

Bug: 11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
ideAnglePanoramaController.java
ideAnglePanoramaModule.java
ideAnglePanoramaUI.java
464f22013750a416f9fc9a1e32007576d0b655d6 18-Oct-2013 Sascha Haeberling <haeberling@google.com> Don't crash when preview surface could not be set.

Bug: 11021188

Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
ndroidCameraManagerImpl.java
8470cae9049959ee6bb28cde1c53185f2ffd10a1 17-Oct-2013 Doris Liu <tianliu@google.com> Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
f149ec53a0fa3330617ce01751964662d3273c88 17-Oct-2013 ztenghui <ztenghui@google.com> Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
9db9282667d9e272702cd2ee32d7415204084530 17-Oct-2013 ztenghui <ztenghui@google.com> Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
367c7c82a22ec007771059beec4aeff3ef96310e 16-Oct-2013 ztenghui <ztenghui@google.com> Send an message to decouple the gcam module change.

In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.

bug:11252237

Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
hotoModule.java
7bd95307ecdca5c7661bc3fb1765313ceb62e92a 16-Oct-2013 Doris Liu <tianliu@google.com> Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c 16-Oct-2013 Doris Liu <tianliu@google.com> Fix shutter covering pie menu

Bug: 11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
hotoUI.java
i/RotatableLayout.java
til/CameraUtil.java
3a45c33d74fe0ad0ade9be3d037560a53891c627 16-Oct-2013 Doris Liu <tianliu@google.com> Show a preview cover until real preview is ready

Bug: 11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
hotoModule.java
hotoUI.java
ideoModule.java
ideoUI.java
ideAnglePanoramaModule.java
ideAnglePanoramaUI.java
5e82f81a7c7daaf8ac86dbd688b344027f97ff64 15-Oct-2013 Igor Murashkin <iam@google.com> Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
7be0e2b8439d525c70cb062c6616d10c4fc004aa 15-Oct-2013 ztenghui <ztenghui@google.com> Don't allow swipe into the film strip view when swipe is disabled

The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.

bug:11234333
bug:11221594

Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
i/FilmStripView.java
d9b229be6fa942920317fc5e031e803e408adc1d 15-Oct-2013 Igor Murashkin <iam@google.com> gcam: Fix AF spinner not to reset when changing position

Bug: 10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
i/PieRenderer.java
08749a4ed22c5001aa476a9a30df323b00a6df7d 15-Oct-2013 Doris Liu <tianliu@google.com> Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
d3e75bd748ce2be8fdcb30575bbde9bd07536bd3 15-Oct-2013 Igor Murashkin <iam@google.com> Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
b7e90f88c7aa1fb5ce35b17ef98a255c06e8d613 15-Oct-2013 Doris Liu <tianliu@google.com> Dismiss switcher popup when shutter button is clicked

Bug: 11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
hotoUI.java
177c4b05ed8e9f71afc526e5cad339f245563450 15-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
3cb2004b2897129c67181316b7c9f62607858618 15-Oct-2013 Erin Dahlgren <edahlgren@google.com> Do not show any bottom controls in secure camera to prevent launching out of app behavior.

Bug: 11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
i/FilmStripView.java
487200db7f4d73e85ae568221d268b46fad19726 15-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
0e6efbccdb196ef0847e00b23165ed94a77c9f3d 15-Oct-2013 ztenghui <ztenghui@google.com> Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39 15-Oct-2013 Erin Dahlgren <edahlgren@google.com> Prevent crash after deleting album from Gallery by checking for more null pointers.

Bug: 10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
i/FilmStripView.java
2d939fe70e52ba4805c6783b01530c8c1c67fb33 15-Oct-2013 Mangesh Ghiware <mghiware@google.com> Use Gallery intents by default.

Bug: 11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
til/CameraUtil.java
831da6132122d9d9a35183ef832994be659c3740 15-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
ef01a315078587883d3c800d31df6af302b702a9 15-Oct-2013 ztenghui <ztenghui@google.com> NPE fix when we failed to open the camera

At the same time, some error check code never get turned on.
Remove those stale codes and make sure we check the CameraDevice for null
correctly.
We didn't intensively log the error here since they should be logged by
the CameraOpenErrorCallback already.

bug:11215576

Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
ideoModule.java
160b036386b1b60ff3fce9742ce66bfcd54d6430 14-Oct-2013 Igor Murashkin <iam@google.com> CameraUtil: add float clamp function

Bug: 10936156
Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
til/CameraUtil.java
ce75de57dca5398b7786ad7262cb016e5f6b24ee 14-Oct-2013 Doris Liu <tianliu@google.com> Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
3044d8c577432d6e9721fc8b26ac2afbbaf21266 11-Oct-2013 Erin Dahlgren <edahlgren@google.com> Set camera controls visibility based on whether the camera preview is centered.

Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
ameraActivity.java
ameraModule.java
hotoModule.java
hotoUI.java
ideoModule.java
ideoUI.java
ideAnglePanoramaModule.java
ideAnglePanoramaUI.java
i/FilmStripView.java
b27668f0d0a1d5049759a8448e1701e199e05c71 14-Oct-2013 ztenghui <ztenghui@google.com> Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
70bd024ea2019da185de5c999fd50beb0e30215e 14-Oct-2013 ztenghui <ztenghui@google.com> Only delete the Uri coming from onMediaSaved

The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.

bug:11218007

Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
ideoModule.java
352b014552d77948193d84ec177c7673552eb1ee 14-Oct-2013 Doris Liu <tianliu@google.com> Fix SRI upside down preview in reverse landscape and reverse portrait

Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation

Bug: 11216647
Bug: 11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
ideAnglePanoramaModule.java
ideAnglePanoramaUI.java
ae1697302b4ef59bbfebdf1127bc73531ce550b7 14-Oct-2013 Angus Kong <shkong@google.com> Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19 14-Oct-2013 Angus Kong <shkong@google.com> Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
d90d0ffc3e69316b105b6f9d03dc98cd5b40ecbf 14-Oct-2013 Angus Kong <shkong@google.com> Ignore clicks on disabled pie menu items.

bug:11205671

Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
ieController.java
02cafdfb92a2d53b76c2bb180ee5289a80f4f4ac 14-Oct-2013 Angus Kong <shkong@google.com> Workaround to prevent the data focus callback.

bug:11205669

Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
ameraActivity.java
i/FilmStripView.java
i/PieMenuButton.java
c937ab7f9bac633aa425da62348f9eb07c248450 14-Oct-2013 Doris Liu <tianliu@google.com> Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
3068c52499b43b679d2af8018d7f1ab0b1a7e863 13-Oct-2013 Doris Liu <tianliu@google.com> Fix for mis-placed camera controls

Bug: 11205682
Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
i/RotatableLayout.java
2d5c74785d19f1944cab92948a6fa8233086ebc1 13-Oct-2013 Angus Kong <shkong@google.com> Don't load data when it's secure camera.

bug:11063164

Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
ameraActivity.java
f1582c9c075e9cd5790b4bbe1101c94a45ac15d2 13-Oct-2013 Angus Kong <shkong@google.com> Adjust the position after layout change.

bug:10993660

Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
i/FilmStripView.java
a500241084f9e267e5f154b55e7a76a09623e6d8 12-Oct-2013 Doris Liu <tianliu@google.com> Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
86ad8435b60a91fc97abf9d188b1e1af457e4885 12-Oct-2013 Doris Liu <tianliu@google.com> Correct initial orientation of camera controls

Bug: 8878379
Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
i/RotatableLayout.java
275625342769eba3e2b461e249aec83165e4e7f1 12-Oct-2013 ztenghui <ztenghui@google.com> Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
98b2a282a212b74d756c169a445e8d3f6089fb66 12-Oct-2013 ztenghui <ztenghui@google.com> Finish the secure camera activity when user try to play a video.

bug:11190995

Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
til/CameraUtil.java
87d093d6145524b1c8f5c052dfe40c18b52e5235 12-Oct-2013 Doris Liu <tianliu@google.com> Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc 12-Oct-2013 Doris Liu <tianliu@google.com> Bring full screen window flag back to camera

Bug: 11027091
Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
ameraActivity.java
3772d2f48ee5af8516f203f0f0519a2075042d6b 11-Oct-2013 Seth Raphael <magicseth@google.com> restore Usage Statistics

initialize was not being called anywhere.

Bug: 11188914
Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
pp/CameraApp.java
f06221914bf40b6345cacd1a5904d773c6eddcb0 11-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
81ef40bc4923e7014f52f03d8c7ddcf7a4344f70 11-Oct-2013 Angus Kong <shkong@google.com> Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
53aedc0ee671c2d11341a66c444bbb6cdc97b150 11-Oct-2013 Angus Kong <shkong@google.com> Avoid unnecessary bringChildToFront() calls.

bug:10750719

Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
i/FilmStripView.java
d748827206f4fd065b7f083f521c7bb9a78f85a3 11-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Allow debugging postcapture image to be added to mediastore.

Bug: 11010544
Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
hotoModule.java
64cea6aadb912067e31f1a158044c5efeb3e64af 11-Oct-2013 Sascha Haeberling <haeberling@google.com> Don't show a details dialog if there are no details.

Bug: 11021907

Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6
ameraActivity.java
2a959b838d9a20830d15f916a8a698f18582da5c 11-Oct-2013 Sascha Haeberling <haeberling@google.com> Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad
330dafba33f0d75929591095028779f068459431 11-Oct-2013 Sascha Haeberling <haeberling@google.com> Don't initialize photo module if it's paused.

Bug: 11028614

The main visible issue with this is that we register additional
location listeners, thus draining battery as we don't unregister
them ever.

Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
hotoModule.java
36c21ca1365c0c3832742bc0cf75d3409723254b 11-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
d70f0fb68064e170fb2cf041a707ed04d68040f9 04-Oct-2013 Doris Liu <tianliu@google.com> Add fling support in zoom view

Bug: 10679704

Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
i/FilmStripView.java
8c80782326d1cdc764b9a9a791b2c5525e8ef234 11-Oct-2013 Doris Liu <tianliu@google.com> Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
59390061e26d3d481c6e0c9b22fb3ee8ec8387b0 11-Oct-2013 Doris Liu <tianliu@google.com> Remove display change listener for mode switch

Bug: 10928549
Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
hotoModule.java
hotoUI.java
ideoModule.java
ideoUI.java
i/CameraRootView.java
ada31cbe4010e192825b7eb9b7093d4d75cf3558 11-Oct-2013 Sascha Haeberling <haeberling@google.com> Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
62c72ca1b5d0a608d549615928d66e9d1911062f 10-Oct-2013 Erin Dahlgren <edahlgren@google.com> Check both the requestId of current item and total items in filmstrip for bottom controls.

Bug: 11169201
Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
i/FilmStripView.java
4ec139dc81482ebfef1e62a3987c53bd5880c759 10-Oct-2013 Sascha Haeberling <haeberling@google.com> Hide the status bar and switch into lights-out mode when popup is dimissed.

Bug: 11119286

Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
ameraActivity.java
hotoUI.java
ideoUI.java
23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4 10-Oct-2013 Doris Liu <tianliu@google.com> Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
18f20b9f460a8e329dd5af1e035d23931e7e1910 10-Oct-2013 Doris Liu <tianliu@google.com> Workaround for re-applying transform on new surface texuture

Bug: 10981460
Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2
hotoUI.java
d46d6f8e729b0e40878b53763387604a9193385a 10-Oct-2013 ztenghui <ztenghui@google.com> Merge "Fix flash issue" into gb-ub-photos-carlsbad
048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf 07-Oct-2013 Sascha Haeberling <haeberling@google.com> Initialize GCam with GServices values.

Bug: 11103065

Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
ameraActivity.java
ameraSettings.java
i/ModuleSwitcher.java
c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393 10-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
b5eb1ffab6db3f311def4f9b28a189a991396537 10-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
285a5be7ce327eb4c169e60ecc4a9cd8d583e65d 10-Oct-2013 ztenghui <ztenghui@google.com> Fix flash issue

The flash light should show up at the same time as the control show up.
Also, when we change the flash mode, we should update the flash on screen
indicator.

bug:11064667

Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
ideoModule.java
ideoUI.java
714d4d0f6cf3b04b70efd7f9bfc0a29ae03b7964 10-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Fix preview FOV.

Bug: 11150965
Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df
til/CameraUtil.java
716860487554b5e214d355f88effc9b8c316d54e 10-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
39ca527f2647d7af6ae9f326bec1fa627c675989 09-Oct-2013 Erin Dahlgren <edahlgren@google.com> Update bottom edit control for photos inside secure and insecure mode.

Bug: 11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
i/FilmStripView.java
70d24b5b602ae56784d7f7bd6d79af7d37095553 09-Oct-2013 ztenghui <ztenghui@google.com> Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
26862c304a8163016b1f8196c715769750ba1720 09-Oct-2013 Erin Dahlgren <edahlgren@google.com> Update bottom controls and action bar with a tighter bounds on data change.

Bug: 11087361
Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d
ameraActivity.java
i/FilmStripView.java
d217ed0fa931d2a080a159c24e4012697baf5ae3 09-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Add postcapture for gcam debugging.

Bug: 11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
ameraActivity.java
hotoModule.java
638bf9ae74f28ce7b6c0b3e6cbe3d6e09b677138 09-Oct-2013 ztenghui <ztenghui@google.com> Fix another potential issue related to video capture intent.

We don't want to delete the Uri sent from the intent.
When we are in review mode, the mCurrentVideoUri should be from the capture
result.

bug:11136978
Change-Id: I148135326e3516936f7d6463941c6b50dbc389db
ideoModule.java
52beb04d45ff906dfaffb1799a6d93859f1d83bd 09-Oct-2013 ztenghui <ztenghui@google.com> Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
6939d143cb52a012b1b9cd9a141156357367b212 09-Oct-2013 Angus Kong <shkong@google.com> Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
da568b23002859e9672271bb135808303c2e07cb 09-Oct-2013 Angus Kong <shkong@google.com> Make the transition animation identical.

The animation of transition between camera preview and filmstrip should be a
special case to prevent jank.

bug:11011577

Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe
i/FilmStripView.java
6ddd31b9284bbbfcf891766f9d6238bfd5cde721 09-Oct-2013 Angus Kong <shkong@google.com> Enter fullscreen if all items are removed.

bug:11066937

Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
i/FilmStripView.java
b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e 09-Oct-2013 Angus Kong <shkong@google.com> Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad
dfe5b152788b970944078afc7e57f9d8684571c7 09-Oct-2013 ztenghui <ztenghui@google.com> Fix NPE in video intent.

bug:11136978

Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4
ideoModule.java
3179f6a49516833761be5155c4e1244ac0aa17fe 09-Oct-2013 Doris Liu <tianliu@google.com> Allow scaling beyond 1:1 in zoom view

Bug: 10950226
Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
i/FilmStripView.java
i/ZoomView.java
607634cafd9a0b626de8390d855bdabe23a4738b 09-Oct-2013 Doris Liu <tianliu@google.com> Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
f5aa51e6e8da349c8f1a604b431af243cc0802c0 08-Oct-2013 Angus Kong <shkong@google.com> Add shutter click sound in SoundClips.

bug:11135055

Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d
oundClips.java
0fb819b4619cd4ac20f9d381739e444da011d4ed 08-Oct-2013 Angus Kong <shkong@google.com> Don't go into Gcam when it's capture intent.

bug:11115082

Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
ameraActivity.java
ameraSettings.java
hotoModule.java
fe6596c3474f0ffbf03a2b7a7d89ea9cc9d9d61d 08-Oct-2013 Doris Liu <tianliu@google.com> Do not allow navigation to filmstrip during video recording

Bug: 11064867
Change-Id: I168136a193008578b3ad2642cba764650bcc2487
ideoModule.java
ideoUI.java
c502bc9d50ded1f2eec28f4809c7193ec4ec5298 08-Oct-2013 Doris Liu <tianliu@google.com> Correct sample factor for rotated images in zoom view

Bug: 11067085
Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a
i/ZoomView.java
06578b59bf15c1ac35dbbffd979f40479b1cbda9 07-Oct-2013 ztenghui <ztenghui@google.com> Keep the ImageData size info consistent with MediaStore and Exif

Basically, the width and hight in the ImageData will be pre-rotation.

bug:11067085

Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
ata/LocalMediaData.java
ata/RotationTask.java
i/FilmStripView.java
4de788063b51cc2d3f65122bdcc7f862170ba761 07-Oct-2013 Sascha Haeberling <haeberling@google.com> Revert CL that added broadcast receivers for shutter control.

Bug: 11006189

This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589

Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
hotoModule.java
4ab4879eec785faf40ccb346b96963f04af9b0e6 04-Oct-2013 ztenghui <ztenghui@google.com> Don't show the option for Gcam when using front camera.

bug:11051221

Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
ameraSettings.java
b0fbd5437cc67ce10e8f4b2a7318d4cc97110976 04-Oct-2013 Doris Liu <tianliu@google.com> Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
dba16ae7d0aee0c3984df68b5787a0d0a7cd6f50 04-Oct-2013 Doris Liu <tianliu@google.com> Prevent picture taking via volumn key in filmstrip mode

Bug: 11045068
Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
ameraActivity.java
77dd14930b24816369560a73cfb0610c1f745d05 03-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
238799e97077ee72a53a5a04d9d3068aebb82bf7 03-Oct-2013 Sascha Haeberling <haeberling@google.com> Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
5bca6f4cf43732edf459010f418d3719e07f3c8a 03-Oct-2013 Angus Kong <shkong@google.com> Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad
3250987bd014d1c5463b8a39bbe988165ab1cc3f 03-Oct-2013 Angus Kong <shkong@google.com> Don't allow actions on items in progress.

bug:11049529

Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
ameraActivity.java
ata/InProgressDataWrapper.java
ata/LocalData.java
ata/LocalMediaData.java
ata/RotationTask.java
ata/SimpleViewData.java
930b9b41185a2f59c05fe527300248776d3993a0 03-Oct-2013 Doris Liu <tianliu@google.com> Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
9bf0fd606a624138b8c1123d168f06a24c4d20a3 03-Oct-2013 Sascha Haeberling <haeberling@google.com> Change icons and code from HQ to HDR+ mode.

Bug: 11047147

Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
ameraSettings.java
nScreenIndicators.java
hotoMenu.java
hotoModule.java
til/ApiHelper.java
88641ad117189fe1a3440dc82e57312507879bab 03-Oct-2013 Erin Dahlgren <edahlgren@google.com> Make space for photosphere rendering text

Bug: 11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
i/FilmStripView.java
cbdd373181fdd389f02e71a8079e9aab5f11fbad 03-Oct-2013 Doris Liu <tianliu@google.com> Leave ROI not set except in tap-to-focus scenario

Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
ocusOverlayManager.java
hotoModule.java
4c0aede4ea37f8fad98a40ec4d28028f338591bd 03-Oct-2013 ztenghui <ztenghui@google.com> Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
e941cbeeacac11fbae5ae8b06cc1b311e3f6f36d 03-Oct-2013 ztenghui <ztenghui@google.com> Only show delete action when in secure camera mode.

bug:11048260
Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c
ameraActivity.java
30968d0f9a5094d62de1fb023b8bf7dc3202ebaf 02-Oct-2013 Mangesh Ghiware <mghiware@google.com> Exit Camera on Up button if no APP_GALLERY handler found.

Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
ameraActivity.java
cf7babd5cbe69cf99d96e46c306d6733837f48eb 02-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad
45f5976f2c1d4eda46be4ea591c6196c683f2ded 02-Oct-2013 Angus Kong <shkong@google.com> Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
1f36cf1c97faf2b7824bbecd62942456847f0e13 02-Oct-2013 Angus Kong <shkong@google.com> Make scroll animation smoother.

bug:10802703

Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
i/FilmStripView.java
6416ba8a428025c669782a2d3226f06ad5a86921 02-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad
b7a52a4caafd270dbb6aaa41f890a516359e44b8 01-Oct-2013 Erin Dahlgren <edahlgren@google.com> Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

Bug: 10715651
Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
i/FilmStripView.java
1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf 02-Oct-2013 Doris Liu <tianliu@google.com> A workaround for crash in zoom view

Bug: 10636636
Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e
i/ZoomView.java
d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64 01-Oct-2013 Erin Dahlgren <edahlgren@google.com> Fix FilmStrip crash by checking if photos are present before updating action bar

Bug: 11027838
Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a
ameraActivity.java
7fc104e4e75ac881269fd4a093513da01565e5d6 01-Oct-2013 Angus Kong <shkong@google.com> Prevent NPE in gesture handling.

bug:11023769

Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
reviewGestures.java
e2d59dcccf177fdd158949a6b2f741a75d504416 01-Oct-2013 Doris Liu <tianliu@google.com> Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
ad3003bbb275b91d7564568e413400fc187dbcd4 01-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad
a1cb57beb56e17f8d64b82cb1465dcb63cce74b1 01-Oct-2013 Angus Kong <shkong@google.com> Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427 01-Oct-2013 Sascha Haeberling <haeberling@google.com> Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
d42de0adf9ab8d84029856859cb8fbb07eaa96b5 30-Sep-2013 Erin Dahlgren <edahlgren@google.com> Updates newly centered photos in FilmStrip after a delete.

Bug: 10715651

Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a
ameraActivity.java
0156d9179bb9ba8718b25ee05985a7c71e5578c7 01-Oct-2013 Sascha Haeberling <haeberling@google.com> Show status bar in filmstrip mode

Bug: 11005642

Also makes sure we only call setSystemUiVisibility in only one
place.

Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
ameraActivity.java
i/CameraRootView.java
i/FilmStripView.java
4feabff8b87e1b71e8040dbcd6289a313bf9f593 30-Sep-2013 ztenghui <ztenghui@google.com> Fix MediaStore correction code.

This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085.

And this CL make sure we handle rotated image correctly and update the
MediaStore according to the bitmap size.

bug:10988273
Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc
ata/LocalMediaData.java
a5d6b243d3d742cf9dd2ffdac88d386abacd123a 01-Oct-2013 Angus Kong <shkong@google.com> Don't adjust the position while scrolling.

bug:10802703

Change-Id: I493c36b87c99de97275add1243f5ac363a28787e
i/FilmStripView.java
fb344efde20ffab903fae7c6e5a2e1c90b4ef085 30-Sep-2013 Alan Newberger <alann@google.com> Temporary removal of resize code to evaluate GCam image bug

removes LocalMediaData resize code to evaluate black screenshots.

this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF.

Bug: 10988273
Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
ata/LocalMediaData.java
ac5cb2430408f9a1854a4e22e8297733279bf75b 28-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad
b7be228d192cb8f91079caaa2f77a884a40b1160 21-Sep-2013 ztenghui <ztenghui@google.com> Fix incorrect width and height from MediaStore.

bug:10768232

Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
ata/CameraDataAdapter.java
ata/FixedFirstDataAdapter.java
ata/FixedLastDataAdapter.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
21a2e9cb07caba660120b7f5eba6e053a6cb3ac3 27-Sep-2013 Sascha Haeberling <haeberling@google.com> Add basic EXIF to the tiny planet so that rotate succeeds.

Bug: 10861115

Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b
ata/RotationTask.java
inyplanet/TinyPlanetFragment.java
5326f0265206ccd8a2f3424bb983da674b20a31e 27-Sep-2013 Doris Liu <tianliu@google.com> Double tap to full screen from filmstrip

Also fix the first photo going from full screen to filmstrip on single tap

Bug: 10948166
Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75
i/FilmStripView.java
9ba47bf4b755337786bb2bbc810ab69a5772e38f 27-Sep-2013 Angus Kong <shkong@google.com> Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
af41aaa4005d7abcc45ea3c7fb87af098ef49ce8 27-Sep-2013 ztenghui <ztenghui@google.com> Don't update the width and height in MediaStore after rotation

bug:10917681

Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
ata/RotationTask.java
2396e609321f38be61151dd6530d8fd0b0dc2f63 27-Sep-2013 Angus Kong <shkong@google.com> Restore HQ preference in GCam module.

bug:10860305

Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
hotoModule.java
3cde3ece3e6e384f831a02f21c677e292a824df8 27-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
bfd919aff7007f5dc26c74dfb97705c8e23e09b8 27-Sep-2013 Sascha Haeberling <haeberling@google.com> Add orientation information to the details dialog.

Bug: 10649902

Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
ata/LocalMediaData.java
i/DetailsDialog.java
2b86d873ca4fb3a921139633ed7be9959ab452df 27-Sep-2013 Doris Liu <tianliu@google.com> Fix memory leak of context in LocalMediaObserver

Bug: 10728773
Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
ameraActivity.java
ata/LocalMediaObserver.java
667880948de7a051f62359878cb61c1e0a867e24 26-Sep-2013 Seth Raphael <magicseth@google.com> Remove PopupManager to remove a memory leak

PopupManager had been previously refactored out
but vestiges remained. They were causing a memory
leak of Activities in its hash map.

Bug: 10728773
Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
hotoModule.java
ideoModule.java
ideAnglePanoramaModule.java
i/PopupManager.java
67685a78a29a0311043f38f8766a1fbbf881a599 26-Sep-2013 Sascha Haeberling <haeberling@google.com> Add HQ icon indicator support.

Bug: 10785988

Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
nScreenIndicators.java
f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2 26-Sep-2013 Doris Liu <tianliu@google.com> Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
2ba03263340639635120be467f8cabec2889aa08 26-Sep-2013 Doris Liu <tianliu@google.com> Make ROI size 1/8 of longer edge of the image

Bug: 10863323
Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
ocusOverlayManager.java
f2c14330a49abb55f75bfae6b3bae67a0dad115b 26-Sep-2013 Doris Liu <tianliu@google.com> Finalize deletion when app exits and for last photo

Bug: 10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
ameraActivity.java
15ccccf6df50b465514eef85f64393d6f2022e0d 25-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
dfe80098600f092735e9fcb23d8a17b8de23cdef 25-Sep-2013 Sascha Haeberling <haeberling@google.com> Fix the checks for when to remove the HDR/HQ icons from the pie menu.

Bug: 10932511

Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
ameraSettings.java
c9c1504408819bda3fb6b2b264f9dbf6012f9b7f 25-Sep-2013 Angus Kong <shkong@google.com> Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
2dcc0a9dfcc23f090bbe36308f92d72f68c4f0a2 25-Sep-2013 Angus Kong <shkong@google.com> Checks for low storage in wide-angle pano mode.

1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE.
2. Checks for low storage before start preview in wide-angle pano mode.
3. Add low storage warning message for debugging when in wide-angle pano mode.

bug:10691367

Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
ameraActivity.java
hotoModule.java
torage.java
ideoModule.java
ideAnglePanoramaModule.java
0537d4f7abe9e137f626e5cff3fcf252bb04c626 25-Sep-2013 Doris Liu <tianliu@google.com> Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
b3749f2071f866c43ea5f70de219f23157097077 25-Sep-2013 Doris Liu <tianliu@google.com> Increase ROI size to 1/8 of the image width

Bug: 10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
ocusOverlayManager.java
hotoController.java
hotoModule.java
hotoUI.java
be7dc6279dfe17cb93fab8cf88d1115966acb2e0 25-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Fix HQ mode change to allow return to regular photo mode.

Bug: 10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
hotoModule.java
98f38bb04daa3db49a072718cd8b5005b8b73af1 25-Sep-2013 Sascha Haeberling <haeberling@google.com> Add HQ option and use it to switch to GCam.

Bug: 10430748
Bug: 10785988

Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
ameraActivity.java
ameraSettings.java
hotoMenu.java
hotoModule.java
i/ModuleSwitcher.java
til/ApiHelper.java
4601f5d987ad2f57db6b1b65a716f00308e5ae99 25-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Enable gcam as HDR pie menu option.

Bug: 10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e
ameraSettings.java
hotoModule.java
i/ModuleSwitcher.java
4863db01e3629a0a29c718b94445332ef74441e9 24-Sep-2013 Sascha Haeberling <haeberling@google.com> Remove hideybars from Camera.

Bug: 10859173

Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
ameraActivity.java
i/CameraRootView.java
3180ac90af3e63ed7d9b487de5a35ba216d9463f 24-Sep-2013 Doris Liu <tianliu@google.com> Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
105aaf4dd5a381d4c5098fc1d7ace29a3c240c9e 24-Sep-2013 Doris Liu <tianliu@google.com> Fix SRI UX issues and improve UI efficiency

Bug: 10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
ideAnglePanoramaUI.java
c74825b1666857cbfd0ad3750f0d509de8e86953 24-Sep-2013 Angus Kong <shkong@google.com> Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
690dc4722d068a1838b16dc0eabe9c7d518d524c 21-Sep-2013 Angus Kong <shkong@google.com> Allow user to tap on lock icon from secure camera.

bug:10857973

Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
ameraActivity.java
til/CameraUtil.java
8fed926c9f1a3b205165a2f9aad05379c85ececd 24-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
3e058558dc0aaea971d084bf9c72e1cfa0c5ebd9 24-Sep-2013 Sascha Haeberling <haeberling@google.com> Localize the numbers in the time laps popup.

Bug: 10889796

Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
i/TimeIntervalPopup.java
4c478ffe556bff91f9c7574384ab6d482c947627 23-Sep-2013 ztenghui <ztenghui@google.com> Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
16a35206473b5a49821edccea93bbde54c52be49 23-Sep-2013 ztenghui <ztenghui@google.com> Sort and select the preview fps range for still image.

bug:10842868

Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
hotoModule.java
til/CameraUtil.java
b21215a1a59812592380f31891becedbdec7468b 21-Sep-2013 Angus Kong <shkong@google.com> Improve the animation to filmstrip.

1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.

bug:10806298
bug:10864100

Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
ata/CameraPreviewData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
til/CameraUtil.java
aa8744284864cda5570e8dfa4eccc2747cee52dc 19-Sep-2013 Doris Liu <tianliu@google.com> Hide action bar after a timeout

Also make sure:
1) Action bar does not go away when the menu is showing
2) Extend the timeout if user swipe to a new image when action bar is visible
3) Hide action bar immediately when double-tap-to-zoom starts
4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode)

Bug: 10750342
Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
ameraActivity.java
i/FilmStripView.java
i/FilmstripBottomControls.java
cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7 20-Sep-2013 Angus Kong <shkong@google.com> Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
7d2388d96522975307cf5c40f7ac911ad963c44d 19-Sep-2013 Angus Kong <shkong@google.com> Refine Filmstrip gesture/position handling.

bug:10749052
bug:10802996
bug:10711578

Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
i/FilmStripView.java
i/FilmstripBottomControls.java
til/CameraUtil.java
19ab725a5e640a1a20b1a6def083e37d1d1c1e20 19-Sep-2013 nicolasroard <nicolasroard@google.com> Add crop activity

bug:10367125

Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
ameraActivity.java
rop/BoundedRect.java
rop/CropActivity.java
rop/CropDrawingUtils.java
rop/CropExtras.java
rop/CropMath.java
rop/CropObject.java
rop/CropView.java
rop/GeometryMathUtils.java
rop/ImageLoader.java
rop/SaveImage.java
rop/Utils.java
064d6000933354f7bf344a41e0caa7052401c903 06-Sep-2013 ztenghui <ztenghui@google.com> Use contentObserver to refresh the data when dirty.

Handle another setDataSource exception.
Remove the old work around for refreshing after editing.

bug:10390298

Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
ameraActivity.java
ata/LocalMediaData.java
ata/LocalMediaObserver.java
a5682ab08e1d42fe272ec877929478b4adb769f5 19-Sep-2013 Mangesh Ghiware <mghiware@google.com> Bring back NFC beam support to filmstrip

Bug: 10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
ameraActivity.java
til/ApiHelper.java
0374e092eb6fdb33cb6edcb7724601928283dd47 19-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
a9d66bdab247626b31dc182c4d62520b3abffdbd 06-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Adding gcam module to Camera2 app.

Bug: 10430748

Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
ameraActivity.java
ameraHolder.java
ediaSaveService.java
hotoModule.java
i/ModuleSwitcher.java
5df64b0a818d4f85cb14602db725f05b0055c1d9 19-Sep-2013 Mangesh Ghiware <mghiware@google.com> Make Up button in filmstrip go to Gallery.

Bug: 10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
ameraActivity.java
til/ApiHelper.java
638e6f06c877d90b907f66ea9c22b3c6b73c7384 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Clean up ApiHelper and remove unused code paths.

Bug: 10821545

As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.

Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
ndroidCameraManagerImpl.java
ameraActivity.java
ameraManager.java
ameraSettings.java
ffectsRecorder.java
ocusOverlayManager.java
osaicPreviewRenderer.java
hotoModule.java
hotoUI.java
oundClips.java
ideoModule.java
ideoUI.java
i/CameraRootView.java
i/EffectSettingPopup.java
i/FaceView.java
i/ModuleSwitcher.java
i/RotateLayout.java
i/Switch.java
til/ApiHelper.java
til/CameraUtil.java
til/MotionEventHelper.java
4ed20592482d2ab2f3f48ee72d5b1c06bf009034 13-Sep-2013 Sascha Haeberling <haeberling@google.com> Adding Hideybar support for K and up.

Bug: 10723047

Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
ameraActivity.java
i/CameraRootView.java
e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc 18-Sep-2013 ztenghui <ztenghui@google.com> Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
af3a19761034225333685b90206dcdb8e784a1c4 18-Sep-2013 ztenghui <ztenghui@google.com> Delete the captured video if cancel in review.

In capture intent case, video get inserted all the time before review.
So if cancelled in review mode, the captured video should be deleted.

bug:8897671
Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
ideoModule.java
15125661ad968cf4d40989a9bc88d11189beb0b3 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Fall back to Photo module if stores index is illegal.

Bug: 10805249

Change-Id: Iace590af34cf646abf7af74b498520d686c04511
ameraActivity.java
483d25a21058094303b94e44cc67cbd8fecd4bf8 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
4ee4d99cfc519847bd8f84aca9ece5d2b6519536 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
02db77fc8bdcd6aeb1b36217d939bc11355822e6 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Don't crash the app if camera is not available.

Bug: 10747001

Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
ndroidCameraManagerImpl.java
9c0492a606ca48dbc3e56b03051ea9242d952e3e 18-Sep-2013 Doris Liu <tianliu@google.com> Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
8cecf837f8f25418890344a53f7cb3ae44ef0b03 18-Sep-2013 Doris Liu <tianliu@google.com> Fix camera controls rotation for secure camera

Bug: 8878379
Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
i/RotatableLayout.java
c2497d0a7213a3c105ec312f12b0f8b00347d5e5 17-Sep-2013 Angus Kong <shkong@google.com> Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
4f795b878843e59810ec1dca05b7cdb37b5614c5 16-Sep-2013 Angus Kong <shkong@google.com> Show dialog when camera device is not connected.

bug:10726516

Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
ndroidCameraManagerImpl.java
ameraActivity.java
ameraButtonIntentReceiver.java
ameraHolder.java
ameraManager.java
hotoModule.java
ideoModule.java
ideAnglePanoramaModule.java
til/CameraUtil.java
828c9190aafc9b57126f5a4868e5cee922cf9f2c 17-Sep-2013 ztenghui <ztenghui@google.com> Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
05804751ba07c8abcf422f57467d0ed3de95576c 17-Sep-2013 ztenghui <ztenghui@google.com> Use a new Intent to work around issues in framework

Framework didn't update the action provider if reusing the intent object.
The work around is creating new intents here.

bug:10713267

Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
ameraActivity.java
2065e606b68f7e8532317f076c7f688a2093186d 17-Sep-2013 Doris Liu <tianliu@google.com> Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
87fc5e1568f737e03327770cb3dee03c4b939c59 16-Sep-2013 Doris Liu <tianliu@google.com> Fix zoom for images with orientation tag

Bug: 10780042
Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
i/ZoomView.java
5bee41c6d727c730c7b10fba886862284a489257 17-Sep-2013 Angus Kong <shkong@google.com> Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
d028dd4908e68c7d4d0e7438efa74fa2c67e5f2a 14-Sep-2013 Angus Kong <shkong@google.com> Set correct alpha for views in filmstrip.

bug:10713813

Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
i/FilmStripView.java
2f92d309de115b2a41692b93d77fcbffd1260781 16-Sep-2013 Sascha Haeberling <haeberling@google.com> Adding a simple done handler interface.

Bug: 10747001

Needed by http://ag/360619

Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
til/DoneHandler.java
d688c0c31d4287c03b664f6fca5c6498a1e4bd7d 16-Sep-2013 Doris Liu <tianliu@google.com> Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
c29156954bcbf0218a78c308c3ba8f25e00aeecc 16-Sep-2013 Sascha Haeberling <haeberling@google.com> Avoid expensive O(n) main-thread operation when adding Photo Sphere.

Bug: 10747001

Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
ata/CameraDataAdapter.java
ata/LocalDataList.java
79dcb12bbbcb9b3650ace5290897e26451218fe1 16-Sep-2013 Doris Liu <tianliu@google.com> Fix flicker when zooming images smaller than screen

Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
i/FilmStripView.java
44974d4b8014ec1f3c8ef1b9d77aae990bbba821 13-Sep-2013 Angus Kong <shkong@google.com> Don't show menu/indicators in wide-angle mode.

bug:10674078

Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
ideAnglePanoramaUI.java
7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 13-Sep-2013 Sascha Haeberling <haeberling@google.com> Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
a29e0bfcafa292adba7fff2daf0f754627e47137 13-Sep-2013 Angus Kong <shkong@google.com> Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
6100053eea36f0258091ee12be5f72c501209ad0 13-Sep-2013 Sascha Haeberling <haeberling@google.com> Fix potential deadlock while rendering the preview.

Bug: 10748013

Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
inyplanet/TinyPlanetPreview.java
539b9eec067c012d17f482975cf8053e04a11759 13-Sep-2013 Angus Kong <shkong@google.com> Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
a7035394b246b238c19230c92672dbda2ab1f88c 13-Sep-2013 ztenghui <ztenghui@google.com> Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
1e689c254960f0ced0d19d91067cc5ef703dec64 13-Sep-2013 Sascha Haeberling <haeberling@google.com> Fix DeadLock in TinyPlanet.

Bug: 10393598

Now that we acquire the lock inside doInBackground, we need to make
sure to run the AsyncTasks in parallel.

Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
inyplanet/TinyPlanetFragment.java
edbba628dc2e31057b304c6a431f44dbca125891 12-Sep-2013 Angus Kong <shkong@google.com> Avoid flickering after swipe to delete.

bug:10624385

Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
i/FilmStripView.java
a5a08d7642a1fdf961b057cc90e76c4c93103c15 12-Sep-2013 Sascha Haeberling <haeberling@google.com> Bring back tiny planet to the Camera filmstrip

Bug: 10393598

The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.

Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
ameraActivity.java
ediaSaveService.java
inyplanet/TinyPlanetFragment.java
inyplanet/TinyPlanetNative.java
inyplanet/TinyPlanetPreview.java
i/FilmStripView.java
til/XmpUtil.java
368bc8441a76e2193859bfd73121787936a0977d 13-Sep-2013 ztenghui <ztenghui@google.com> Fix crash due to a hole in setDataSource.

setDataSource() somehow throws a RuntimeException instead of
IllegalArgumentException when seeing unsupported video file.

bug:10732664
Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
ata/LocalMediaData.java
742cd5b18e1899bee1d430b61891238c0f3502b6 13-Sep-2013 Doris Liu <tianliu@google.com> Keep undo bar around until there is user interaciton

Bug: 10678578
Bug: 10674009

Also removed the use of withEndAction() call because it was
introduced in API 16, whereas we need to be compatible with
API 14+

Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
ameraActivity.java
i/FilmStripView.java
45f9b06b31666c2b880c24cf32f1ca8b21435422 12-Sep-2013 Angus Kong <shkong@google.com> Always leave full-screen when swip from camera.

bug:10714779

Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
i/FilmStripView.java
a29a0ad0fa7667177025a26d3043cb601ae17a6c 13-Sep-2013 ztenghui <ztenghui@google.com> Merge "When current data is preview, don't show the action bar." into gb-ub-photos-carlsbad
8566dd777cd219254c945240a31ac97de28792a2 12-Sep-2013 ztenghui <ztenghui@google.com> When current data is preview, don't show the action bar.

bug:10678458

Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
ameraActivity.java
i/FilmStripView.java
36e56fba281292255a01ee00b4bee067fa09ab59 12-Sep-2013 Doris Liu <tianliu@google.com> Show captured image rather than frozen preview for capture intent

Bug: 10570887
Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
hotoModule.java
hotoUI.java
7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e 09-Sep-2013 ztenghui <ztenghui@google.com> Fix the flash mode transition in video mode

onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.

bug:10610967

Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
ameraActivity.java
ameraModule.java
hotoModule.java
hotoUI.java
ideoModule.java
ideoUI.java
ideAnglePanoramaModule.java
i/FilmStripView.java
20703f72e087a01e6a589c2875819cf817581a51 11-Sep-2013 Angus Kong <shkong@google.com> Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
5fbe134c3cf1f7c2c82ccef223cab7eb43cd92f1 11-Sep-2013 Angus Kong <shkong@google.com> Flinging back should stop at the first photo first.

bug:10634016

Change-Id: I44e715268b913902a444c977c136d1e0381b3833
i/FilmStripView.java
e1d5ba4fc5470043e8645984e3018b712f5dfcff 10-Sep-2013 Doris Liu <tianliu@google.com> Hide zoom view when going to full screen

Bug: 10654903

Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
i/FilmStripView.java
6aae9177ac432df82971facab214b365e92b4a04 10-Sep-2013 Angus Kong <shkong@google.com> Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
563a289f1aed4dd7bf760959851ff6ad72c7627f 10-Sep-2013 Angus Kong <shkong@google.com> Fix images being off-center in filmstrip.

bug:10609827
bug:10650966

Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
i/FilmStripView.java
e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 10-Sep-2013 Doris Liu <tianliu@google.com> Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
03b75411538c60021799ccc7acc8ed4798253b6d 10-Sep-2013 Doris Liu <tianliu@google.com> Hide zoom view when back is pressed

Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
i/FilmStripView.java
f8b877c2dd4fed2c962c51d619e2548923888525 10-Sep-2013 Sascha Haeberling <haeberling@google.com> Update indicators at the right time to show the correct state.

Bug: 10620907

Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5
ideoModule.java
b7639c641f2ed5d0c60546349c3aa9e90c026878 09-Sep-2013 Sascha Haeberling <haeberling@google.com> Make sure we switch to preview view when resuming.

Bug: 10640328

But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.

Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
ameraActivity.java
ideoModule.java
ata/CameraDataAdapter.java
ata/FixedFirstDataAdapter.java
ata/FixedLastDataAdapter.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
til/CameraUtil.java
08d82bae967db1cc090ab763f072e0410eb4b05e 09-Sep-2013 ztenghui <ztenghui@google.com> Merge "Update the data after edit." into gb-ub-photos-carlsbad
91ff406680b2f3731beb7f82b70b138ccbdffe9c 06-Sep-2013 ztenghui <ztenghui@google.com> Update the data after edit.

bug:10411943

Change-Id: I94804d581470a87f7449a2a249b0b2a27ab640a2
ameraActivity.java
a71946012df0eee8fe4859a22da3c56feba0344e 07-Sep-2013 Angus Kong <shkong@google.com> Disable swipe in capture intent mode.

bug:10606988

Change-Id: Iaf80cdef5b463795b9847f2ab9ab5c70f3f0083c
ameraActivity.java
56ad83f797ab09af240d1f67d63e55dd602160c1 06-Sep-2013 Angus Kong <shkong@google.com> Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
080f868350a0f8c7666f5f5935db1e2b0a75f7f1 06-Sep-2013 Angus Kong <shkong@google.com> Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
17e669d695ef2a38d28d5ba2512937836293e9ca 06-Sep-2013 Angus Kong <shkong@google.com> Improve swipe gesture in filmstrip.

bug:10552605
bug:10645736

Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25
i/FilmStripView.java
5199c2078f3aea06732015ce8ad354c066a2f4ec 06-Sep-2013 Sascha Haeberling <haeberling@google.com> Set the system UI to low profile when we hide the action bar.

Bug: 10633686

Change-Id: I3fca7b608807fd0a510641c7b32724173587c458
ameraActivity.java
ce2b94917098f211cacaaebaa0f6b40021d3e3fa 06-Sep-2013 Angus Kong <shkong@google.com> Respect system auto-rotate setting.

bug:10623244

Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
ameraActivity.java
ideoModule.java
ideAnglePanoramaModule.java
pp/OrientationManager.java
fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc 05-Sep-2013 Doris Liu <tianliu@google.com> Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
564343e34ab0e43e131566bf74a9448d1e982ad7 05-Sep-2013 Doris Liu <tianliu@google.com> Fix black screen in mode switching

Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
i/FilmStripView.java
33bb2d47fa5850c14f7fe42e07ab6f21585efade 05-Sep-2013 Angus Kong <shkong@google.com> Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6 05-Sep-2013 Alan Newberger <alann@google.com> reintroduce action bar hiding for onDataChanged

this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.

Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
ameraActivity.java
33035c19cc47adfb738c20cef66652ae451c8e10 23-Aug-2013 Mangesh Ghiware <mghiware@google.com> Bring back 'share 360 photosphere' to filmstrip

Bug: 10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
ameraActivity.java
i/FilmStripView.java
121022cb590955e37f1264f77190ce4711159976 04-Sep-2013 Doris Liu <tianliu@google.com> Double tap to zoom all the way in and out

Bug: 10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
i/FilmStripGestureRecognizer.java
i/FilmStripView.java
i/ZoomView.java
ed15d1a140986473bbe7fffd72ec9618c41c5979 20-Aug-2013 Angus Kong <shkong@google.com> Bring back wide angle panorama.

bug:10293937

Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
ameraActivity.java
osaic.java
osaicFrameProcessor.java
osaicPreviewRenderer.java
osaicRenderer.java
anoProgressBar.java
anoUtil.java
hotoUI.java
reviewFrameLayout.java
ideoUI.java
ideAnglePanoramaController.java
ideAnglePanoramaModule.java
ideAnglePanoramaUI.java
pp/AppManagerFactory.java
pp/CameraApp.java
pp/OrientationManager.java
pp/OrientationSource.java
i/CameraRootView.java
i/CameraSwitcher.java
i/LayoutChangeHelper.java
i/LayoutChangeNotifier.java
i/LayoutNotifyView.java
i/ModuleSwitcher.java
269c824d720b2e902c4ad6c3bb23422644da1f41 03-Sep-2013 ztenghui <ztenghui@google.com> Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
2c3d9a58d8942f73bc16c71e57584e4d89410185 03-Sep-2013 ztenghui <ztenghui@google.com> Don't show action bar when in camera preview.

There are 3 cases we need to toggle the action bar.
1. Touch in full screen mode. onToggleActionBarVisibility()
2. Swipe back and forth to film stripe from preview. onSwitchMode()
3. In full screen mode, current data becomes the preview.
onCurrentDataChanged()

bug:10563392
Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
ameraActivity.java
fd43e3be3d69f48a97bdd9084e9549f41e963cc2 03-Sep-2013 ztenghui <ztenghui@google.com> Don't show the action bar in the capture intent.

bug:10571262

Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f
ameraActivity.java
0dff7ce1f701816b4a634b612bcaaaae6de0da34 31-Aug-2013 Doris Liu <tianliu@google.com> Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
b2f0968c90a352cca43f508d216c3f28c3d2cc16 31-Aug-2013 Angus Kong <shkong@google.com> Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
93a38d80b202a95cc0336e5cc04dbad92e43253d 31-Aug-2013 Angus Kong <shkong@google.com> Make the preview thumbnail clicable after scaling.

bug:10552110

Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
nimationManager.java
f9ddb6034e560684e4d3ddd460ef9dff345e4e91 31-Aug-2013 Doris Liu <tianliu@google.com> Reset zoom view when user exits app or rotate device

Bug:10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
i/FilmStripView.java
750e73c4a4b04a5695540d3c982774662307b58e 31-Aug-2013 Doris Liu <tianliu@google.com> Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
8d2c6b830131a3d2e6ec7f2f8158b37506403dbd 31-Aug-2013 Angus Kong <shkong@google.com> Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
de84c22cf14f8005002af473f19ff0244d520f6c 31-Aug-2013 Doris Liu <tianliu@google.com> Measure all children to ensure correct layout position

Bug: 10412775
Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
i/CameraControls.java
62a622b22717b454d3de26bb3311536a27492b6e 31-Aug-2013 Angus Kong <shkong@google.com> Skip bitmaps with 0 dimension.

bug:10514553

Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
ata/LocalMediaData.java
5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca 31-Aug-2013 Alan Newberger <alann@google.com> Add back button handlng to CameraActivity.

This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.

Bug: 8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
ameraActivity.java
2581af9b08ac913465303795745c3ce24eb0f20c 30-Aug-2013 Alan Newberger <alann@google.com> Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
3f969c1735e2636bf22dfe44104d0e99924cca97 23-Aug-2013 Alan Newberger <alann@google.com> add up button support for filmstrip

This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.

Bug: 10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
ameraActivity.java
i/FilmStripView.java
1b44336b29d2145eaaf0786be47c08e2b5304bcf 30-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123 30-Aug-2013 Doris Liu <tianliu@google.com> Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
bdd198ee9047fc180b8e97e1c3a76132256fd36c 30-Aug-2013 Doris Liu <tianliu@google.com> Fix gap between camera controls and nav bar

Bug: 10097187
Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
ideoUI.java
c09c5f0328a28ccfe9a0a9b37d028e91a94ded94 30-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
7f47e6ced2f9305296eadd6ad8647ff92890890f 30-Aug-2013 Sascha Haeberling <haeberling@google.com> Fix of memory issues with bitmaps in filmstrip.

Bug: 10495593

We should use the bigger scale factor of the two, and not the smaller.

Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
ata/LocalMediaData.java
f3d3a5c63bd0d88882f0180ac79186c03c644c70 30-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
8de13111cc4e62da3462ea321d18c7951282e0d0 23-Aug-2013 Doris Liu <tianliu@google.com> 1:1 zoom integration

Bug: 10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
ata/LocalData.java
ata/LocalMediaData.java
i/FilmStripView.java
i/ZoomView.java
8890194726507573fd230fba7d4042ed00b363e4 29-Aug-2013 Sascha Haeberling <haeberling@google.com> Disable shutter button while picture is being taken.

Bug: 7328018

Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
hotoModule.java
hotoUI.java
0df03318d36f77aaec11238854921bd45f50c035 29-Aug-2013 Doris Liu <tianliu@google.com> Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
29da2db13029f8896018836693139a05d1139362 28-Aug-2013 Doris Liu <tianliu@google.com> Flip capture thumb when using front facing camera

Bug: 10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
hotoModule.java
hotoUI.java
2654dd9bb6a7d917dab1a48e2182c4f49fe71f11 29-Aug-2013 Sascha Haeberling <haeberling@google.com> Let the Camera app remember which mode it was started in last.

Bug: 7320368

Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
ameraActivity.java
a16e7b50f3148f581439509279f242092e254309 23-Aug-2013 ztenghui <ztenghui@google.com> Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
ameraActivity.java
xif.java
ediaSaveService.java
hotoModule.java
torage.java
ideoModule.java
ata/CameraDataAdapter.java
ata/LocalData.java
ata/LocalMediaData.java
ata/MediaDetails.java
ata/RotationTask.java
ata/SimpleViewData.java
xif/ByteBufferInputStream.java
xif/CountedDataInputStream.java
xif/ExifData.java
xif/ExifInterface.java
xif/ExifInvalidFormatException.java
xif/ExifModifier.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifReader.java
xif/ExifTag.java
xif/IfdData.java
xif/IfdId.java
xif/JpegHeader.java
xif/OrderedDataOutputStream.java
xif/Rational.java
i/FilmStripView.java
09d5983dfbd252fca56ee8368906156e69a9fed0 28-Aug-2013 Tenghui Zhu <ztenghui@google.com> Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
0acda98704a01e20de5af8026875789af1cd56f9 28-Aug-2013 Tenghui Zhu <ztenghui@google.com> Revert "Add rotate support in Film Strip"

This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77.

Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
ameraActivity.java
xif.java
ediaSaveService.java
hotoModule.java
torage.java
ideoModule.java
ata/CameraDataAdapter.java
ata/LocalData.java
ata/LocalMediaData.java
ata/MediaDetails.java
ata/RotationTask.java
ata/SimpleViewData.java
xif/ByteBufferInputStream.java
xif/CountedDataInputStream.java
xif/ExifData.java
xif/ExifInterface.java
xif/ExifInvalidFormatException.java
xif/ExifModifier.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifReader.java
xif/ExifTag.java
xif/IfdData.java
xif/IfdId.java
xif/JpegHeader.java
xif/OrderedDataOutputStream.java
xif/Rational.java
i/FilmStripView.java
80e2e1eca93d1df72420eb6d1b7db88460620b6e 28-Aug-2013 ztenghui <ztenghui@google.com> Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
568ad02f9fd3993abf4b973bdd49a34737267c77 23-Aug-2013 ztenghui <ztenghui@google.com> Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037

Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5
ameraActivity.java
xif.java
ediaSaveService.java
hotoModule.java
torage.java
ideoModule.java
ata/CameraDataAdapter.java
ata/LocalData.java
ata/LocalMediaData.java
ata/MediaDetails.java
ata/RotationTask.java
ata/SimpleViewData.java
xif/ByteBufferInputStream.java
xif/CountedDataInputStream.java
xif/ExifData.java
xif/ExifInterface.java
xif/ExifInvalidFormatException.java
xif/ExifModifier.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifReader.java
xif/ExifTag.java
xif/IfdData.java
xif/IfdId.java
xif/JpegHeader.java
xif/OrderedDataOutputStream.java
xif/Rational.java
i/FilmStripView.java
18d1d26a6da997bc0d9aa4d5688203f36c15377a 27-Aug-2013 Mangesh Ghiware <mghiware@google.com> Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
143eb46b81202601e5454d460ea80a4796ecf43d 27-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
d2219d3023a93ce15725af5009627eb37e982726 27-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove Refocus string and icon

Bug: 10494566

Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
i/CameraSwitcher.java
cd2eeb0efc4370f20e9836e20eb11cb974e3b00d 23-Aug-2013 Mangesh Ghiware <mghiware@google.com> Bring back Share to filmstrip

Bug: 10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
ameraActivity.java
ata/LocalData.java
ata/LocalMediaData.java
3be7f94c1029728a8e236cfcde9c8bce68244095 26-Aug-2013 Sascha Haeberling <haeberling@google.com> Make parsing integers for details dialog more robust.

Bug: 7141309

Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
i/DetailsDialog.java
80af7dd871547d03ee9ff5023cbec00b1d8677ee 23-Aug-2013 Angus Kong <shkong@google.com> Fix full-screen swipe layout.

bug:10428905

Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
i/FilmStripView.java
a2818f58b829f07021d69a36a831dcf339e9258a 23-Aug-2013 Angus Kong <shkong@google.com> Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
653c43be6e58be54cf2ac3c8efb2d65ac20bd03b 22-Aug-2013 Angus Kong <shkong@google.com> Bring back undo delete confirmation.

Also corrects the default decoding size.

bug:10413110
bug:10330214

Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
ameraActivity.java
ata/CameraDataAdapter.java
i/FilmStripView.java
e2fb9943fb2d5a51a651f138d88473bf7f62e0b9 22-Aug-2013 Sascha Haeberling <haeberling@google.com> Proper I18N of the Details dialog, especially for RTL.

Bug: 7141309

Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
ata/LocalMediaData.java
ata/MediaDetails.java
i/DetailsDialog.java
00373f8a411042964f019a6355864a4c25fc2238 22-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
1259bc49d956887477ad6d789668fb61f572b046 22-Aug-2013 Sascha Haeberling <haeberling@google.com> Speed up filmstrip by not decoding with default 3000px.

Bug: 10330214
Bug: 10430152

We need to tell the wrapped data adapters about the size we need. Also,
use a more efficient way to determine the sample size.

Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020
ata/AbstractLocalDataAdapterWrapper.java
ata/LocalMediaData.java
ce2acbcb77225b6d429a23e00f69aadde8c2378b 22-Aug-2013 Doris Liu <tianliu@google.com> Fix preview thumb orientation

Bug: 10428123
Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
hotoModule.java
hotoUI.java
f737ac489200f12b6a48c4d0f7b63c0731eb8713 22-Aug-2013 Angus Kong <shkong@google.com> Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
734598c39e6a9d809982dae2907dc7d10e0b0e9f 22-Aug-2013 Angus Kong <shkong@google.com> Add support to "go-to-next" in film strip.

bug:10328123

Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
ameraActivity.java
hotoUI.java
ideoUI.java
i/FilmStripView.java
56f16746c8b3208e12134fb51843dde988cc79bc 22-Aug-2013 Doris Liu <tianliu@google.com> Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
3973deba115d398a25f0b74c2aea2ff4079355a5 21-Aug-2013 Doris Liu <tianliu@google.com> Fix video capture animation and video snapshot animation

Also removed unused effects recording code

Bug: 10326106
Bug: 10414112
Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
ediaSaveService.java
ideoModule.java
ideoUI.java
15396ca68c47a4ef14e6b23c6cd009d8915f8ea2 22-Aug-2013 Angus Kong <shkong@google.com> Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
aa2a243bdc91b809dbfe01a9933b02e6b95d983f 21-Aug-2013 Angus Kong <shkong@google.com> Fix delete animation in fullscreen mode.

bug:10414539

Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
i/FilmStripView.java
7e374eb0a450ed2689b556ab42a0a88c8f74df2e 21-Aug-2013 Angus Kong <shkong@google.com> Stop the MediaSaveService after unbinding.

bug:10361258

Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
ameraActivity.java
025136bb4639d84b2a5a7b95367fabcc92b86415 21-Aug-2013 Angus Kong <shkong@google.com> Support filmstrip swipe in full-screen.

bug:10341731

Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
i/FilmStripView.java
870253516ce315888ac64e1921285e47154a75e7 21-Aug-2013 Angus Kong <shkong@google.com> Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
304a6360c3b710a4a5781788b887ca479646c86f 21-Aug-2013 Doris Liu <tianliu@google.com> Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
513f1c1e8b7b4249c599a734307e348355439b67 21-Aug-2013 Doris Liu <tianliu@google.com> Fix nav bar overlapping camera bottom UI controls

Bug: 10394750
Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
i/FilmStripView.java
d7e01e25dab83af2fe093d73f8f5f705f1a27305 21-Aug-2013 Doris Liu <tianliu@google.com> Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
6df2d96e6a3d1f20ef04d2a29c9bb15f3002ad15 21-Aug-2013 Doris Liu <tianliu@google.com> Fix video snapshot aspect ratio

Bug: 10312002
Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
ediaSaveService.java
ideoModule.java
8969a67c926608737f3e49f2d2240298372e8416 20-Aug-2013 Angus Kong <shkong@google.com> Update the final PhotoSphere result correctly.

bug:10400557

Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
i/FilmStripView.java
13ca71ebdbb2eb9c492da16262311b1290474f7d 20-Aug-2013 Doris Liu <tianliu@google.com> Fix squished preview

Bug: 10330209
Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
hotoUI.java
0819304bc06ffd3498d9fd0d8a148c50f0903c46 20-Aug-2013 nicolasroard <nicolasroard@google.com> Add "set as" capability in Film Strip

bug:10367174
Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
ameraActivity.java
722c86077d15354ccf0d6e1acf5b6384df5da85f 20-Aug-2013 Sascha Haeberling <haeberling@google.com> Rename accessibility text for Photo Sphere mode from 'new panorama'.

Bug: 10075811

Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
i/CameraSwitcher.java
b269061daf65d090e6836980b57c408f62039841 19-Aug-2013 Angus Kong <shkong@google.com> Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
e857cc90a98e280e2008beb03e2446bd642d2ec4 19-Aug-2013 Angus Kong <shkong@google.com> Implement deletion in the menu.

bug:10367402

Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
ameraActivity.java
b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Add video details to the details menu

Bug: 10330505

Also fix a potential NPE issue and some minor reformatting.

Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2
ata/LocalMediaData.java
ata/MediaDetails.java
e98a59afc89fc97bc619ef8c3aa66781061592f8 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
e5b3ce3da8537b7a6bb971f293a5940f117a7a3f 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Don't refresh item on resume as it leads to a filmstrip bug.

Instead we should listen to the proper events when something is changed
with the media.

Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345
ameraActivity.java
58dfa0fb61e0499fdb108143da90014c463f05a2 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
88ef7664ba6a888fa5da8693091674e152b56192 16-Aug-2013 Sascha Haeberling <haeberling@google.com> Bring back the bottom controls in Filmstrip.

Bug: 10367172
Bug: 10074320

Also hooks up the Edit button and the edit menu item.

Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
ameraActivity.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
i/FilmstripBottomControls.java
0d63b89ef8e5bfbfe2ef1a8d40505d7208052ff8 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Enable switching cameras in video mode.

Bug: 10313018

Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
ideoModule.java
1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f 19-Aug-2013 ztenghui <ztenghui@google.com> Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
c68570335a64be66829727e121afe1622902a74b 16-Aug-2013 Doris Liu <tianliu@google.com> Add image 1:1 support

Bug: 10308195
Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516
i/ZoomView.java
6b9203214d828d72758943aca55adceab684a862 17-Aug-2013 ztenghui <ztenghui@google.com> Add the trim functionality back to FilmStripView

At the same time, disable the mute for now.

bug:10313015

Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5
ameraActivity.java
4ff5a1ab360577c6a7ec953f9197778c84c9d334 15-Aug-2013 Angus Kong <shkong@google.com> Set views in filmstrip invisible when alpha = 0.

bug:10096747

Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
ata/CameraDataAdapter.java
ata/FixedFirstDataAdapter.java
ata/FixedLastDataAdapter.java
ata/LocalData.java
i/FilmStripView.java
394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 16-Aug-2013 Sascha Haeberling <haeberling@google.com> Single-tap in fullscreen view toggles ActionBar.

Bug: 10347286

Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
ameraActivity.java
i/FilmStripView.java
fae11a165e344a38811770c7d348eda214683edc 15-Aug-2013 Sascha Haeberling <haeberling@google.com> Implent show-on-map functionality.
Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.

Bug: 10346208
Bug: 10330505

Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
ameraActivity.java
ata/CameraPreviewData.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
til/CameraUtil.java
29a27c76f2f581cdf5ab5c7e196312f635669420 15-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad
6f64b50db6565bc6454304fd20c0c4020b297bb7 15-Aug-2013 Sascha Haeberling <haeberling@google.com> Brings back the details menu with most EXIF data in it.
Some are still missing and will come back later.

Bug: 10330505

Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
ameraActivity.java
ata/DataUtils.java
ata/LocalData.java
ata/LocalMediaData.java
ata/MediaDetails.java
ata/SimpleViewData.java
i/DetailsDialog.java
fca1c5ece5450914ed49115443e1d45737f2ee40 15-Aug-2013 Dan Aminzade <monzy@google.com> Defining broadcast intent strings as constants in CameraUtil.java.
For now I'm leaving the definition within the Camera application. If
we decide we want to publicize and document these intents as part of
the Android API, we could move the definitions to Camera.java.

Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
hotoModule.java
til/CameraUtil.java
7e1c5fe26bc861d979b85014a511ba35bc1f4110 15-Aug-2013 Angus Kong <shkong@google.com> Single tap to full screen mode.

bug:10308911

Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
i/FilmStripView.java
0689254ef810c502c65852a7c54bf902e975b38a 15-Aug-2013 Angus Kong <shkong@google.com> Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
47721fa8f2dc13cb565ae5629a417dc4ed298e81 15-Aug-2013 Angus Kong <shkong@google.com> Make current view center in filmstrip.

bug:10096746

Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
i/FilmStripView.java
92ae10ec320405d07c85a9e80be40293c65d85e0 13-Aug-2013 Dan Aminzade <monzy@google.com> Add support for remote shutter control via broadcast intents.
Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to
notify Gem to hide and show the camera card, and receive the SHUTTER
broadcast intent to trigger the shutter.
This change resolves b/10185077.

Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
hotoModule.java
0989e394420705b66867a8c1cf273b5904c8e4eb 14-Aug-2013 Angus Kong <shkong@google.com> Handle unexpected exceptions when loading videos.

bug:10313671
bug:9757517

Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
hotoUI.java
ata/LocalMediaData.java
dcccc510652b835fdbd39310a07849af8203052a 09-Aug-2013 Angus Kong <shkong@google.com> Fix camera preview stopped after onResume().

This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
thread.
2. Cleanup unused calls after aparted from gallery.

bug:10189998

Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
ameraActivity.java
hotoController.java
hotoModule.java
hotoUI.java
ideoModule.java
ata/CameraDataAdapter.java
ata/FixedFirstDataAdapter.java
i/FilmStripView.java
1e3353427a04b945bfc6e167e38b63e814329a9f 14-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Don't take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad
e96a4ad86489b86d0ce2f7ce156723f4d9d94dba 14-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Clean up unused code." into gb-ub-photos-carlsbad
0abbdb370b4cd722a739cf65c7b5845ceef535b8 14-Aug-2013 ztenghui <ztenghui@google.com> Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
50df47071c776703a36dbc4cb90ec8d1df3c0f6e 14-Aug-2013 ztenghui <ztenghui@google.com> Hide the actionbar and title at the beginning

bug:10245009

Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
ameraActivity.java
a514b14dd769f67478c3296451bd9cd05676fa5f 14-Aug-2013 Sascha Haeberling <haeberling@google.com> Don't take a snapshot if video recording is not in progress.

Bug:10312841

Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
ideoModule.java
ddef7798808fb8871650a5a803aec1f169a08bcb 13-Aug-2013 Sascha Haeberling <haeberling@google.com> Clean up unused code.

Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
hotoController.java
hotoModule.java
ideoModule.java
02ed1b27b8cd2d0493ed18aea1ce304b6837ef64 14-Aug-2013 ztenghui <ztenghui@google.com> Merge "Add the menu items back" into gb-ub-photos-carlsbad
0353ca2e048543bd6e233b4c2110a1df1070cd3f 13-Aug-2013 ztenghui <ztenghui@google.com> Add the menu items back

bug:10245009

Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
ameraActivity.java
386057407167d69636d441a287e8ebef9708c533 14-Aug-2013 Doris Liu <tianliu@google.com> Check for device support before taking video snapshots

Bug: 9496097
Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
ideoModule.java
57549631449fab8cd4d8dffe730bee4d5c4d8890 13-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove Refocus from Camera UI.

Bug:10073814

Change-Id: I023c7f61463690b02492705cedec8c74159c515d
ameraActivity.java
i/CameraSwitcher.java
0a08b3a280bf7934d362c94a49e43646c9b3bc4f 13-Aug-2013 Doris Liu <tianliu@google.com> Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad
2a7f44cac888de5683d05bef5708f846ee950f43 13-Aug-2013 Doris Liu <tianliu@google.com> Fix video capture intent handling

Bug: 10296343

Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
ameraActivity.java
ideoModule.java
ideoUI.java
c27d21bc3b9322936004827ab005fb7d1facfacf 13-Aug-2013 Angus Kong <shkong@google.com> Add local data types.

We need local data types to generate different menus.

bug:10245009

Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
ata/CameraPreviewData.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
i/FilmStripView.java
d806e6528092fd309bb2128ad5a539c72f52fd42 13-Aug-2013 Angus Kong <shkong@google.com> Don't return null if there's no images to load.

bug:10294250

Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
ata/CameraDataAdapter.java
39685480a9705a949275c4b9cb0cca46c6c3cbc4 12-Aug-2013 Sascha Haeberling <haeberling@google.com> Don't set mImages to null, as we call .size() later.

Bug: 10293573

Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
ata/CameraDataAdapter.java
a0bd080a978fd7e9a67436b412f929c5b3cf8854 12-Aug-2013 ztenghui <ztenghui@google.com> Merge "Add the basic action bar back." into gb-ub-photos-carlsbad
ce0879836ae753cdda3cf45f2b0eb050f27f8258 10-Aug-2013 Angus Kong <shkong@google.com> Merge "Clean up Gallery codes." into gb-ub-photos-carlsbad
fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973 10-Aug-2013 ztenghui <ztenghui@google.com> Add the basic action bar back.

Remove outdated styles.

bug:10245009

Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
ameraActivity.java
b50b5cbfbc0a67db6fc43373363b10381c9c61a3 09-Aug-2013 Angus Kong <shkong@google.com> Clean up Gallery codes.

bug:10263696

Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
ndroidCameraManagerImpl.java
ameraActivity.java
ameraHolder.java
ameraManager.java
ameraScreenNail.java
ameraSettings.java
aptureAnimManager.java
ffectsRecorder.java
ocusOverlayManager.java
istPreference.java
hotoModule.java
hotoUI.java
reviewFrameLayout.java
otateDialogController.java
oundClips.java
taticBitmapScreenNail.java
torage.java
witchAnimManager.java
til.java
ideoModule.java
ideoUI.java
pp/CameraApp.java
pp/OrientationManager.java
pp/OrientationSource.java
ata/LocalMediaData.java
upport/app/OrientationManager.java
upport/app/StitchingChangeListener.java
upport/common/ApiHelper.java
upport/common/Utils.java
upport/filtershow/crop/CropExtras.java
upport/glrenderer/BasicTexture.java
upport/glrenderer/BitmapTexture.java
upport/glrenderer/ExtTexture.java
upport/glrenderer/GLCanvas.java
upport/glrenderer/GLId.java
upport/glrenderer/GLPaint.java
upport/glrenderer/NinePatchChunk.java
upport/glrenderer/NinePatchTexture.java
upport/glrenderer/RawTexture.java
upport/glrenderer/ResourceTexture.java
upport/glrenderer/Texture.java
upport/glrenderer/UploadedTexture.java
upport/ui/BitmapScreenNail.java
upport/ui/OrientationSource.java
upport/ui/ScreenNail.java
upport/ui/SurfaceTextureScreenNail.java
upport/util/AccessibilityUtils.java
upport/util/MotionEventHelper.java
i/CameraRootView.java
i/CameraSwitcher.java
i/EffectSettingPopup.java
i/FaceView.java
i/PreviewSurfaceView.java
i/RotatableLayout.java
i/RotateLayout.java
i/RotateTextToast.java
i/Switch.java
til/AccessibilityUtils.java
til/ApiHelper.java
til/CameraUtil.java
til/MotionEventHelper.java
81c5992f805517b6dd8937d4ff6b11724b23c228 10-Aug-2013 Angus Kong <shkong@google.com> Fix NPE after capture when camera roll is empty.

Use empty array instead of null.

bug:10264304

Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
ata/CameraDataAdapter.java
c3679c0961521165499380c77344acc69072b2ac 09-Aug-2013 Doris Liu <tianliu@google.com> Use PopupWindow for settings popup

Bug:10261902
Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
hotoModule.java
hotoUI.java
ideoModule.java
ideoUI.java
3d0b691b8f7a844093e8de9267ffa2ce16d0c5a9 09-Aug-2013 Angus Kong <shkong@google.com> Fix DataAdapter wrapper classes callback mechanism.

Also to fix FilmStripView to avoid NPE before data is loaded.

Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
ata/FixedFirstDataAdapter.java
i/FilmStripView.java
70466a0f15b91efdfdfd97a718e3d4089666a51c 08-Aug-2013 Angus Kong <shkong@google.com> Merge "Refactor data/LocalData." into gb-ub-photos-carlsbad
eee0d4e9b1c65f86ecbb303b759868ccbf9de597 08-Aug-2013 Sascha Haeberling <haeberling@google.com> Changes required for building GoogleCamera.

Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
pp/CameraApp.java
bd26069d391830856c57c2141cd2efbc8423d871 07-Aug-2013 Angus Kong <shkong@google.com> Refactor data/LocalData.

Make the design more easily understood.

Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
ameraActivity.java
ata/CameraDataAdapter.java
ata/CameraPreviewData.java
ata/LocalData.java
ata/LocalMediaData.java
ata/SimpleViewData.java
764b07e6d5143b09c6f1bdd5504a89b81f7a7e74 07-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove refocus icon if it's not enabled or present.

Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
i/CameraSwitcher.java
37f3611bbdc787c996a99894dcef7d8fb77e3f7c 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This adds the following four CLs to Camera2:

http://ag/339319
http://ag/338974
http://ag/338401
http://ag/324149

Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.

Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
nimationManager.java
ameraActivity.java
mageTaskManager.java
hotoModule.java
hotoUI.java
til.java
ideoModule.java
ideoUI.java
ata/AbstractLocalDataAdapterWrapper.java
ata/CameraDataAdapter.java
ata/FixedFirstDataAdapter.java
ata/FixedLastDataAdapter.java
ata/LocalData.java
ata/LocalDataAdapter.java
i/FilmStripView.java
8e963a5a6016d246184ed65906f9d103e92b17e2 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
ndroidCameraManagerImpl.java
ameraActivity.java
ameraManager.java
ameraPreference.java
ameraScreenNail.java
ameraSettings.java
aptureAnimManager.java
omboPreferences.java
ountDownTimerPreference.java
ffectsRecorder.java
ocusOverlayManager.java
conListPreference.java
istPreference.java
nScreenHint.java
nScreenIndicators.java
hotoMenu.java
hotoModule.java
hotoUI.java
reviewFrameLayout.java
otateDialogController.java
oundClips.java
taticBitmapScreenNail.java
torage.java
witchAnimManager.java
til.java
ideoMenu.java
ideoModule.java
ideoUI.java
pp/CameraApp.java
ata/CameraDataAdapter.java
ata/LocalData.java
ata/PanoramaMetadataLoader.java
upport/app/OrientationManager.java
upport/app/StitchingChangeListener.java
upport/common/ApiHelper.java
upport/common/Utils.java
upport/filtershow/crop/CropExtras.java
upport/glrenderer/BasicTexture.java
upport/glrenderer/BitmapTexture.java
upport/glrenderer/ExtTexture.java
upport/glrenderer/GLCanvas.java
upport/glrenderer/GLId.java
upport/glrenderer/GLPaint.java
upport/glrenderer/NinePatchChunk.java
upport/glrenderer/NinePatchTexture.java
upport/glrenderer/RawTexture.java
upport/glrenderer/ResourceTexture.java
upport/glrenderer/Texture.java
upport/glrenderer/UploadedTexture.java
upport/ui/BitmapScreenNail.java
upport/ui/OrientationSource.java
upport/ui/ScreenNail.java
upport/ui/SurfaceTextureScreenNail.java
upport/util/AccessibilityUtils.java
upport/util/MotionEventHelper.java
i/AbstractSettingPopup.java
i/CameraControls.java
i/CameraRootView.java
i/CameraSwitcher.java
i/CountDownView.java
i/CountdownTimerPopup.java
i/EffectSettingPopup.java
i/FaceView.java
i/FilmStripView.java
i/InLineSettingCheckBox.java
i/InLineSettingItem.java
i/InLineSettingMenu.java
i/ListPrefSettingPopup.java
i/MoreSettingPopup.java
i/PieRenderer.java
i/RotateLayout.java
i/RotateTextToast.java
i/Switch.java
i/TimeIntervalPopup.java
i/ZoomRenderer.java
d475c670423404931e1b7281ac2dcb430490c27b 06-Aug-2013 Angus Kong <shkong@google.com> Load the FilmStrip data in onCreate()

The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.

bug:10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
ameraActivity.java
8e5e4eedb25a4589342660b928935acca4375fc7 30-Jul-2013 Angus Kong <shkong@google.com> Add LocalDataAdapter and wrappers.

1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
- onFullScreen()
- canSwipeInFullScreen()
- getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
- onDataCentered()
- onDataFullScreen()

Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
ameraActivity.java
hotoUI.java
ata/AbstractLocalDataAdapterWrapper.java
ata/CameraDataAdapter.java
ata/CameraPreviewData.java
ata/FixedFirstDataAdapter.java
ata/FixedLastDataAdapter.java
ata/LocalData.java
ata/LocalDataAdapter.java
i/FilmStripView.java
bfed27177046f4b1325bf1bc145ce3bb6b82b1ec 02-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
f1f5186f7d3fd8bf35009d9e65a43914c664d82b 31-Jul-2013 Sascha Haeberling <haeberling@google.com> Adds back the PhotoSphere View icon in filmstrip.

This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:

- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.

Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
ameraActivity.java
ata/CameraDataAdapter.java
ata/LocalData.java
ata/PanoramaMetadataLoader.java
i/FilmStripView.java
bb2848ab2a8d532956f4730c8cf7434eb3a8600f 01-Aug-2013 Angus Kong <shkong@google.com> Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbad
9e76552adff6ecf8b8e4070ecd61699cb6d18269 31-Jul-2013 Angus Kong <shkong@google.com> Add wrapper for face detection listener.

bug:10113532

Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
ndroidCameraManagerImpl.java
ameraManager.java
hotoModule.java
hotoUI.java
3f7e00441f65ebd463a68d4c687589a65980ac5b 31-Jul-2013 Doris Liu <tianliu@google.com> Set default video quality to the highest

Bug: 9886141

Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
ameraSettings.java
ideoModule.java
6d29a648f497f827d623d7af0b679e98ea58bf90 31-Jul-2013 Angus Kong <shkong@google.com> Fix switching camera failure.

bug:10110830

Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
ndroidCameraManagerImpl.java
9ef9925131835743f5316393758c14532c06277d 19-Jul-2013 Angus Kong <shkong@google.com> Refactor CameraManager.

1. CameraManager should be the only class accessing android.hardware.Camera.
2. For potential future upgrade in Camera HAL and android.hardward.Camera API
upgrade, CameraManager should be just an interface instead of concrete
implementation.
3. waitDone() in CameraProxy is removed.
4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are
wrapped by our own interfaces.

Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
ndroidCameraManagerImpl.java
ameraHolder.java
ameraManager.java
ameraManagerFactory.java
ffectsRecorder.java
hotoModule.java
til.java
ideoModule.java
77fb852da18c6ee8ba1f1037f385319eb47bdce6 24-Jul-2013 Sascha Haeberling <haeberling@google.com> Refocus integration phase 1.

Bug: 9966846

Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
ameraActivity.java
i/CameraSwitcher.java
6a8e8a1a0f3e8e62cd350733e275047475380d6b 19-Jul-2013 Angus Kong <shkong@google.com> Remove legacy code ActivityBase.java.

Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
ctivityBase.java
ameraActivity.java
hotoModule.java
6798c34ddb5248f038f351674c6a6c7a20992c8c 17-Jul-2013 Angus Kong <shkong@google.com> Add stitching manager in Camera.

Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
ameraActivity.java
mageTaskManager.java
c40c411683da5db1e393e2172a451c3f9c511811 18-Jul-2013 Angus Kong <shkong@google.com> Refine MediaSaveService to use memory limit.

Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
ediaSaveService.java
395ee2d6d3c8fa9e16363517dc9e8afc8cbd609e 15-Jul-2013 Angus Kong <shkong@google.com> Remove unnecessary startPreview thread in video.

Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
ideoController.java
ideoModule.java
ideoUI.java
1b9362e03c56e98a27879a15b9d133f1e50fc4d4 12-Jul-2013 Doris Liu <tianliu@google.com> Use ValueAnimator to ensure callbacks get called

Bug: 9597743
Change-Id: I6b119bb7a6f8bbba76ccc09c28293eb7b5a0457e
i/PieRenderer.java
b477b42906a3f8b299ddaeede3940e6344fb6825 09-Jul-2013 Angus Kong <shkong@google.com> Measure children after the dimension is determined.

Also, the setMeasuredDimension() in onMeasure() is not necessary as we already
called super.

bug:9680271
Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
i/FilmStripView.java
6a83d528b09c55ade6ad44b82c81d4476ac57441 02-Jul-2013 Doris Liu <tianliu@google.com> Add in carlsbad: Avoid duplicated location popups

Bug: 9505556
Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
hotoController.java
hotoModule.java
hotoUI.java
3b524fa21f72f5f26e3b417b66364d2fbc68850c 26-Jun-2013 Michael Kolb <kolby@google.com> Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
a77d6e06ce32eaaa123922a448173f3d12e6ac9d 26-Jun-2013 Michael Kolb <kolby@google.com> Clean up PreviewGestures

- remove dead code and state
- fix zoom only mode during video recording

Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
reviewGestures.java
ideoUI.java
30e5b372e3f573d9ea339cc9c01657deae36a834 26-Jun-2013 Angus Kong <shkong@google.com> Merge "Add fullscreen mode." into gb-ub-photos-carlsbad
a6a6a730074e9fedd56c41cd8fa8f1212cfac108 19-Jun-2013 Angus Kong <shkong@google.com> Add fullscreen mode.

1. Single tap to center a picture.
2. Double tap to fullscreen
3. In fullscreen, the next picture is on the left but the previous one
is under the current one.

Change-Id: I728da2487ea649162be4f1858a8524331c625157
ata/LocalData.java
i/FilmStripView.java
c285458f6809d43333e3ada8790bddac17912e5a 26-Jun-2013 Angus Kong <shkong@google.com> Fix check of failing decoding boundaries calls

Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
ata/CameraDataAdapter.java
ata/LocalData.java
a6d9b6f18770fd279fa8dca994e5f92719350697 25-Jun-2013 Angus Kong <shkong@google.com> Don't use post-ICS API View.setBackground().

View.setBackground() is API level 16.

Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
ata/LocalData.java
4f5dee37d71532693f756ebf724a7880b0a2ef78 25-Jun-2013 Angus Kong <shkong@google.com> Synchronize camera access in start preview thread.

Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
ideoModule.java
147e26ab7075f0acd3978f0cd0541cd1da4b50e1 25-Jun-2013 Doris Liu <tianliu@google.com> Clean up camera switcher

Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
ameraActivity.java
hotoUI.java
ideoUI.java
i/CameraSwitcher.java
d073915c54e5852e4533c47be287111194e61b2d 21-Jun-2013 Doris Liu <tianliu@google.com> Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
e4ff95562b8692e4a08199a69bbb69ddccf6e904 21-Jun-2013 Doris Liu <tianliu@google.com> Remove SRI panorama

Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
osaic.java
osaicFrameProcessor.java
osaicPreviewRenderer.java
osaicRenderer.java
anoProgressBar.java
anoUtil.java
c2e9abdcb39a9b8070889ff7a7d829b3eda0c51b 19-Jun-2013 Doris Liu <tianliu@google.com> Add flash animation to photo module

Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
hotoModule.java
hotoUI.java
b84b9738c855a525dc1944165983cc3c342ce446 19-Jun-2013 Doris Liu <tianliu@google.com> Set window flags to show secure camera

Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
ameraActivity.java
6432cd65159731a28d9239426b0f0f4d7c44fa98 14-Jun-2013 Doris Liu <tianliu@google.com> Switch over to use new camera activity

Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
ameraActivity.java
ameraModule.java
ewCameraActivity.java
ewCameraModule.java
ewPhotoMenu.java
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoMenu.java
ewVideoModule.java
ewVideoUI.java
anoramaModule.java
hotoMenu.java
hotoModule.java
hotoUI.java
reviewGestures.java
ideoMenu.java
ideoModule.java
ideoUI.java
i/CameraRootView.java
i/FaceView.java
i/NewCameraRootView.java
i/RenderOverlay.java
082210302a595e665ef0e34e9be216e554b13698 14-Jun-2013 Angus Kong <shkong@google.com> Remove files actually.

Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
ewCameraActivity.java
ata/CameraDataAdapter.java
ata/LocalData.java
i/FilmStripView.java
682c7e316d4cae77c934fc3e6859a2f0f279edb7 14-Jun-2013 Doris Liu <tianliu@google.com> Merge "Add callbacks for switching to camera/filmstrip" into gb-ub-photos-carlsbad
a52f04c1ff32b2f529c21b49861a62ad34359e28 06-Jun-2013 Doris Liu <tianliu@google.com> Add callbacks for switching to camera/filmstrip

Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
ewCameraActivity.java
ewCameraModule.java
ewPhotoModule.java
ewPhotoUI.java
ewVideoModule.java
ewVideoUI.java
i/FilmStripView.java
i/NewCameraRootView.java
i/RenderOverlay.java
c1b125df4715f9c6c0862b1ee3b09092cc3a2615 13-Jun-2013 Angus Kong <shkong@google.com> Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbad
a0ab65b489d7c0ba5cbe258be09dfbe36cce2851 13-Jun-2013 Doris Liu <tianliu@google.com> Merge "Update camera orientation when device is flipped" into gb-ub-photos-carlsbad
44ab147ed213bf6a1aa6c62e08c20d7fca03503d 08-Jun-2013 Doris Liu <tianliu@google.com> Update camera orientation when device is flipped

Bug: 8963053
Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
ewPhotoModule.java
ewPhotoUI.java
ewVideoModule.java
ewVideoUI.java
hotoController.java
hotoModule.java
ideoController.java
ideoModule.java
i/CameraControls.java
i/NewCameraRootView.java
i/RotatableLayout.java
77f1615264a5641b58e037156f25ad1b30527ef5 06-Jun-2013 Angus Kong <shkong@google.com> Refactor to separate out EGL part.

Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
osaicPreviewRenderer.java
ewCameraActivity.java
urfaceTextureRenderer.java
b81204ad0ccd2f16805b0fd5277be73fc6e8d31f 12-Jun-2013 Doris Liu <tianliu@google.com> In carlesbad, fix image capture on S4

Bug: 9390020
Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
ewPhotoModule.java
5791e2fbe36756806339182fcde4ce058ec1d203 12-Jun-2013 Doris Liu <tianliu@google.com> Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
e991ac8d67ffa09ee285e72ad275d32475de2ded 11-Jun-2013 Doris Liu <tianliu@google.com> Disable zoom when camera does not support zoom

Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoModule.java
ewVideoUI.java
c76547793270371785f9b928e173e1dbc238ef37 11-Jun-2013 Angus Kong <shkong@google.com> Fix build.

Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
ewPhotoModule.java
d82eae2bc5628ee3d0db039076298c93179e7aad 11-Jun-2013 Angus Kong <shkong@google.com> Use setPreviewFpsRange instead.

Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
ewPhotoModule.java
ewVideoModule.java
til.java
f7758b6cc5ab00ad3955bf9c98af76559644a477 07-Jun-2013 Doris Liu <tianliu@google.com> Add enable/disable swiping to filmstrip

Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
ewCameraActivity.java
ewPhotoModule.java
ewPhotoUI.java
ewVideoModule.java
ewVideoUI.java
ata/CameraDataAdapter.java
i/FilmStripView.java
b7d13430b030f7d46ed3335d84ff20f11b44efff 05-Jun-2013 Angus Kong <shkong@google.com> Merge "Play video from flim strip." into gb-ub-photos-carlsbad
49448f8631783fa635a0770345afa850bc0f212a 05-Jun-2013 Angus Kong <shkong@google.com> Add interface for swipe checking.

And fullscreen notification.

Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
ewCameraActivity.java
ata/CameraDataAdapter.java
i/FilmStripView.java
b40738a104ac056b9a220c1aec71d2df7446108a 03-Jun-2013 Angus Kong <shkong@google.com> Play video from flim strip.

Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
ewCameraActivity.java
til.java
ata/CameraDataAdapter.java
ata/LocalData.java
i/FilmStripView.java
7f555884b919d006e4da2ba06a57d9807be711bb 04-Jun-2013 Doris Liu <tianliu@google.com> Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
97d5093f721317a3914eb9ba91de961f38c660fd 04-Jun-2013 Doris Liu <tianliu@google.com> Fix pie menu button disappearing

Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
ewPhotoUI.java
44c5d5ce423bde77019b7dc2c567588b32a51d11 04-Jun-2013 Angus Kong <shkong@google.com> Merge "Add secure camera support." into gb-ub-photos-carlsbad
29a8d5b95b4b872d7596f0c6fcf27a9537202354 04-Jun-2013 Doris Liu <tianliu@google.com> Get new camera activity up to date

Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
ewCameraActivity.java
ewPhotoModule.java
ewPhotoUI.java
ewVideoMenu.java
ewVideoModule.java
ewVideoUI.java
61544549e543aebb69742ceda6e6235bea979630 03-Jun-2013 Angus Kong <shkong@google.com> Add play icon for videos.

Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
ata/LocalData.java
a06b4e2f2664bdd0b966ed3fb24e560cd9be7124 03-Jun-2013 Angus Kong <shkong@google.com> Add secure camera support.

Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
ewCameraActivity.java
ata/CameraDataAdapter.java
ata/LocalData.java
31f71961edadf2f9d6c137b3bd4cb4d3a3db1f27 03-Jun-2013 Doris Liu <tianliu@google.com> Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad
4da5967b9ebdd0156e3bf47de2ab9c32a18d1b77 01-Jun-2013 Doris Liu <tianliu@google.com> Add recent changes to new photo module

Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d
ewCameraModule.java
ewPhotoMenu.java
ewPhotoModule.java
ewPhotoUI.java
ewVideoModule.java
ewVideoUI.java
i/NewCameraRootView.java
885367cc5add241f6cb9ac243381400b497d630e 01-Jun-2013 Angus Kong <shkong@google.com> Add newly taken photos/videos to film strip.

Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
ewCameraActivity.java
ewPhotoModule.java
ewVideoModule.java
ata/CameraDataAdapter.java
5334fa3036425acf843072f32af72565b5547cf3 31-May-2013 Angus Kong <shkong@google.com> Merge "Adjust data id even if it's not currently used." into gb-ub-photos-carlsbad
fb57df15a87f95ce8b2f861e54d960602912e03c 14-May-2013 Doris Liu <tianliu@google.com> Improve gesture handling

Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoUI.java
i/FilmStripView.java
i/NewCameraRootView.java
i/PieMenuButton.java
i/PieRenderer.java
i/RenderOverlay.java
f464958e6bc926e0c4a776d11a9f2aa8514a866f 31-May-2013 Angus Kong <shkong@google.com> Merge "Translate the first/last view too." into gb-ub-photos-carlsbad
d3992d8958aa8067c4803f113bcbab9e7f5a61b0 31-May-2013 Angus Kong <shkong@google.com> Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad
accc6e55bbf0186be316e81fb4e82da4731f72e0 31-May-2013 Angus Kong <shkong@google.com> Don't use the same drawable for every view.

The placeholder drawable should be cloned for each view using it.

Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
ata/CameraDataAdapter.java
c31569ce211414f6db2447cc84ca71115f916b6f 31-May-2013 Angus Kong <shkong@google.com> Adjust data id even if it's not currently used.

FilmStripView should adjust the internal info of data id after removal
regardless of the existence of the removed data in the buffer.

Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf
i/FilmStripView.java
0980fe89b2c0d2d8f75cb43a5fe06c00b8c8901e 29-May-2013 Angus Kong <shkong@google.com> Translate the first/last view too.

Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
i/FilmStripView.java
7283c609ccca310cfc39a3d25bb1c58f4198a341 30-May-2013 Angus Kong <shkong@google.com> Fix mistakenly reversed order in FilmStripView.

Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4
ata/LocalData.java
9d6561494d28e8e8c6f1add50ab7724df722525b 30-May-2013 Michael Kolb <kolby@google.com> am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

* commit 'af65d7ba216eba60651d11d248d20346309375ed':
Add HTC One picture resolutions
d42c203a7fbbef58af268e7dcec295b7cdca6e4a 30-May-2013 Michael Kolb <kolby@google.com> Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
4a4d4ef24b7edbbdf1614373880681e5406df246 30-May-2013 Michael Kolb <kolby@google.com> Add HTC One picture resolutions

Bug: 9175168

Fixes bug where preview is not stopped before size changes

Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
hotoModule.java
32d50e89e7877a2b38573d20a8251850c87e7851 30-May-2013 Angus Kong <shkong@google.com> am a1db2653: Dismiss settings when showing popup in Video mode.

* commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0':
Dismiss settings when showing popup in Video mode.
91fffb39cf1eb7919cab48c56eb1b44727f4e5c2 30-May-2013 Angus Kong <shkong@google.com> Dismiss settings when showing popup in Video mode.

bug:8771618
Change-Id: I889b794c6732b674e26436f950e81f67529012e7
ideoUI.java
96ba2fbe1ad0e29673eaf5ceaa1ca256239dedac 29-May-2013 Angus Kong <shkong@google.com> Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
e78541f2edf2f02660c34660114e76d53b32ab8b 28-May-2013 Angus Kong <shkong@google.com> Add UI for insertion in FilmStripView.

Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
ewCameraActivity.java
i/FilmStripView.java
88741b480f3dece25ac06a87d3752e995bdd53c5 28-May-2013 Ruben Brunk <rubenbrunk@google.com> Removed unused handling for intent extras in editor.

Bug: 9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
ewPhotoModule.java
hotoModule.java
94472c3dc397cfa9a8fad5ba7628253ec6642ed6 28-May-2013 Doris Liu <tianliu@google.com> am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
Change the order of exposure compensation
31ce18458f63a2876e2d53c0b8692ef3dd6fca4f 25-May-2013 Doris Liu <tianliu@google.com> Change the order of exposure compensation

Bug: 9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
ameraSettings.java
4f675e3c7509efea7e0d140bda1631042a21f8ca 23-May-2013 Angus Kong <shkong@google.com> Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbad
dff672d644f3db07d13f6d58bfceb2b1cc10d345 23-May-2013 Angus Kong <shkong@google.com> Fix/simplify comparator of LocalData.

Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef
ata/LocalData.java
af956d7c25877dc3614a022a608948b6ed9b2e8f 23-May-2013 Angus Kong <shkong@google.com> Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad
4e6549b0a894c8c95a105b95f0bd421817ae9c25 23-May-2013 Sascha Haeberling <haeberling@google.com> am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.
6d23f4c77fde7ddf70e0edd48f46cc22b7f7320e 23-May-2013 Angus Kong <shkong@google.com> Refactor to add FilmStripView.Controller.

Use controller to control the FilmStripView.

Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
i/FilmStripView.java
fd382ee5142bb87707be00dec9bc7235f01733d1 22-May-2013 Angus Kong <shkong@google.com> Keep camera preview in view hierarchy.

Camera preview is a special case that needs to be kept to avoid unnecessary
start and stop preview.

Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
i/FilmStripView.java
af24d28f8938a05d2e3c40155e39cbc7ff4d64b7 21-May-2013 Angus Kong <shkong@google.com> Fix off-position issue after changing orientation

Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
i/FilmStripView.java
4f91ab5d099632afd84dd7bd80a804cbbe1f3588 21-May-2013 Sascha Haeberling <haeberling@google.com> Make capture thumbnail tappable in video mode.

Bug: 9054122

Also make gotoGallery public for LightCycle to use.

Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
ctivityBase.java
ideoModule.java
ideoUI.java
9f02c87cfb5039a72f516ea5edc0378c45ac5779 20-May-2013 Angus Kong <shkong@google.com> Fix jitter in FilmStripView.

The jigger happens when deleting the one before the last. The length of the film
strip might be changed due to the deletion.

Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1
i/FilmStripView.java
87f9a62f473a3c57505e2877b0a46ab3cb5e62ac 17-May-2013 Angus Kong <shkong@google.com> Add remove UI in FilmStripView

1. Add UI support for swipe to delete.
2. Don't set children padding.

Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
ewCameraActivity.java
ata/CameraDataAdapter.java
ata/LocalData.java
i/FilmStripGestureRecognizer.java
i/FilmStripView.java
7234f4d6ff4fdcd47eb428405d2b31a5711d20ce 14-May-2013 Doris Liu <tianliu@google.com> Add new camera activity back and fix build errors

Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
ewCameraActivity.java
ewCameraModule.java
ewPhotoMenu.java
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoMenu.java
ewVideoModule.java
ewVideoUI.java
i/FaceView.java
i/FilmStripGestureRecognizer.java
i/NewCameraRootView.java
e64e28cd164d52e1339f084ff57cf602f1bfd55c 15-May-2013 Michael Kolb <kolby@google.com> am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit '655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation
3071b12d4586b6dbb908c0fc89ebc04bbd656995 15-May-2013 Michael Kolb <kolby@google.com> Merge "Correct label position after rotation" into gb-ub-photos-bryce
2b06ff267ca205b72b79ac9b6f8089a623719afe 15-May-2013 Angus Kong <shkong@google.com> Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad
60e938e0caed26441e0ab784344fd161954dc8ab 14-May-2013 Michael Kolb <kolby@google.com> Correct label position after rotation

Bug: 8963421

Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
i/PieRenderer.java
7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5 14-May-2013 Doris Liu <tianliu@google.com> am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
750e8ec8af168afd318d47082b326b95f1cca517 06-May-2013 Angus Kong <shkong@google.com> Improve bitmap load efficiency.

Call prepare before/recycle after using image data.
Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
ata/CameraDataAdapter.java
ata/LocalData.java
i/FilmStripView.java
d31cdfeb1035df8ba939e877031769f0df247aa6 14-May-2013 Doris Liu <tianliu@google.com> Pause face detection when review captured images

Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
hotoUI.java
49b9ba2ba89760f297ecc7d6d94d68fb4b836be1 13-May-2013 Angus Kong <shkong@google.com> Dropping back FilmStripView codes.

Ongoing work that doesn't affect builds.

Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
ata/CameraDataAdapter.java
i/FilmStripGestureRecognizer.java
i/FilmStripView.java
3d585e9429acc637fa4f6e9ad9fdc82a428c7152 09-May-2013 Bart Sears <bsears@google.com> Merge "Close menu in onPause" into gb-ub-photos-bryce
4615c5c727b4e447b702f1e11213898da28d2f97 08-May-2013 Michael Kolb <kolby@google.com> Add drop shadow to preview thumb

Bug: 8826241

Also, remove animateSlide blocker, it caused frozen review

Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
ctivityBase.java
ameraScreenNail.java
aptureAnimManager.java
b16bae90dbb99892c6b3209c13c53c44cb69deb4 09-May-2013 Michael Kolb <kolby@google.com> Close menu in onPause

Bug: 8722672

Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
hotoUI.java
7048972374474dfca142856583833d8168d3b1b6 08-May-2013 Michael Kolb <kolby@google.com> Fix second level menu

Bug: 8857098

Added Countdown timer and picture size items

Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
ountDownTimerPreference.java
hotoMenu.java
hotoUI.java
i/CountdownTimerPopup.java
i/TimerSettingPopup.java
0815098550dd4158386d059b04de7f13fb415620 08-May-2013 Doris Liu <tianliu@google.com> Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
69ef5ea6ed838cf6fba834811f01122d349a61cf 07-May-2013 Doris Liu <tianliu@google.com> Fix video capture intent overlapping buttons

Bug: 8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
ideoController.java
ideoModule.java
ideoUI.java
i/CameraControls.java
ad2a745d44fdf5acdd98d3bd8212ca51f45c29e7 07-May-2013 Michael Kolb <kolby@google.com> Add animation to slice selection

Bug: 8826233

Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
i/PieRenderer.java
c9a1195c43d7d9953b3060503188c1f28cd948b8 07-May-2013 Michael Kolb <kolby@google.com> Fix review button placement

Bug: 8833788

Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
i/CameraControls.java
bcd73db9b9a5580167f1f54e78b798cbf9165940 07-May-2013 Doris Liu <tianliu@google.com> Resize children to avoid laying out outside parent

Bug: 8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
i/CameraRootView.java
93240535cafe2b1a7630f8350963a3d84cbb9937 06-May-2013 Doris Liu <tianliu@google.com> Merge "Restrict checking for device flip" into gb-ub-photos-bryce
712cc2f5add2fb78fbb723ecbca5f576a91fb54f 06-May-2013 Michael Kolb <kolby@google.com> Set correct label text in tap mode

Bug: 8826229

Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
i/PieRenderer.java
fa1c3a528de2ec357b8f43aa133feae444899668 03-May-2013 Doris Liu <tianliu@google.com> Restrict checking for device flip

Bug: 8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
i/CameraControls.java
i/RotatableLayout.java
d45258375a9356475377f6bdc7a504cd9acb937a 03-May-2013 Doris Liu <tianliu@google.com> Fix NPE caused by insets never being set

Bug: 8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
i/CameraRootView.java
cbefed61cf0a7f28afb1221e95ee80c14d190243 03-May-2013 Doris Liu <tianliu@google.com> Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
acfe99e268f157bfd524c825f388e6d37261e135 03-May-2013 Doris Liu <tianliu@google.com> Anchor camera controls when flipping device

Also adjusted margins for camera root view to avoid covering undo bar

Bug: 8758513
Bug: 8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
i/CameraControls.java
i/CameraRootView.java
d675bceed1a817e5f5a330ea27ac1b30b7be3330 03-May-2013 Angus Kong <shkong@google.com> Don't show settings when popup is shown.

bug:8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
hotoUI.java
b0da79fe069d740566663120818f9ed13a706890 01-May-2013 Michael Kolb <kolby@google.com> Fix layout and preview for tablets

Bug: 8253060

Make controls full screen, and layout according to required size

Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
i/CameraControls.java
78a5b224eca3c702f4ecf8abd072779e32e26641 01-May-2013 Michael Kolb <kolby@google.com> Update capture animation

Bug: 8253060

Update preview thumb margins and size
Add touch target for thumbnail

Change-Id: I2b298de330834c42a55b4cb082148d971727f530
aptureAnimManager.java
hotoModule.java
hotoUI.java
i/CameraControls.java
8788079a51a90255dce330e56afcb6674deccbf7 01-May-2013 Michael Kolb <kolby@google.com> Update location indicator correctly

Bug: 8768592

Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
hotoUI.java
ideoModule.java
ideoUI.java
997dfc3211ac036448d18d0c0076fef9623885c0 30-Apr-2013 Michael Kolb <kolby@google.com> Adjust switcher animation

Bug: 8754841

Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
i/CameraSwitcher.java
d548f9af4524773a3dc7903f33eb05fcf9a1bfb8 30-Apr-2013 Michael Kolb <kolby@google.com> Align review controls

Bug: 8753607

Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
i/CameraControls.java
b7c49994231f31f5cf4de4a66eec7a85a3bd9551 30-Apr-2013 Michael Kolb <kolby@google.com> Remove empty slots from menu

Bug: 8640131

When a specific camera doesn't support one of the menu options,
the option is removed from the menu, no empty spot anymore.

Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
hotoMenu.java
ieController.java
ideoMenu.java
i/PieItem.java
i/PieRenderer.java
db56a16f02e06207e527d9b135fcedddb2643515 30-Apr-2013 Michael Kolb <kolby@google.com> Remove timer indicator

Bug: 8754833

Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
hotoUI.java
b644e34fa8e6a94eec12e12046a4098b8734c70d 29-Apr-2013 Michael Kolb <kolby@google.com> Fix indicator layout

Bug: 8754592

Use the correct anchor for layout

Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
i/CameraControls.java
beefbf5ad2ef69683f4c2f6c3d354b20c457a11c 27-Apr-2013 Angus Kong <shkong@google.com> Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
eb8adc1754fc668435ee57d1be2235b80fc8c009 26-Apr-2013 Michael Kolb <kolby@google.com> Add new indicators

Bug: 8640131

Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
istPreference.java
nScreenIndicators.java
hotoModule.java
hotoUI.java
ideoUI.java
8f4ca941f3b79fa1836037405191049a95cba40c 26-Apr-2013 Angus Kong <shkong@google.com> Delegate the texture copy to DrawClient.

bug:8109314
Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
ameraScreenNail.java
abd5efe72de6b571aada1b69633a4d02aced5616 26-Apr-2013 Michael Kolb <kolby@google.com> Merge "Center Video menu" into gb-ub-photos-bryce
ba57946072e4f9f4c78259ae288c6d0667180e56 26-Apr-2013 Michael Kolb <kolby@google.com> Merge "Don't render label on focus ring" into gb-ub-photos-bryce
bc33156713500e4de7224c1945b57bbc003e81e9 26-Apr-2013 Doris Liu <tianliu@google.com> Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
c835849b179c481b92a308157d518bb3ad73f069 26-Apr-2013 Michael Kolb <kolby@google.com> Center Video menu

Bug: 8660834

Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c
ideoMenu.java
9e012f853e3eb5c9d36c84351961f588eef4788f 26-Apr-2013 Michael Kolb <kolby@google.com> Don't render label on focus ring

Bug: 8719036

Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
i/PieRenderer.java
ee62d817e50baf404339510105f04cbc6d984210 26-Apr-2013 Doris Liu <tianliu@google.com> Make sure the initial rotation is set

Bug: 8718884
Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
i/RotatableLayout.java
685b8e30b5c031e3d10b78143cc160eb204ca891 25-Apr-2013 Doris Liu <tianliu@google.com> Remove new camera activity code from Bryce

Bug: 8722017
Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
ewCameraActivity.java
ewCameraModule.java
ewPhotoMenu.java
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoMenu.java
ewVideoModule.java
ewVideoUI.java
ata/CameraDataAdapter.java
i/FaceView.java
i/FilmStripGestureRecognizer.java
i/FilmStripView.java
i/NewCameraRootView.java
cb62cff674473133bedc32d06c2c0d6c02cbec90 25-Apr-2013 Doris Liu <tianliu@google.com> Avoid rendering underneath nav bar

Bug: 8647833

Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
i/CameraRootView.java
c646fb4b7400210c54e8b535a290d10d4c0ca49d 25-Apr-2013 Michael Kolb <kolby@google.com> Merge "New capture animation" into gb-ub-photos-bryce
705604dfd85362a4b98887b2b1a173e6658853d8 22-Apr-2013 Michael Kolb <kolby@google.com> New capture animation

Bug: 8253060

Match new UX design for capture animation
Custom layout for camera controls

Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
ctivityBase.java
ameraActivity.java
ameraScreenNail.java
aptureAnimManager.java
hutterButton.java
i/CameraControls.java
ce019e94d92f0097d73a6fc986d0a1e593b74b4d 25-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
6d73e4574907809bf328f1535cd88d7ec564804b 24-Apr-2013 Michael Kolb <kolby@google.com> Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
0233bade51dfcce5fa1f49b5c2e200a719feab22 24-Apr-2013 Michael Kolb <kolby@google.com> Reset ongoing animation when opening menu

Bug: 8687199

The XFade animation was not reset and yielded a transparent alpha

Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
i/PieRenderer.java
b3aa8b64087ecf64254134208b0fa0be7bd43800 24-Apr-2013 Sascha Haeberling <haeberling@google.com> Store location for SRI panoramas.

Bug: 8692005

Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
anoramaModule.java
fd2e619a2fb263315816b3579a9c6751c398132d 23-Apr-2013 Doris Liu <tianliu@google.com> Fix for popuping being hard to dismiss

Bug: 8688503
Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
hotoUI.java
reviewGestures.java
ideoUI.java
140c263ebb2504fe1a0212a835f0098ce7973a22 23-Apr-2013 Sascha Haeberling <haeberling@google.com> Fixes video mode indicators by resetting them on init.

Bug: 8696004

Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
nScreenIndicators.java
ideoUI.java
c7965e2bc8f69006de09b4be6fad61c4d2313e07 22-Apr-2013 Sascha Haeberling <haeberling@google.com> Refactor the methods for changing the on-screen indicators.

Bug: 8609355

This will be used in PanoramaModule to set the indicators to their
default values when the module is initialized.

Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6
nScreenIndicators.java
hotoUI.java
53fc9e17ce4b1e64f8fa53f6921cef304a39e1da 22-Apr-2013 Michael Kolb <kolby@google.com> Merge "More menu fixes" into gb-ub-photos-bryce
f465110e4b8ed787589e052e5ac746c588c5ac8f 20-Apr-2013 Michael Kolb <kolby@google.com> More menu fixes

Bug: 8660834

Add label dropshadow, reposition fixed menu
Adjust dead zone and angle

Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
rawable/TextDrawable.java
i/PieRenderer.java
9523e9148356c875044512ad3a321490b665fbda 22-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
d4883e406ad43df815ede45e9aff23c6a4aa4457 22-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
8afd3b1f1ec70ea110bf99e3948cc2d7343680ea 20-Apr-2013 Doris Liu <tianliu@google.com> Fix for camera switcher hard to hit

Bug: 8667079
Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
reviewGestures.java
bec9cf0afe17d4fc26b4d8b6b5c7d95549bb35fe 20-Apr-2013 Doris Liu <tianliu@google.com> Fix camera buttons showing up at wrong position

Bug: 8607034
Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
i/RotatableLayout.java
1600796a43cf584b3db49c5f21ec103529d7368d 20-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix saved video timestamps.

Bug: 8002939
Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
ideoModule.java
8d732159c1093e7ce970cb34bc6d36a14f26e3fa 19-Apr-2013 Angus Kong <shkong@google.com> Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
736765766c6869c8add352641464dc5b099bc0f5 19-Apr-2013 Angus Kong <shkong@google.com> Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
83a99ae51a11af28553dfb77ef0ec91148671c9b 18-Apr-2013 Angus Kong <shkong@google.com> Save video using MediaSaveService.

bug:8511719
Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
ediaSaveService.java
ideoModule.java
b13f87be0defbea052e317302f37e9d260244c9a 19-Apr-2013 Angus Kong <shkong@google.com> Make MediaSaveService destroyed after unbound.

bug:8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
ameraActivity.java
32cae72fda76329e181c20aa2f0b74e0f391fa8f 19-Apr-2013 Angus Kong <shkong@google.com> Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
7e2796f51a96a57ca91b42ec2976f72c13f71d11 19-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
29f5085a0b27ca62744974df67394f2c4b1df136 19-Apr-2013 Doris Liu <tianliu@google.com> Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
1ce28c910dca3de9a832079acc77cb807b25d178 19-Apr-2013 Doris Liu <tianliu@google.com> Fix memory leak in pie controller

Bug: 7622218
Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
ieController.java
5327af1220eaf5b35cca6229466ccdc51970ee8b 19-Apr-2013 Angus Kong <shkong@google.com> Pass the camera to recorders after all is set.

bug:8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
ideoModule.java
25c0ec4c1252a8d0f9de74ba7ade74bc7af3f5b2 18-Apr-2013 Michael Kolb <kolby@google.com> Add more menu options/icons

Bug: 8640131

Added location and scene mode to secondary menu
Updated HDR icons

Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
hotoMenu.java
ieController.java
9d39c070458686fa31c3173c72332eee60c4dd14 18-Apr-2013 George Mount <mount@google.com> Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
9cdfe00cf57f05f81e6d02ca050e6afd8cc4a25f 16-Apr-2013 Doris Liu <tianliu@google.com> Allow swiping to filmstrip from blocker bar

Bug: 8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
ameraActivity.java
hotoModule.java
hotoUI.java
reviewGestures.java
ideoUI.java
1e259a86f780b2857793b8fba82d98c871989639 18-Apr-2013 George Mount <mount@google.com> Change labels so that it doesn't clash with PanoUiLib.

Bug 8401273
PanoUiLib is required for all Gallery Wolfie UI.

Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
istPreference.java
491c6915aefe4fdcd23176c78ec1199ef74ef50f 18-Apr-2013 Sascha Haeberling <haeberling@google.com> Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
172d37e178a33fd1138d7e3a9b08f8c541959cc3 18-Apr-2013 Michael Kolb <kolby@google.com> First part of asset drop

Bug: 8640131

Added new assets, updated front/back menu entry.

Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
hotoMenu.java
ideoMenu.java
02cc9b9fbd42edfe6edd6db872f7eec84a274849 17-Apr-2013 Sascha Haeberling <haeberling@google.com> Add method for returning SoundPool audio type.

Bug: 7402245

Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
oundClips.java
0808c38f4ac300f7df047bf7884a607e0f069553 16-Apr-2013 Angus Kong <shkong@google.com> Don't wait for Mosaic Renderer ready in UI thread.

bug:8292711
Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
anoramaModule.java
6e8057ea04160a4aeb83dfe3b4f1d4d9520f5c8b 16-Apr-2013 Michael Kolb <kolby@google.com> Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
0f4a5ae4fae89cc7cde711f6aad8d7f571132ca9 10-Apr-2013 Michael Kolb <kolby@google.com> Angle menu at edge of screen

Bug: 8618699

Adjust touch slices; adjust label position

Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
i/PieRenderer.java
36ed867759d089723fc40947d772bb21deba5096 15-Apr-2013 Angus Kong <shkong@google.com> Use extra copy of parameters for concurrent access

bug:8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
ameraManager.java
ewPhotoModule.java
ewVideoModule.java
hotoModule.java
ideoModule.java
0408c9aef21d1e4e9afb1862897afdc8e21906fd 15-Apr-2013 Michael Kolb <kolby@google.com> Also, add labels to video menu

Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
ideoMenu.java
10f4ba0198904a3d7679771ce845c847d940226f 10-Apr-2013 Michael Kolb <kolby@google.com> Add menu labels

Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
ameraSettings.java
istPreference.java
hotoMenu.java
ieController.java
rawable/TextDrawable.java
i/PieItem.java
i/PieRenderer.java
743dfdcd88081ff19fa6100dbd7d9c84aabe71c0 12-Apr-2013 Michael Kolb <kolby@google.com> Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
6608b57af0fd3b561022b589d4dc7ece567cf759 12-Apr-2013 Michael Kolb <kolby@google.com> Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
14b553530417960d51ac173f09c2fbabf590cd81 12-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe 12-Apr-2013 Michael Kolb <kolby@google.com> Fix NPE in PieRenderer

Bug: 8579025

Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
i/PieRenderer.java
4205d50cbb7fcf822e992c955719d4f8872f37d5 12-Apr-2013 Jason Noguchi <jnoguchi@google.com> Add checks for NPE in video pie menu.

Bug: 8536361

Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
ideoMenu.java
e11dffa6d4d34cd6754d58a245b867a13385945c 10-Apr-2013 Doris Liu <tianliu@google.com> Fix ICS recording aspect ratio

Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
ewVideoUI.java
1124dd507a7512303abd674aaff1dbbf797226ee 12-Apr-2013 Angus Kong <shkong@google.com> Merge "Integrate FilmStripView." into gb-ub-photos-bryce
125efb44995fb3307572c2832b259307e8b7aadc 10-Apr-2013 Angus Kong <shkong@google.com> Integrate FilmStripView.

Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
ewCameraActivity.java
ewPhotoUI.java
ata/CameraDataAdapter.java
i/FilmStripView.java
i/NewCameraRootView.java
28dc7f348b70ee6735d208b48ca12a94e9cd222f 11-Apr-2013 Doris Liu <tianliu@google.com> Fix camera preview being squished

Bug: 8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
hotoModule.java
hotoUI.java
107009fa3120563f9bdcdcce9c1ba92e58761b7a 09-Apr-2013 Angus Kong <shkong@google.com> Refactor CameraDataAdapter for other data types.

Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
ata/CameraDataAdapter.java
i/FilmStripView.java
81b3e97257261df7252e1b481ec97aa82987d423 10-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix to imports in NewPhotoModule.

Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
ewPhotoModule.java
8b7ac108eed98fbee43a21d5fd9ce41b9deda5ca 10-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
1a664450bed2737660057def2d25b0c6b49b3ba8 05-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Moving crop to a separate activity. Refactoring.

Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
hotoModule.java
d7bdf84448ecedf914b205e6270e81ad5027715b 09-Apr-2013 Angus Kong <shkong@google.com> Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
104e0012f33dfac317a23511dd8b2e832da5af4d 04-Apr-2013 Angus Kong <shkong@google.com> Refresh parameters during recording.

bug:8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
ameraManager.java
ewVideoModule.java
ideoModule.java
753bb8aa56fff425fe16b93be368b9b236e4751f 15-Mar-2013 Doris Liu <tianliu@google.com> Work in progress - Put preview in TextureView

Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener

Ongoing: secure album, aspect ratio for video recording on ICS

Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
ewCameraActivity.java
ewCameraModule.java
ewPhotoMenu.java
ewPhotoModule.java
ewPhotoUI.java
ewPreviewGestures.java
ewVideoMenu.java
ewVideoModule.java
ewVideoUI.java
hotoMenu.java
ieController.java
ideoMenu.java
ideoUI.java
i/CameraSwitcher.java
i/FaceView.java
i/NewCameraRootView.java
3eb0acbe1fcdcd10e962abaab7d946c6013343b3 05-Apr-2013 Angus Kong <shkong@google.com> Add more gestures and animations in FilmStripView.

Now supports fullscreen mode and filmstrip mode.

Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
ata/CameraDataAdapter.java
i/FilmStripGestureRecognizer.java
i/FilmStripView.java
5cf3c47333d558abacd8962d68ccb1ff3e285005 05-Apr-2013 Michael Kolb <kolby@google.com> Don't add unsupported options to menu

Bug: 8549712

Exposure compensation and whitebalance were not checked when added
to the menu.

Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
hotoMenu.java
8a9bee75383fba5a612c5e7ef7c6488495961bec 04-Apr-2013 Michael Kolb <kolby@google.com> Merge "Adjust camera menu further" into gb-ub-photos-bryce
5a7a5ce7a4ea9603649e8b9aff74e829ca8179c1 04-Apr-2013 Angus Kong <shkong@google.com> Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
3daa3518c3bfa1a2c1da37c56e1a34e9a0cac259 03-Apr-2013 Michael Kolb <kolby@google.com> Adjust camera menu further

Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
hotoMenu.java
ieController.java
ideoMenu.java
i/PieItem.java
i/PieRenderer.java
bbee3bfe85ab29acda2e13c422459d3cb96b1917 03-Apr-2013 Doris Liu <tianliu@google.com> Improve black bar to keep camera controls in place

Bug: 8340996

Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
ameraActivity.java
hotoUI.java
i/CameraControls.java
i/CameraRootView.java
i/RotatableLayout.java
i/SwitcherBackgroundView.java
2ebee8fc991443fed9f043045a5c8feb2ff9342c 03-Apr-2013 Angus Kong <shkong@google.com> Don't access mParameters dirty bit in other thread

Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
ameraManager.java
7a02a7916312cc25e03badd30a76b36c92a007bc 03-Apr-2013 Angus Kong <shkong@google.com> Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
b71331b1c245e039901b89f20342749e95d9d7a8 02-Apr-2013 Angus Kong <shkong@google.com> Make stopPreview synchronous.

bug:8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
ameraManager.java
0235199a906f7cda3713a689018930912688b866 02-Apr-2013 Bobby Georgescu <georgescu@google.com> Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
301b64679cfbd452060ac5b9595d315135550120 02-Apr-2013 Bobby Georgescu <georgescu@google.com> Usage statistics for photo and video capture

Bug: 8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
hotoModule.java
ideoModule.java
461159a112fb3fa098962bd384ff1ca72e463045 02-Apr-2013 Michael Kolb <kolby@google.com> Merge "Pie design update" into gb-ub-photos-bryce
3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0 12-Mar-2013 Michael Kolb <kolby@google.com> Pie design update

Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
hotoMenu.java
hotoUI.java
ieController.java
reviewGestures.java
ideoMenu.java
ideoUI.java
i/PieItem.java
i/PieRenderer.java
fd363b27e87ad4b9dc23bcd415d3d9fb5619cdfb 02-Apr-2013 Angus Kong <shkong@google.com> Handle InterruptedException in waitDone

Dirty bit for mParameters should be set properly if getParameters is not
finished.

bug:8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
ameraManager.java
87efd29660cfc53023667ff8c124364fcdbcc88c 02-Apr-2013 Angus Kong <shkong@google.com> Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
73749f2d3c4a403b7b8455edcfd260c1d8633be8 01-Apr-2013 Angus Kong <shkong@google.com> Don't use SynchronousQueue to pass results.

bug:8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
ameraManager.java
806e78b99ae440423547aca436fe5361882bcc33 01-Apr-2013 Bobby Georgescu <georgescu@google.com> Usage statistics for camera settings

Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
omboPreferences.java
918f811c21eb5a325626bf523a390926d4e6cb77 01-Apr-2013 Angus Kong <shkong@google.com> Fix NPE when reconnecting camera.

bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
ameraManager.java
0925a4e9d7f62f57cf9d8ed40ce22d08af1583a3 29-Mar-2013 Angus Kong <shkong@google.com> Make camera releasing synchronous.

bug:8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
ameraManager.java
2a68debc4c7a285dff36c7639387fed1e8e02b45 28-Mar-2013 Doris Liu <tianliu@google.com> Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
61f2b082014fe4402dd208029e9378dd5cb1fd1d 28-Mar-2013 Doris Liu <tianliu@google.com> Disable preview gestures when shutter is pressed

Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
ideoModule.java
ideoUI.java
2a23c46ca52e9af02aac7c454a89d2b9c4f2e539 27-Mar-2013 Angus Kong <shkong@google.com> Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
dcb0ef1d6eacdd7d18a6881ae75f67c9851a858c 26-Mar-2013 Angus Kong <shkong@google.com> Make camera calls asynchronous

bug:8438047

Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
ameraManager.java
hotoModule.java
ideoModule.java
c6af786bdc2488c2c7a69846b81261f31ffdccb3 27-Mar-2013 Doris Liu <tianliu@google.com> Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
1f69b697746b62c76c8a4892c62e20380151be69 27-Mar-2013 Doris Liu <tianliu@google.com> Workaround for switcher popup being cut off on ICS

Bug: 8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
i/CameraSwitcher.java
81c9d5d383e366670cb88c3a16a457428cdc18dd 27-Mar-2013 Angus Kong <shkong@google.com> Remove debug log.

Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
hotoModule.java
0d00a8907096b9970ac64f52abbd2bfc1ed751b6 26-Mar-2013 Angus Kong <shkong@google.com> Add GPSDirection tag using ExifInterface.

bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
xif.java
ediaSaveService.java
hotoModule.java
torage.java
ideoModule.java
8737bd93a989cc5608065b13f0682f60a6e18e27 26-Mar-2013 Doris Liu <tianliu@google.com> Merge "Adding switcher background back in" into gb-ub-photos-bryce
c0bbf7c9a11e8c4e02045672989a8545e4c1279d 26-Mar-2013 Doris Liu <tianliu@google.com> Adding switcher background back in

Fixed switcher background's rotation issue.
Bug: 8436031

Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
i/SwitcherBackgroundView.java
955e5c57ec592003abea8e6b8f0bc2bfb3e201bc 22-Mar-2013 Michael Kolb <kolby@google.com> Fix NPE in Camera

Bug: 8409508

Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
ameraActivity.java
e3974bb4614d027e88ad915f70c4c05fb5ff76b1 22-Mar-2013 Michael Kolb <kolby@google.com> Add renderers only once

Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
hotoUI.java
c774ff93ae8026a76bddbf9b7a29f04de50721da 21-Mar-2013 Doris Liu <tianliu@google.com> Fix for record button not responding

Bug: 8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4
ideoModule.java
1580df6aed1e5569ede61af0949279819ec03119 16-Mar-2013 Angus Kong <shkong@google.com> Add shared preference key of LightCycle.

Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21
ameraSettings.java
omboPreferences.java
7e0ee8bbc790e2eef67f4bbe0cd1c5550d055ea9 14-Mar-2013 Michael Kolb <kolby@google.com> Fix exposure compensation

Bug: 8391082

Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
ameraSettings.java
cd5c7040e91e0bdb3b966642d91b6de290fd1035 14-Mar-2013 Doris Liu <tianliu@google.com> Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
29fd4aa661f7e626a1d11558f09e8f7c011efcc2 12-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Exif parser modifications.

Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
xif.java
anoramaModule.java
6827ce281bd3a83ca2ffa552cd090e2b427c5f83 13-Mar-2013 Doris Liu <tianliu@google.com> Use Model-View-Controller pattern on video module

Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
ideoController.java
ideoMenu.java
ideoModule.java
ideoUI.java
acca4ee0fefe6442b853510b6b360f6cb7ad1bc5 13-Mar-2013 Angus Kong <shkong@google.com> Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
6616551e7d9bf78a6b630893602e63379e81ef2b 22-Feb-2013 Angus Kong <shkong@google.com> Horizontal scrollable filmstrip view.

Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
ata/CameraDataAdapter.java
i/FilmStripView.java
e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
963fffa259a557f3de917809ada0b6d54ee78066 13-Mar-2013 Michael Kolb <kolby@google.com> Fix bug in exposure setting

Bug: 8314498

Limit exposure compensation to -3 to 3;
some devices offer -4 to 4, and we don't have icons
covering that range

Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
ameraSettings.java
9bdae6d02381d1efeea91401be1d08d01ac30d7d 13-Mar-2013 Michael Kolb <kolby@google.com> Merge "Fix Monkey NPE" into gb-ub-photos-bryce
2441ada50f4bfa3a6c59472ebd3b6339778b8b6b 13-Mar-2013 Michael Kolb <kolby@google.com> Fix Monkey NPE

Bug: 8377895

Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
hotoUI.java
03fc4e9aa172e091134d9dec8f51087cb6581c0d 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Add coarse grained events for camera mode, filmstrip stats

Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
i/CameraSwitcher.java
0a7dd573732a06879b35cdd07a8c0ee08b62a32e 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Usage statistics collection for camera module, filmstrip

Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
anoramaModule.java
hotoModule.java
ideoModule.java
i/CameraSwitcher.java
b7e9fe88792cb2329bedb8af770236799177d44b 12-Mar-2013 Michael Kolb <kolby@google.com> Open camera only once in Video module

Bug: 8272736

Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
ideoModule.java
d3ebbcf13190110baddf3d60bc65400d2ff73099 11-Mar-2013 Michael Kolb <kolby@google.com> Merge "Spring cleaning" into gb-ub-photos-bryce
d6954f337e20365fc24ecffdd6f30e17c6b31eff 09-Mar-2013 Michael Kolb <kolby@google.com> Spring cleaning

Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
ameraModule.java
ocusOverlayManager.java
ediaSaveService.java
anoramaModule.java
hotoController.java
hotoMenu.java
hotoModule.java
hotoUI.java
reviewGestures.java
ideoController.java
ideoMenu.java
ideoModule.java
b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c 11-Mar-2013 Michael Kolb <kolby@google.com> Don't record video before preview is started

Bug: 8358998

Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
ideoModule.java
556713fa25b492b6cba9ed8bf4ea6e2f56298fb5 06-Mar-2013 Doris Liu <tianliu@google.com> Fix camera switcher mode picker

Bug: 8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
i/CameraSwitcher.java
5b45e26674bcbb91bdc195bed15a897ba3b96b0e 06-Mar-2013 Doris Liu <tianliu@google.com> Fix NPE in switcher popup

Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
i/CameraSwitcher.java
09106a41ee6acc6b20553662cb9b730702a8f08a 05-Mar-2013 Doris Liu <tianliu@google.com> Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
ameraActivity.java
hotoModule.java
48239f4dd39040a9ab2ffc977586035a8784fd78 05-Mar-2013 Doris Liu <tianliu@google.com> Keep camera controls on the same physical side

Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
ameraActivity.java
hotoModule.java
hutterButton.java
i/CameraSwitcher.java
i/RotatableLayout.java
6a0de79a7066d4ae5cc4677f88989abd15e892ff 26-Feb-2013 Doris Liu <tianliu@google.com> Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
ameraActivity.java
ameraModule.java
anoramaModule.java
hotoModule.java
reviewFrameLayout.java
hutterButton.java
ideoModule.java
i/CameraSwitcher.java
i/RotatableLayout.java
ebcf6fed531d00cfb6900a1fb5d83c60aa7f9693 27-Feb-2013 Michael Kolb <kolby@google.com> Highlight menu selection better

Keep the selected slice highlighted longer before fading out
Timing might need further adjusting

Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
i/PieRenderer.java
08650187c1f1a2d1ef7f754be0f479a29958daaa 26-Feb-2013 Michael Kolb <kolby@google.com> Use cross fade rotation animation

Bug: 8257846

Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
ameraActivity.java
02ef5ba117462eda524820b6004f84d26b28f647 23-Feb-2013 Doris Liu <tianliu@google.com> Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
b8cf250c6351cd96f069fd16087db5e7b0f6b1d6 22-Feb-2013 Doris Liu <tianliu@google.com> Release surface texture to fix gray camera preview

Bug: 8133672

Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
hotoModule.java
8ae11144fc1fc15062297d03fb86d6bfb443953a 21-Feb-2013 Michael Kolb <kolby@google.com> Adjust capture animation timing

Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
aptureAnimManager.java
537718ca08c3b65e529f5cf70b3ae65a3263bcc4 21-Feb-2013 Doris Liu <tianliu@google.com> Fix NPE for when camera is disabled

Bug: 7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
ideoModule.java
0718d480a144ba0a44c07c48f90e85cf4ec669c6 16-Feb-2013 Michael Kolb <kolby@google.com> Fix auto-focus areas

Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus

Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
ocusOverlayManager.java
e3de7223ee3fe56e097d68f50c5a59ae61370d65 19-Feb-2013 Michael Kolb <kolby@google.com> Fix AF animation

Bug: 8219462

Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
ocusOverlayManager.java
i/PieRenderer.java
f7159e15dd704e9501a3538cb05498f40a30f042 16-Feb-2013 Doris Liu <tianliu@google.com> Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
3cf565c4242a9deab7da5eb84fc302c79d594f11 15-Feb-2013 Doris Liu <tianliu@google.com> Make photo orientation consistent with UI

Also fixed the wrong animation orientation.

Bug: 7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
ameraActivity.java
hotoModule.java
ad16c6799d559d304bb8688e37a02d2d9bc53a42 16-Feb-2013 John Reck <jreck@google.com> Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 16-Feb-2013 John Reck <jreck@google.com> Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
ctivityBase.java
ameraActivity.java
ameraPreference.java
ameraSettings.java
ountDownTimerPreference.java
ffectsRecorder.java
conListPreference.java
istPreference.java
nScreenHint.java
anoramaModule.java
hotoController.java
hotoModule.java
reviewFrameLayout.java
reviewGestures.java
otateDialogController.java
oundClips.java
til.java
ideoController.java
ideoModule.java
i/AbstractSettingPopup.java
i/CameraSwitcher.java
i/CountDownView.java
i/EffectSettingPopup.java
i/FaceView.java
i/InLineSettingCheckBox.java
i/InLineSettingItem.java
i/InLineSettingMenu.java
i/ListPrefSettingPopup.java
i/MoreSettingPopup.java
i/PieRenderer.java
i/RotateTextToast.java
i/Switch.java
i/TimeIntervalPopup.java
i/TimerSettingPopup.java
i/ZoomRenderer.java
d036a2fb3069224eeb5c2102f10c71d2005bde63 14-Feb-2013 Michael Kolb <kolby@google.com> New capture animation

Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
aptureAnimManager.java
ec2cebe4912bbb1a040b0bd52b250528671ef73d 14-Feb-2013 Michael Kolb <kolby@google.com> Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
4a40e126df5a77eaf44a52c73011cbfa91879b54 14-Feb-2013 Michael Kolb <kolby@google.com> Fix inexplicable monkey NPE

Bug: 8049510

Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
ocusOverlayManager.java
3c2fca3fe03888a3db308eea5e69b38479433706 14-Feb-2013 Doris Liu <tianliu@google.com> Fix video disappearing when rotated

Bug: 7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
ideoModule.java
9147ab1b489170a3f6454e2b3f425d60505ea208 14-Feb-2013 Angus Kong <shkong@google.com> Make ShutterButton visible after initialization.

bug:8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
ideoModule.java
31019e09eaaa460e68b3f90a881ea3278fbd6108 12-Feb-2013 Angus Kong <shkong@google.com> Wait for the previous MosaicPreviewRenderer to end

When changing orientations very fast, there might be 2 MosaicPreviewRenderer
instances accessing the SRI native library at the same time. The library is not
designed so.

bug:8151753
Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
osaicFrameProcessor.java
osaicPreviewRenderer.java
cef56e96ff49a90d032699ed06b9991fc8486d2a 11-Feb-2013 Doris Liu <tianliu@google.com> Merge "Lock focus during countdown" into gb-ub-photos-bryce
40ac3829119a316ee11cbcc26d278b04ac581877 09-Feb-2013 Doris Liu <tianliu@google.com> Fix camera setting icons appearing in wrong place

Bug: 7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
i/PieMenuButton.java
da50e05c6f01a8de71e6c3e7293058b4f6985316 07-Feb-2013 Doris Liu <tianliu@google.com> Lock focus during countdown

Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
hotoModule.java
4e72c9098e96866fe9d7612c197a5b26f8f99d57 07-Feb-2013 Doris Liu <tianliu@google.com> Fix memory leak in ComboPreferences

Bug: 8028546

Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
omboPreferences.java
86d36313d88fe96354f2cdd4f378e5ff8397c458 01-Feb-2013 Angus Kong <shkong@google.com> Make video snapshot save images in the background.

bug:8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
ameraActivity.java
ameraModule.java
ediaSaveService.java
anoramaModule.java
hotoModule.java
ideoModule.java
8052651774e5a4f68f9ea3e79319e59eafd354cc 01-Feb-2013 John Reck <jreck@google.com> Merge "Animate between photo modules" into gb-ub-photos-bryce
e319aeabdc825f221df5af8a6ec080c6f5d41a94 07-Nov-2012 John Reck <jreck@google.com> Animate between photo modules

Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
ameraActivity.java
ameraScreenNail.java
ce5480e099fda944b9e96e4b750300944c3f4a4f 30-Jan-2013 Angus Kong <shkong@google.com> Make background media saving a service

bug:8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
ediaSaveService.java
ediaSaver.java
hotoModule.java
8872c23e739de38d74f04a8c852ebb5199c905f6 29-Jan-2013 Michael Kolb <kolby@google.com> Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ctivityBase.java
ameraActivity.java
ameraBackupAgent.java
ameraButtonIntentReceiver.java
ameraDisabledException.java
ameraErrorCallback.java
ameraHardwareException.java
ameraHolder.java
ameraManager.java
ameraModule.java
ameraPreference.java
ameraScreenNail.java
ameraSettings.java
aptureAnimManager.java
omboPreferences.java
ountDownTimerPreference.java
isableCameraReceiver.java
ffectsRecorder.java
xif.java
ocusOverlayManager.java
conListPreference.java
ntArray.java
istPreference.java
ocationManager.java
ediaSaver.java
osaic.java
osaicFrameProcessor.java
osaicPreviewRenderer.java
osaicRenderer.java
nClickAttr.java
nScreenHint.java
anoProgressBar.java
anoUtil.java
anoramaModule.java
hotoController.java
hotoModule.java
ieController.java
referenceGroup.java
referenceInflater.java
reviewFrameLayout.java
reviewGestures.java
roxyLauncher.java
ecordLocationPreference.java
otateDialogController.java
ecureCameraActivity.java
hutterButton.java
oundClips.java
taticBitmapScreenNail.java
torage.java
witchAnimManager.java
humbnail.java
til.java
ideoController.java
ideoModule.java
rawable/TextDrawable.java
i/AbstractSettingPopup.java
i/CameraSwitcher.java
i/CheckedLinearLayout.java
i/CountDownView.java
i/EffectSettingPopup.java
i/ExpandedGridView.java
i/FaceView.java
i/FocusIndicator.java
i/InLineSettingCheckBox.java
i/InLineSettingItem.java
i/InLineSettingMenu.java
i/LayoutChangeHelper.java
i/LayoutChangeNotifier.java
i/LayoutNotifyView.java
i/ListPrefSettingPopup.java
i/MoreSettingPopup.java
i/OnIndicatorEventListener.java
i/OverlayRenderer.java
i/PieItem.java
i/PieRenderer.java
i/PopupManager.java
i/PreviewSurfaceView.java
i/RenderOverlay.java
i/Rotatable.java
i/RotateImageView.java
i/RotateLayout.java
i/RotateTextToast.java
i/Switch.java
i/TimeIntervalPopup.java
i/TimerSettingPopup.java
i/TwoStateImageView.java
i/ZoomRenderer.java