• Home
  • History
  • Annotate
  • only in /packages/apps/Gallery2/src/com/android/camera/
History log of /packages/apps/Gallery2/src/com/android/camera/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e8e2610f112103e77ffc4b583a752302921131d6 09-Jul-2013 Doris Liu <tianliu@google.com> Fix preview thumb and touch target out of sync

Also ensure video module respects system orientation lock

Bug: 9626888
Change-Id: I4d7406c37878446e65d0ad1de3bc6b300acb1b23
(cherry picked from commit dfc939b80f45d969a44caca4bd397ab0828c562d)
til.java
ideoModule.java
6c604d616ff796f1ec41d4ad7212729cf469e8f5 05-Jun-2013 Doris Liu <tianliu@google.com> Update preview size for focus manager after rotation

Bug: 9282724
Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10
(cherry picked from commit c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
hotoUI.java
af65d7ba216eba60651d11d248d20346309375ed 30-May-2013 Michael Kolb <kolby@google.com> Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
dadbad39d82cef83afa7114359a9faf8d195e9fa 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
a1db26536913f1259ad74c5e6e952521c05bf2f0 30-May-2013 Angus Kong <shkong@google.com> Dismiss settings when showing popup in Video mode.

bug:8771618
Change-Id: I889b794c6732b674e26436f950e81f67529012e7
ideoUI.java
0bf8435fa008182f42bb7c506cf735175b98c843 25-May-2013 Doris Liu <tianliu@google.com> Change the order of exposure compensation

Bug: 9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
ameraSettings.java
80a3d636fa38bb78dbc9f224b4944a21a6e3271d 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
655e208d5dc1305d9e4eb5301dec0673136151c9 15-May-2013 Michael Kolb <kolby@google.com> Merge "Correct label position after rotation" into gb-ub-photos-bryce
a0b60f835e51d17a1316fff651a54d11ac2b7d5d 14-May-2013 Michael Kolb <kolby@google.com> Correct label position after rotation

Bug: 8963421

Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
i/PieRenderer.java
6f14590d1ac6d6984fa0db4af668bc897628a6f3 14-May-2013 Doris Liu <tianliu@google.com> Pause face detection when review captured images

Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
hotoUI.java
b298ab636fec3894b9e702eaa0a6028ba03f49b1 09-May-2013 Bart Sears <bsears@google.com> Merge "Close menu in onPause" into gb-ub-photos-bryce
03a3fe53625ec513c0b76fc333f66a16211b2d7b 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
75add6bc6abd314c9244fd667fbd586bf50bf3dc 09-May-2013 Michael Kolb <kolby@google.com> Close menu in onPause

Bug: 8722672

Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
hotoUI.java
fc1baa24c86914c0e808c5aac9724230e44afc87 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
b281a6463f22c75c5b4a7a7079bdb55e484c2d07 08-May-2013 Doris Liu <tianliu@google.com> Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
563e1555cdda8665e25c3afb0c68405df54d1afa 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
67339f9ab0b3d583ee0f519d65617f3ab39c4bd5 07-May-2013 Michael Kolb <kolby@google.com> Add animation to slice selection

Bug: 8826233

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

Bug: 8833788

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

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

Bug: 8826229

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

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

Bug: 8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
i/CameraRootView.java
4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc 03-May-2013 Doris Liu <tianliu@google.com> Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
5a6cbd17a335361ae9c71a1356ea8c956f1353fb 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
b0a1e9fe925be1745bfb224867ee53562e027145 03-May-2013 Angus Kong <shkong@google.com> Don't show settings when popup is shown.

bug:8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
hotoUI.java
f2c86c128401cf92a2e5b351b32dc6f906eed412 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
c43e5b6bd84f5a7635766f70677097f6958f4058 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
9ea4147f6220e3a9fb6f9ae3fef46036919641b4 01-May-2013 Michael Kolb <kolby@google.com> Update location indicator correctly

Bug: 8768592

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

Bug: 8754841

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

Bug: 8753607

Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
i/CameraControls.java
ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304 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
197262c79d6cadad1e1e3461970a7cb9b3d87880 30-Apr-2013 Michael Kolb <kolby@google.com> Remove timer indicator

Bug: 8754833

Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
hotoUI.java
ef87866904722e6d381445a98b61a948e004970e 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
a042bfaa31e514ea0979936d39cde8696fc0ece0 27-Apr-2013 Angus Kong <shkong@google.com> Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
ec0f890e3283acd81cd1e3d2c55c7bf7b2b406d6 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
7824f923763158596b6f184ccb2188e5aeb9e437 26-Apr-2013 Angus Kong <shkong@google.com> Delegate the texture copy to DrawClient.

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

Bug: 8660834

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

Bug: 8719036

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

Bug: 8718884
Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
i/RotatableLayout.java
52a069f0839cbc0bff49ea359a497f65d127ef3b 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
1d8ea53d93e977b5bebead4acf73b03e7514ae92 25-Apr-2013 Doris Liu <tianliu@google.com> Avoid rendering underneath nav bar

Bug: 8647833

Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
i/CameraRootView.java
474c2273f02b2333e0bed22fa40918a0939b5a69 25-Apr-2013 Michael Kolb <kolby@google.com> Merge "New capture animation" into gb-ub-photos-bryce
b22b852c53dff209764249a685725379ebe449ac 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
2e85f98891ffdccb1b7da1945f80af2de5c9a414 25-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
31a50d72488ec057d78dedfce290eab9264baed5 24-Apr-2013 Michael Kolb <kolby@google.com> Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
9366aa90973d7c5750cc0df14c750e19cc0ac899 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
3224646e36b0838c6c07c8ff5e6281eca3cd040d 24-Apr-2013 Sascha Haeberling <haeberling@google.com> Store location for SRI panoramas.

Bug: 8692005

Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
anoramaModule.java
f9adf16cc73ad803dee8e973e9e9205f583e1481 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
ae52b3e3f0f356e1b91e883729d0d82cb40d7a42 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
e3e2554e824f1ed0b4eee9bf26ba67ae9e86abba 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
608f7c9843f48aeccc1678622dc3327958150c31 22-Apr-2013 Michael Kolb <kolby@google.com> Merge "More menu fixes" into gb-ub-photos-bryce
ed97a5eb29908a05f39fa28477a09990db9fb3ee 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
d6e6533a054ea526021c3331a18f93a618442f13 22-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
ed689873c9da338859dc8858c08afa4fa31578f2 22-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
faff668b6f7d0e5d35a65aa926f3af589da6289e 20-Apr-2013 Doris Liu <tianliu@google.com> Fix for camera switcher hard to hit

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

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

Bug: 8002939
Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
ideoModule.java
935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236 19-Apr-2013 Angus Kong <shkong@google.com> Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
ca3875b21375defd0d42c57c05994cd67f0d59cd 19-Apr-2013 Angus Kong <shkong@google.com> Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
a0bdfb2774e9f5aa324dd807dca18f0820d0e31c 18-Apr-2013 Angus Kong <shkong@google.com> Save video using MediaSaveService.

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

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

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

bug:8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
ideoModule.java
5b083f89c9c87f8e19e0942d1d7c2de623e527be 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
b726c83ab60b0ec8e93cad9724857999b3bb8ec5 18-Apr-2013 George Mount <mount@google.com> Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
cf18f7e34ea9c175e0cf10150a339e5ff016a57c 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
f453f1cc2e2c93b4357e3b0fb140f6cd3c119440 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
49ee213fbb0f3434002693889bdae3e7c0d5b378 18-Apr-2013 Sascha Haeberling <haeberling@google.com> Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
1c7d2bc293a1ff824db768756d0309dfbc7f08d8 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
eb8562ae2a6614a0d06d2511ea388c3499fe7480 17-Apr-2013 Sascha Haeberling <haeberling@google.com> Add method for returning SoundPool audio type.

Bug: 7402245

Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
oundClips.java
bc02d7dcb2e9716a1f1e297fef435c8b0275aafe 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
0786c387413d434438257697475cf743661df296 16-Apr-2013 Michael Kolb <kolby@google.com> Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
c246c3717430d5a3d84d2bcbaedbd4094f65bad9 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
f7771f98aed9f253048af7dd8b2a143b9258c139 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
3a9d84201ede2dbf150cce384a894924dc051dd1 15-Apr-2013 Michael Kolb <kolby@google.com> Also, add labels to video menu

Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
ideoMenu.java
3d25de2e7bbf81d49b50be577923f7d99a0180de 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
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e 12-Apr-2013 Michael Kolb <kolby@google.com> Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
af998215b46e2b0ffaa2a47a762ba78f7c522e60 12-Apr-2013 Michael Kolb <kolby@google.com> Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
d8259c06a0ed459eb937cf3bd3ddd79db1ea2533 12-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
0c1d83cf2ca1517c5db6346af9795c9df2257dec 12-Apr-2013 Michael Kolb <kolby@google.com> Fix NPE in PieRenderer

Bug: 8579025

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

Bug: 8536361

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

Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
ewVideoUI.java
2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90 12-Apr-2013 Angus Kong <shkong@google.com> Merge "Integrate FilmStripView." into gb-ub-photos-bryce
84eb27a4656a910fda012c672bfba5a7fc9c9e3d 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
dfde1ea857cb9282feceac90cd7ea029cf215a4f 11-Apr-2013 Doris Liu <tianliu@google.com> Fix camera preview being squished

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

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

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

Bug: 8526929

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

bug:8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
ameraManager.java
ewVideoModule.java
ideoModule.java
fb0636179335a7786ec2c0edf9889a55596db126 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
be3e9920f36caeed3f527d759f6621b1356a3c4f 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
265ea6fd74b7365b494f95f2825b145a75151cf2 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
56b8463ae34900368f735d9ba75ac39d635ad7cc 04-Apr-2013 Michael Kolb <kolby@google.com> Merge "Adjust camera menu further" into gb-ub-photos-bryce
a2dcdfe34f634cc07acfcf92d8829a0373cec969 04-Apr-2013 Angus Kong <shkong@google.com> Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
45ee707fc868ea1d4901435e401c831316f8c22f 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
048a61c7ab3f63688faeb39c253251e58f30c5f8 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
b1666afb8778b371c52e7a9cc7680f1c3a05de34 03-Apr-2013 Angus Kong <shkong@google.com> Don't access mParameters dirty bit in other thread

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

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

Bug: 8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
hotoModule.java
ideoModule.java
fa3b121ebfa10149e4c721838a89a76235a8a0c8 02-Apr-2013 Michael Kolb <kolby@google.com> Merge "Pie design update" into gb-ub-photos-bryce
f79ef61a719d8edc9e76ddc00a6f667db2c363e4 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
fe549800064a2b50211b005dbd2c727b256c44b0 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
36cac0c2a107a05225185430969975f7dfd81c89 02-Apr-2013 Angus Kong <shkong@google.com> Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
3cc47764ae04eef5d50e3c0d070baee9b4a21150 01-Apr-2013 Angus Kong <shkong@google.com> Don't use SynchronousQueue to pass results.

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

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

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

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

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

bug:8438047

Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
ameraManager.java
hotoModule.java
ideoModule.java
4520e5edf00761e8f90e023330d9a90f0de37e70 27-Mar-2013 Doris Liu <tianliu@google.com> Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
44a312b18ada8dc2df6c7eaba27dbcd065acbead 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
53a06d0d76c7f59aa5678f9a8d72f211b3ace773 27-Mar-2013 Angus Kong <shkong@google.com> Remove debug log.

Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
hotoModule.java
dd2e511d212ddc438760b23b8cdf5081daccc9ef 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
0dd47d9e60cc94f30253a656ec893347160832de 26-Mar-2013 Doris Liu <tianliu@google.com> Merge "Adding switcher background back in" into gb-ub-photos-bryce
8b2e6d4d656bc7e8e4c844269d9da63fa67855d6 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
e5265447dddd9d48c4c78192bd21a6aba5588f9f 22-Mar-2013 Michael Kolb <kolby@google.com> Fix NPE in Camera

Bug: 8409508

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

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

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

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

Bug: 8391082

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

Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
xif.java
anoramaModule.java
ea784b705602cdc424bab9b310ba21fdd95919eb 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
215bb750dcb21e449227acb3cdf76da3cb6173a2 13-Mar-2013 Angus Kong <shkong@google.com> Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
a60926e11b0488c9ed58d60cc4384a831f3f0e0e 22-Feb-2013 Angus Kong <shkong@google.com> Horizontal scrollable filmstrip view.

Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
ata/CameraDataAdapter.java
i/FilmStripView.java
730685b2b4c286d32d97f92283d12254df284f0c 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
40abb46e3b7f9d3ec0a354fa38e1150752656e33 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
d15e43fb5295ae0cf6af45663043d603e2e181ba 13-Mar-2013 Michael Kolb <kolby@google.com> Merge "Fix Monkey NPE" into gb-ub-photos-bryce
1092d2719c55d3ad12d557ac003040a87e6e7ffc 13-Mar-2013 Michael Kolb <kolby@google.com> Fix Monkey NPE

Bug: 8377895

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

Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
i/CameraSwitcher.java
f37648b877bf6029d7afead31e965b473114c89c 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
6a48f359bc69e442c47bffa744b8980945a98b92 12-Mar-2013 Michael Kolb <kolby@google.com> Open camera only once in Video module

Bug: 8272736

Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
ideoModule.java
54c1256ffd0f578f4b33680c54d50ab6901d9098 11-Mar-2013 Michael Kolb <kolby@google.com> Merge "Spring cleaning" into gb-ub-photos-bryce
b28942d44bcfcef145aece58545b07332a741c05 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
de175c806c524e08b4ca7c6ec991a5610c3856d9 11-Mar-2013 Michael Kolb <kolby@google.com> Don't record video before preview is started

Bug: 8358998

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

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

Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
i/CameraSwitcher.java
7298e88db5eabc049da1ba3b092f9800a5ccedad 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
8d2d0f5f0f7fffce9dbcc70da6924af545eba26d 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
c7fe2c5b1792edfc4054022e72ab3f45e272f361 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
2d4c57ae2bf831aa347a978d4509f75e986b897b 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
edc63ddadb7c256aba3c8452e419268032185ada 26-Feb-2013 Michael Kolb <kolby@google.com> Use cross fade rotation animation

Bug: 8257846

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

Bug: 8133672

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

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

Bug: 7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
ideoModule.java
a96e8879473c9f9c937a5f14dbbd35579b4d0952 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
1bf8b9a5b418891836435f4ec502846640368690 19-Feb-2013 Michael Kolb <kolby@google.com> Fix AF animation

Bug: 8219462

Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
ocusOverlayManager.java
i/PieRenderer.java
d9de7afa6c343e85b9c2c0221ca280c69a349c5f 16-Feb-2013 Doris Liu <tianliu@google.com> Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
9a32480db4e07fe437dd119d6f1d8471382d503f 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
ace62b69bd53518faea7be986f6c7481b271ca3f 16-Feb-2013 John Reck <jreck@google.com> Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
a3dc2c0dd75f4659146fcd257ce32acc3800ae5f 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
a700cb4bd9735d1b0cdb1ef1265932ba5c120dfb 14-Feb-2013 Michael Kolb <kolby@google.com> New capture animation

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

Bug: 8049510

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

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

bug:8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
ideoModule.java
bcdad08ff2530da1b0a6991449ff9bb2998967ee 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
61b332d8fbed8772d01a08db82d0dc388b649013 11-Feb-2013 Doris Liu <tianliu@google.com> Merge "Lock focus during countdown" into gb-ub-photos-bryce
a6a3be3200f50dd1d18e9f2e970f4b6eac7af86c 09-Feb-2013 Doris Liu <tianliu@google.com> Fix camera setting icons appearing in wrong place

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

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

Bug: 8028546

Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
omboPreferences.java
52fe00244742dbae0072d15f73dab54a55271b56 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
346a15d3c7452927b3088a2c70410b90dfc36180 01-Feb-2013 John Reck <jreck@google.com> Merge "Animate between photo modules" into gb-ub-photos-bryce
aa7397114c5ea228efb0eb4a2f8eb625b08288e3 07-Nov-2012 John Reck <jreck@google.com> Animate between photo modules

Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
ameraActivity.java
ameraScreenNail.java
c099398cfe60422d73281e66de209c4837284c88 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
25668cd6ed661c59295cb65348a126fb245757d4 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