57ce51c772ffd43341e442792b9894cb185ef237 |
|
06-Dec-2012 |
George Mount <mount@google.com> |
Move LightCycle to render directly to GLRootView. Change-Id: Ibe10dc788be1d73582abd982a411cb266a016f4c
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
b7527d13ace7a9f218abaae7473392b0d922df05 |
|
03-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "Hide old panorama on Gingerbread." into gb-ub-photos-bryce
|
fe53ae0fb40c05ca540f500597b68939311eff1c |
|
28-Nov-2012 |
Your Name <jreck@google.com> |
resolved conflicts for merge of 8eae48b0 to gb-ub-photos-bryce Change-Id: I0f4fb6f520874d34bd9e0dbf818d992e595efc3a
|
8eae48b01cab6dc63ba03ebf54bf95a20d3f293e |
|
28-Nov-2012 |
Your Name <jreck@google.com> |
Remove orientation compensation Bug: 7446056 Change-Id: Ie01d7c705bf86db72dff4b3cbf9ee7f4491271cd
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
1de46b764d2c0625d0de56cb315707c3c59b9576 |
|
20-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 43ded1fe: Merge "Fix shutter button missing in pano" into gb-ub-photos-arches * commit '43ded1fea6ea1c513b056f25d34ce37b3f053627': Fix shutter button missing in pano
|
45df1bd45d714decb63ae69c98116c75184459f9 |
|
20-Nov-2012 |
Doris Liu <tianliu@google.com> |
Fix shutter button missing in pano Bug: 7553175 Shutter button in SRI pano mode is missing even though it is set to be visible after coming back from lightcycle. So here we do a layout request to force the shutter button to show. Change-Id: I004cb29e78018ae48639934c615818e644f56bbf
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
54424d9c722b6d40be2eb50ae24e6d8dd17ddcab |
|
16-Nov-2012 |
Angus Kong <shkong@google.com> |
Hide old panorama on Gingerbread. bug:7548642 Change-Id: I5fec50563c492619b11570101841061bb6e9a279
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
943f43f2bf0c58a8e9003dd5100cf9a39670dfd2 |
|
09-Nov-2012 |
John Reck <jreck@google.com> |
Revert "Animate between camera modules" This reverts commit 3e40e8d8a2fecd360fb7fe339ec1c6044e4a70bc. Reverting because it breaks Gingerbread
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
3e40e8d8a2fecd360fb7fe339ec1c6044e4a70bc |
|
07-Nov-2012 |
John Reck <jreck@google.com> |
Animate between camera modules Bug: 7265781 Change-Id: Id226392fc1b14ebe5374d1952c830c960c5588d1
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
20f8a92e29e5edb414fae43f87c2c6890ea8fc84 |
|
24-Oct-2012 |
John Reck <jreck@google.com> |
Add proxy launcher Bug: 7394901 Change-Id: Ibdefb00c3553576995bda5e6a670c53d77f865bd
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
e173ae37dbca2621295434e6014a8346f2e20a1c |
|
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am dff2ace0: rm activity states(AlbumPage,etc) when invisible * commit 'dff2ace04b640fa8103dda8d1c4074c7d5affed8': rm activity states(AlbumPage,etc) when invisible
|
dff2ace04b640fa8103dda8d1c4074c7d5affed8 |
|
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
rm activity states(AlbumPage,etc) when invisible Bug: 7384972 Companion CL for https://googleplex-android-review.googlesource.com/#/c/245256/1 Change-Id: Ifaca126448f6541413d83b5e59625b5fc17b5f2e
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
bae548e18789b503f7a7e89bef0f73d50c8da381 |
|
20-Oct-2012 |
George Mount <mount@google.com> |
am fbcd0807: Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches * commit 'fbcd08074c53fb3001febc4be6ff2216139820fe': Hide the switcher pop-up when the switcher is hidden.
|
b8317ef78fa41224a0a8d43431c3eac8e10772f1 |
|
19-Oct-2012 |
George Mount <mount@google.com> |
Hide the switcher pop-up when the switcher is hidden. Bug 7378703 Change-Id: I8f6bf5fc0431698e66cf2e74a8c4234cc24022e9
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
e810e7bb841524c5b1fd1baaf3b6d7641353bff0 |
|
17-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 47996184: Merge "Larger shutter button for tablets" into gb-ub-photos-arches * commit '479961843c6f9ef3c4af4de61aa359df227112d1': Larger shutter button for tablets
|
d200be24670fe4e455abeef0e684af6370f85a79 |
|
17-Oct-2012 |
Michael Kolb <kolby@google.com> |
Larger shutter button for tablets Bug: 7334841 Constrain width of camera controls Change-Id: I0b9737950ca8a4e48735181931b2792b96f17f93
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
791a107fadc17717f68813b67d1516c1561b9467 |
|
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am ed19156e: Remove old camera classes and xml files. * commit 'ed19156e705efb982b351653a3ea9b15f5a08df7': Remove old camera classes and xml files.
|
ed19156e705efb982b351653a3ea9b15f5a08df7 |
|
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes and xml files. bug:7201108 Change-Id: I80ac607bed5bbc4a05c13b871017a4a54e76767e
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
55f313eb05ead11d7fb8ec3e21b7046d1142151e |
|
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am b4003e72: Merge "New lightcycle assets" into gb-ub-photos-arches * commit 'b4003e7235c3e796a29158b84ad59b3e18233615': New lightcycle assets
|
ebf2df0f2696dd287a8235cf4e7c1cac0103a3de |
|
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
New lightcycle assets Bug: 7331839 Change-Id: I30b6c6f7da98600719e3e30a695564e6e2920e06
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
e0fdab2ccab303a66188569ab8d5ce0c07dcd4c3 |
|
11-Oct-2012 |
John Reck <jreck@google.com> |
am 23f36aca: Merge "Rotation "just works" if you aren\'t pano" into gb-ub-photos-arches * commit '23f36acaacbc6e4b58bad8c47d32a5f40c94d7ba': Rotation "just works" if you aren't pano
|
b662638bf3d3a3edde4f21d0e4cf55a3d416656e |
|
10-Oct-2012 |
John Reck <jreck@google.com> |
Rotation "just works" if you aren't pano Bug: 7314702 Turns out hardware camera and lightcycle both have the same behavior requirements wrt rotation, so pretending lightcycle isn't a panorama will "just work" Change-Id: I460af4a7a5aa5b51cc95c05672042dff10a11dba
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
db5e8fd5db9be26596a044ff6de134982d306dd4 |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 8a66eb64: Fix menu button in capture mode * commit '8a66eb641fbc210130c1257cf713a95f571d609b': Fix menu button in capture mode
|
8a66eb641fbc210130c1257cf713a95f571d609b |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
Fix menu button in capture mode Bug: 7314456 Change-Id: If5288e9a3e0acecfd3b21cdb79c4d1b0b607c48d
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
94bdc875b1c15ec9d05ce05b7c821f2c88c54564 |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
am b27064ec: Merge "Fix face detection circles" into gb-ub-photos-arches * commit 'b27064eca9c488210944e31ec052745cef2b76f7': Fix face detection circles
|
b27064eca9c488210944e31ec052745cef2b76f7 |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
Merge "Fix face detection circles" into gb-ub-photos-arches
|
41d49f0fa2c9c93869bacfd6e7f76299f482e40f |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
Fix face detection circles Bug: 7257939 Adjust to overscale size Change-Id: Ida067ca154faac6651ab8d00ef4388f2491a76c9
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
a3676dee838f425fbee146b46ac0f7d757eba4d3 |
|
09-Oct-2012 |
John Reck <jreck@google.com> |
am 561af393: Hide pie render on switcher popup * commit '561af39348f34db4d67bc954536d6f6cbf296054': Hide pie render on switcher popup
|
561af39348f34db4d67bc954536d6f6cbf296054 |
|
09-Oct-2012 |
John Reck <jreck@google.com> |
Hide pie render on switcher popup Bug: 7301188 Change-Id: Ic9b2ec1f3e83d14c39d07dbd57be2c973fbefa56
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
e9366b305148b7580f839a9cfde5b2185e87ef11 |
|
09-Oct-2012 |
John Reck <jreck@google.com> |
am c9512090: Merge "Use framework orientation" into gb-ub-photos-arches * commit 'c9512090d1026451680250e8ebbe210b3b652395': Use framework orientation
|
032dea1d8406cde556ec0a441e4c90409edf9d63 |
|
08-Oct-2012 |
John Reck <jreck@google.com> |
Use framework orientation Bug: 7292373 Change-Id: I1ec67db0bfe1fa0723f397c4361c9949bea30437
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
4bde82830d2ccee5a8b19cfd99404d85b3fd481e |
|
08-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 9d91b995: Merge "Hide Camera UI in film strip" into gb-ub-photos-arches * commit '9d91b995d46cfed49c0e87da867cc2db05f93adb': Hide Camera UI in film strip
|
812fcbcb099b5ff7b9f9ae8bb4219d57dc29c70c |
|
08-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide Camera UI in film strip Bug: 7303433 Change-Id: I2cb9be4f0cac928793c730e1d84d3ed0673c2554
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
8afac931f3966761e9ce6de6f792fa372a3cdef3 |
|
07-Oct-2012 |
George Mount <mount@google.com> |
am 04594c35: Merge "Don\'t reuse the screen nail from LightCycle\'s capture." into gb-ub-photos-arches * commit '04594c35d7dbbb42a139209e6f9572c02cbe39b3': Don't reuse the screen nail from LightCycle's capture.
|
9a4b58dbf402cf0565e718803d2b18d9c0c7b9dc |
|
07-Oct-2012 |
George Mount <mount@google.com> |
Don't reuse the screen nail from LightCycle's capture. Bug 7301201 Change-Id: I50fc4e6c4796ddb6b7b290fe6adba81853c63e61
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
90c2714a23f6e6f39f5b6e16f1dd3093f80cc021 |
|
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 92447c2d: Merge "Keep the camera when switching modules." into gb-ub-photos-arches * commit '92447c2d42f399c71287decfed8f486c71640907': Keep the camera when switching modules.
|
ae4ca300c875a5ac67c24c48733a88e138a31b48 |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 4f146348: Remove separator line * commit '4f146348f669a6c88b599f63a2601b5d11f3fa46': Remove separator line
|
5d46908dc610e79fc09015167b1021b5e8cceece |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 19aa40f8: Merge "Change menu button to indicators" into gb-ub-photos-arches * commit '19aa40f8a6959b69f394a6247be375dd36413352': Change menu button to indicators
|
759ec0b086344b2741f7a6bd74916071aa9b9045 |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
am da04f24a: New assets * commit 'da04f24a205d92c72c32d7768f0d3b4b1f93512d': New assets
|
92447c2d42f399c71287decfed8f486c71640907 |
|
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Keep the camera when switching modules." into gb-ub-photos-arches
|
4f146348f669a6c88b599f63a2601b5d11f3fa46 |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
Remove separator line Bug: 7299793 Change-Id: I56ca04cef32f7e5ae7366bd94329741178b44aeb
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
1a753f543b84b99b33e1209acfe39cdf2b12297a |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
Change menu button to indicators Bug: 7300737 Change-Id: I0316282f094c12c887547049b2a52aa9cef8ee83
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
da04f24a205d92c72c32d7768f0d3b4b1f93512d |
|
06-Oct-2012 |
Michael Kolb <kolby@google.com> |
New assets Bug: 7283381 Change-Id: I183687f4702e9bc8c5dade550906ee4cadda5415
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
446ac948d8689b4918556629aebb68e0f0a1b68f |
|
06-Oct-2012 |
Michael Kolb <kolby@google.com> |
am f48f2f73: Merge "Hide separator line in Filmstrip" into gb-ub-photos-arches * commit 'f48f2f7356d1ba00fc109e99d0f1224a8ec3c87d': Hide separator line in Filmstrip
|
dc752de315de5aa9cf7c7088f872fd9ad75134ad |
|
06-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide separator line in Filmstrip Bug: 7273673 Change-Id: If6382f6e84042befdcdd105a5a08520a17c76bb1
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
78e0258fa404435f842f9c3eb1761a252aece218 |
|
04-Oct-2012 |
George Mount <mount@google.com> |
am 713a8d32: Merge "Blank out image capture after animation has started." into gb-ub-photos-arches * commit '713a8d32b805e98061f4dedf40e709c571e019ae': Blank out image capture after animation has started.
|
713a8d32b805e98061f4dedf40e709c571e019ae |
|
04-Oct-2012 |
George Mount <mount@google.com> |
Merge "Blank out image capture after animation has started." into gb-ub-photos-arches
|
999ed95fc38b6493a826e7b721cf6c04abb0465a |
|
04-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ce2d4ff8: Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches * commit 'ce2d4ff860ec4552d6032cf3f7386a00f1cd1a19': Change order of cameras in camera switcher
|
ce2d4ff860ec4552d6032cf3f7386a00f1cd1a19 |
|
04-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches
|
b1be74d6833cd55429cc5c34885eddf613d08302 |
|
04-Oct-2012 |
Doris Liu <tianliu@google.com> |
Change order of cameras in camera switcher Bug: 7284010 Change-Id: I1276aa2e1db349f3e91da34da9ebdca253b6b3b4
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
a434b750338f85960d824a0c3f8d8210b8928323 |
|
04-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 0e98d5db: Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches * commit '0e98d5db1b4f472ceaaa9460565514b5899e988f': Adding accessor methods for latency vars and fixing camera latency tests.
|
0e98d5db1b4f472ceaaa9460565514b5899e988f |
|
04-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches
|
d282a28c60ca8f4ee82d519b12e8b0b057b294d4 |
|
03-Oct-2012 |
George Mount <mount@google.com> |
Blank out image capture after animation has started. Bug 7280817 Change-Id: I192da2836b80e396317e9e9676bea660df2cf558
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
6f236b17ab7f0dbf2f8fe8251186410a8e76311c |
|
04-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't switch module if the activity is paused. Bug: 6829498 Change-Id: I4f4ff355124c08d184595ef38482ae7182145383
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
806e575a804e02ca0861c4b28a50887e54830592 |
|
03-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
Adding accessor methods for latency vars and fixing camera latency tests. Change-Id: I302c3010537584a8b1ce9ed31d2bdfbc6d77400b
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
019cd2a91262707cf4f435f255d433666bc71706 |
|
03-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide event blocker when hiding switcher Bug: 7280812 Change-Id: I3c6f668512fc6cddc4f9c54a4ef44ff2e59734d9
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
9d51864d4dfbe71c46531f472364b3483890464b |
|
03-Oct-2012 |
George Mount <mount@google.com> |
Change LightCycle assets. Bug 7279463 Change-Id: I202a0ed79db548199c8f26086dcbff3e134e06a6
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
a5e23d9eb2bc96e7da4c021df2e11c1c43d379cd |
|
03-Oct-2012 |
Michael Kolb <kolby@google.com> |
Completely redo UI Bug: 7274074 Change-Id: Ia406151f9c72030780ef5a290d20c0f2b4b5b11b
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
a2c4440795c9b41e1fa5343d9b99157c7730e8f0 |
|
02-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix issues for reset-to-default dialog box Bug: 7267740 Bug: 7267540 Refine the back behavior for popups and dialog boxes. Change-Id: I86f01cc9156f023d3f84de94e5d02e830cbf144e
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
7433f98826972ea2379a693814362d3cf0cf2847 |
|
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Keep the camera when switching modules. bug:7208909 Change-Id: I14c0df722ecab18c2e81908553212417bb6fd2a9
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
9aca4d711c0c738e8630ca88db0d394d28862480 |
|
30-Sep-2012 |
Michael Kolb <kolby@google.com> |
Set switcher position directly to start module Bug: 7250392 Change-Id: I3dde8070840d4fd0dd557031e11b287791cde20d
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
78711c990e57ce7c6228c5446cfb6902f2a47cb6 |
|
29-Sep-2012 |
Doris Liu <tianliu@google.com> |
Rotate camera modes icons when phone is rotated Bug: 7174120 Extract the orientation event listeners from photo module and video module to cameraActivity. When orientation changes, cameraActivity gets onOrientationChanged() callback, handles the necessary layout changes, and then current active module gets onOrientationChanged() callback. Change-Id: I6d32f025e033460f23c8dd2a7e439a2467fbf036
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
d867ac51170831bf4e6021453fdc4468e10087c7 |
|
27-Sep-2012 |
Michael Kolb <kolby@google.com> |
Asset drop and layout adjustments Bug: 7228487 Bug: 7231814 Bug: 7230994 Added/replaced assets Increased pie menu size and slice background under options Aligned layouts according to UX spec Change-Id: I08ef00f0b917f2222603937dd8a15a3194565d2b
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
9713c56dfe1c298ab0c2c75d324dc69395d1c809 |
|
18-Sep-2012 |
Michael Kolb <kolby@google.com> |
Enable full screen preview Bug: 7191461 Overscale preview texture to fill screen Minor problem with face detection indicators will be fixed later. Change-Id: I5a93048564d69fe05f5a7aa7d6506dec8517e8ea
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
bcaf81f9e730309f8a07d02d130b431eb036a1b3 |
|
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
Keep Camera buttons at the same absolute position Changes: 1) Reload camera switcher, shutter button when onConfigurationChanged is called 2) In PanoramaModule, only show switcher in preview Bug: 7216070 Change-Id: I7c19875e910fe5a54de42edebffec2567eca1f39
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
c6c417b64aa061a98b3b8aa31d5cf1f92f452b93 |
|
27-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Revert "Keep Camera buttons at the same absolute position"" into gb-ub-photos-arches
|
ccfae4fd53e838653f3a967de7776380c102b893 |
|
27-Sep-2012 |
Doris Liu <tianliu@google.com> |
Revert "Keep Camera buttons at the same absolute position" This reverts commit 5b8dcddcc2019037e8691c605bfcecbbae316aeb Change-Id: I0eac812293f9322e33d60df97ead29e88619156e
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
55c6500b5088312d304cfb5f4b015de611142d1d |
|
27-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
|
5b8dcddcc2019037e8691c605bfcecbbae316aeb |
|
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
Keep Camera buttons at the same absolute position Changes: 1) Reload camera switcher, shutter button when onConfigurationChanged is called 2) In PanoramaModule, only show switcher in preview Bug: 7216070 Change-Id: I678811aebd074f5d63edc3a2a4c9f6e7a8c9f883
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
6c14557369a1f0ebdc7565439484b5c1b13eecf4 |
|
27-Sep-2012 |
John Reck <jreck@google.com> |
Play animation before switching modes Bug: 7239564 Mode switching is way too expensive on the UI thread to handle both animating and switching, re-order it to animate then switch (similar to snap) Change-Id: Ida1fad8725bf531e401621c12538c91223977078
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
4d628bcbaf4e6f2330dc9619f2129770863666dc |
|
21-Sep-2012 |
Michael Kolb <kolby@google.com> |
Enable zoom in new UI Bug: 7215450 Added Zoom renderer to PhotoModule and VideoModule Introduced a gesture handler to handle interactions on the preview and disambiguate gestures Modified touch handling in CameraActivity and all the modules to work with gesture handler Change-Id: I427ddb61ad7b14588bcdbe67339aa295e05ac0e0
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
fdb79c492940d46b27702b0be71903f99af7e34f |
|
20-Sep-2012 |
Michael Kolb <kolby@google.com> |
Asset update for shutter; fix for capture Bug: 7175404 Change-Id: Ibb0ba3946866b1bb4d36c1a15e481002c09ccfdb
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
2d3af28f91481d7f3887cb0bb9c5d06375baf787 |
|
19-Sep-2012 |
Michael Kolb <kolby@google.com> |
Add other settings popup to menu Bug: 7170039 Added popup to other settings menu item Included scene mode and whitebalance in popup Change-Id: I9f7a07211b8548a028d5fb02eb28251fc5823fea
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
9f8b479c44e8fafda688ac0fab9882584a94d55f |
|
19-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix back button anomaly when menu is opened Bug: 7191226 Send a cancel event to the activity dispatching to reset Gallery's touch handler Change-Id: I9231c390ccae4cca02da0e02d400cb3425daa15b
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
30abd4ec39e8791ad1189fb42df09e45cd157fc8 |
|
19-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix shutter in capture mode Bug: 7193509 Minor touch regression. Change-Id: I620b416c60469965d7aedeb9904feb30980b7ff4
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
8566e6d534634965a53b536571008bad882b969d |
|
18-Sep-2012 |
Michael Kolb <kolby@google.com> |
Another attempt at fixing switcher/shutter interaction Bug: 7188964 Snap back after ortho movement. Dispatch to shutter or switcher based on gesture. Change-Id: I224fddc86f0fb63c960219dad4625bf88367e600
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
b5b59b88683823d70faac7b3454519d53c51180b |
|
17-Sep-2012 |
Michael Kolb <kolby@google.com> |
Position pie options Bug: 7170039 Fix setting item positions according to UX spec Change-Id: I013f6dc06fd1267442ae9bc7f216ba519cf1383f
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
ba01e4bfd79769ad9b48dfc66167ab812a31e325 |
|
17-Sep-2012 |
Michael Kolb <kolby@google.com> |
Merge "Dispatch touch events to activity, not views" into gb-ub-photos-arches
|
5da800f7a1427066a310a41964d780924c1f1a10 |
|
17-Sep-2012 |
Michael Kolb <kolby@google.com> |
Dispatch touch events to activity, not views Bug: 7173464 CameraActivity needs to dispatch to super activity not view group. Also, no dispatching to hidden views. Change-Id: Ic531467bc7cc5aaf3b75672b574386f990ed8741
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
435a730c5ffedb395797e158413c64288cd7f1c1 |
|
15-Sep-2012 |
Doris Liu <tianliu@google.com> |
Adding support in new camera for video capture With this change, the VIDEO_CAPTURE intent will be handled by the new camera. Bug: 7174617 Change-Id: Ibf2c4141aa096a4474b45486e03321f721f74393
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
b232fdf0a6e2b488e74c0ad505c4eddc3cfb78e0 |
|
14-Sep-2012 |
George Mount <mount@google.com> |
Merge "Hook up the shutter button to lightcycle "done"" into gb-ub-photos-arches
|
90ef46f0248437fbcb2c80c8a65239f4da32b039 |
|
14-Sep-2012 |
Michael Kolb <kolby@google.com> |
Support capture intent Bug: 7166362 Change-Id: Id477525f14144638e59c53366050f431a39c4596
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
cfbf201b06095591a2ae91af2aa4b97a9c4ae9a5 |
|
14-Sep-2012 |
George Mount <mount@google.com> |
Hook up the shutter button to lightcycle "done" Change-Id: If2b5cce55008a0bd825845a9e3fe037542653c92
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
b20535012f5b54e5b3cfa9576c25996bb5f8b9f3 |
|
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Launch in video mode if started with video camera intent. Bug: 7167758 Change-Id: I6d6436deb1898eaa62d21933d852920cb857c596
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
7114364044191d10505145df38d406cbb63dcdba |
|
13-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix shutter button Bug: 7157664 Properly dispatch events to both switcher and shutter. Change-Id: I747e4ddb96a54d317510f88c465dea6316004318
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
ad2031cd71422115983bccef779851debc9d47dc |
|
12-Sep-2012 |
Michael Kolb <kolby@google.com> |
Hide switcher UI when sliding to Gallery Bug: 7148966 Change-Id: I8ca7bfcee8613d2b52c7c1b922901a1fcc1a70cb
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
230a4772485dd6044958ba1215e6445a29b0f845 |
|
11-Sep-2012 |
George Mount <mount@google.com> |
Merge "Change LightCycle switcher icon so that you can differentiate it." into gb-ub-photos-arches
|
e26b8a8d5b7582f04ab2c4dd0c01a5926bcdc16c |
|
11-Sep-2012 |
George Mount <mount@google.com> |
Change LightCycle switcher icon so that you can differentiate it. Change-Id: I70951e20175e75435e10045cbd1a91e78792a3e4
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
9bcfa5739bc3e9b60176cfdeafb172d1b4249b25 |
|
11-Sep-2012 |
Michael Kolb <kolby@google.com> |
Remove video controls form new UI Bug: 7146590 Also, use new shutter button assets. Change-Id: I6d960eb4da2f8a2b7b08b33397c26a41f428a55f
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
8bcec4f62bace9782b9226674bdc9fcf4eb2f62d |
|
11-Sep-2012 |
George Mount <mount@google.com> |
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
|
566f11c903ceae2e53c645f8d630bb1331faf890 |
|
11-Sep-2012 |
Michael Kolb <kolby@google.com> |
New shutter button Bug: 7142696 Moved shutter button behind switcher Added some preliminary resources for photo shutter Fixed some touch handling issues between switcher and shutter Change-Id: Id5ce4065b06c2a3059a44f48a378a9b0b782847e
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
00fea1c7ee987877f7218bfb9a217f4b7f0e90e4 |
|
10-Sep-2012 |
George Mount <mount@google.com> |
Separate build for AOSP and Google panorama modules. Change-Id: If2c87ca2b22408a26c99ff467f93bbd709849eb5
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
ce1d8396924bf4ca9be076cfdf9594c4d33ebd9b |
|
08-Sep-2012 |
Michael Kolb <kolby@google.com> |
Add old panorama module Bug: 7138809 Direct conversion of old panorama activity Hiding switcher during panorama and video recording Limited amount of switching between pano and other modes due to memory leak Change-Id: Id079b258d4b6eaaf000281bf86cd43633ea1528a
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
b19c713286b7beed376ec6c4390e7272a80aa5b9 |
|
06-Sep-2012 |
Michael Kolb <kolby@google.com> |
Adding render overlay and focus indicator create a new render layer as a RotateLayout add focus renderer and overlay focus manager remove IndicatorBar Change-Id: Id5aad03cc2c9760e0449ec16f0d64fae244d10f4
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|
d3a252bb71d119cbaeff55aeaa27dd1f8adadba2 |
|
05-Sep-2012 |
Michael Kolb <kolby@google.com> |
New Camera UI Introduce camera modules Add photo and video module Create new camera activity Doesn't touch current Camera functionality Change-Id: Ia88b8ad69d7d03f900acbe33dcc96e469f46a5ed
/packages/apps/Camera/src/com/android/camera/CameraActivity.java
|