| 3df202dbe7e564a117093cb55663ba76d1c1d96c |
|
16-Jan-2013 |
George Mount <mount@google.com> |
Fix various ANRs in camera caused by GLThread owning texture ids.
Bug 7997944
Bug 7989281
Because the GLThread is responsible for acquiring the texture
IDs, getting a SurfaceTexture from CameraScreenNail can block
as long as the GLThread isn't running. Likewise, if the
SurfaceTexture is released, another thread could get a null
when requesting the SurfaceTexture.
Change-Id: Ic2e31032d0c47dfefc547f97b54cbcaa03bfc6a2
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| a489e380036b047daba972115b6a2fd872098b5f |
|
15-Jan-2013 |
George Mount <mount@google.com> |
Fixed ANR in VideoModule.
Bug 7990250
Any intent that launched the VideoModule before the PhotoModule
was causing the VideoModule to deadlock. The VideoModule can
now complete its own initialization. Likewise, when resuming,
it no longer starts the preview on the UI thread, causing a
deadlock.
Change-Id: I91ce1a437e57379f83dd48ffc96a0c49bf2dc5b7
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 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/VideoModule.java
|
| cecf7ad37d3d373b776fa4f5e6bb34c1574fe489 |
|
20-Nov-2012 |
Michael Kolb <kolby@google.com> |
am b2443bad: Enable play button in video review
* commit 'b2443bada6ac9b65006d825605c783ddaf825bef':
Enable play button in video review
|
| b2443bada6ac9b65006d825605c783ddaf825bef |
|
20-Nov-2012 |
Michael Kolb <kolby@google.com> |
Enable play button in video review
Bug: 7554804
Change-Id: I435f34c6fb36d0b5c2d220ed6cfb630836ade3c1
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 5b6a934840b370d296046c4929899a43895b1ff8 |
|
03-Nov-2012 |
Doris Liu <tianliu@google.com> |
Add more talk back content for video recording
Bug: 7434841
Announce "video recording has started/stopped" in accessibility.
Also made compatible with gingerbread.
Change-Id: I6d4af99f57ab56716deeadbdd700b5f6a5110199
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| c6c123c85fdc2bf9a9f93fd25f3b951c016a67c0 |
|
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Add overlay control for maximum recording length.
bug:7075393
Change-Id: Iaf7bdf81c6bd2c09e71d2ac1210c86cfde00398a
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| cd4b5bd53fe9cbf3cdccfbba94f2bc12250eb187 |
|
24-Oct-2012 |
Iliyan Malchev <malchev@google.com> |
Revert "Use photo picture size for video snapshot"
This reverts commit 8a91b608b73eac4677eba27db621b48ce2e66849
We need to reinstate the aspect-ratio matching code in the camera app to
resolve an underlying hardware limitation where the snapshot pipeline must have
the same aspect ratio as the preview/encoder pipeline. A matching CL will go
into the HAL.
Bug: 7372274
Change-Id: I6daa104a4524a7af3721049d03313416fed60f83
Signed-off-by: Iliyan Malchev <malchev@google.com>
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 8a91b608b73eac4677eba27db621b48ce2e66849 |
|
19-Oct-2012 |
Michael Kolb <kolby@google.com> |
Use photo picture size for video snapshot
Bug: 7331463
Change-Id: I21bcb4bb700b79b2d32e37b666b924e0eae3c0fd
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| b1ddf5700f9e3950cead691cab57c4bbf03e577d |
|
18-Oct-2012 |
Michael Kolb <kolby@google.com> |
Fix touch handling on menu button
Bug: 7371667
Also fixes review buttons;
Fixes layout of buttons for Nakasi
Change-Id: I2343f2bc5b4d3a4de3373cc29c3fb9640ad48a08
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| a486af36252dd394696926e27bd2c97623debee7 |
|
17-Oct-2012 |
Michael Kolb <kolby@google.com> |
Show flash indicator in video mode
Bug: 7357911
For those that don't see the flash being on.
Change-Id: Idf77b049c36abc8b899cad79ed57de117612a486
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 5e4ea5b07a06795a2af3bab8e07e7760d2741f78 |
|
17-Oct-2012 |
Michael Kolb <kolby@google.com> |
Add background to camera controls
Bug: 7334946
Change-Id: I479bd52c27214009532aab136919c20ff01f1728
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| bab66b2479fec953811dba84633b24f95b138c34 |
|
17-Oct-2012 |
John Reck <jreck@google.com> |
Respect screen lock for capture animation
Bug: 7363502
Change-Id: I082ca1ed85cd8b67b8c0cf0bfce0a58bbf1f30f0
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 5bf0244bc2ccc8de9950baf3edd2868b5393d716 |
|
17-Oct-2012 |
John Reck <jreck@google.com> |
Remove oversizing path from CameraScreenNail
Bug: 7302956
Change-Id: I237ba0f33358f05becbf228d1e342ad069aaceac
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| eec0ab92b1c9c32bf1e36bddb360386879f74615 |
|
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove unused drawables and xml files.
bug:7201108
Change-Id: Idc831de134e492fe4bbe4071b69a54fea42e65bc
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 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/VideoModule.java
|
| 17a04fb7378effcef5728b5b21442a59fb88572d |
|
15-Oct-2012 |
Michael Kolb <kolby@google.com> |
Don't show menu on tap
Bug: 7344432
Change-Id: Ie611492cffbda8d6c7249e3f76daa43b5ff89a6b
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 0ad5161f6fd4790f0934de9497c10660a2186d0a |
|
15-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide menu button when popup is out
Bug: 7345627
Change-Id: Ibd3e2eebc2f1b061556afec7752ebc74508f362d
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 0af8a3b2ce98424614dd2ac33ec896142851dab5 |
|
15-Oct-2012 |
Michael Kolb <kolby@google.com> |
Set actual zoom value in initialize
Bug: 7346114
Change-Id: I246d1fe202da9b3fd0f4f016259dea6a929e47a5
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 5ed54678384a922550428bb7ba1a3f2475c70bd3 |
|
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
Show zoom ratio
Bug: 7257941
Change-Id: I9177e8d5a480bc952e73c7ff04656e1520f34805
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 3851712c5a250c6764c894b99984e262a8f206a4 |
|
10-Oct-2012 |
John Reck <jreck@google.com> |
Update display rotation in onOrientationChanged
Bug: 7314703
Change-Id: Ic298077ee6cf5fef872cd0c4efae52c305e970e5
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 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/VideoModule.java
|
| 6f54ad9e32b77db645f31c45b768af221e80e207 |
|
09-Oct-2012 |
Michael Kolb <kolby@google.com> |
Fix pie after config change
Bug: 7313088
Change-Id: I79865553be45afd8224bef0351cc681d5e786e92
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 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/VideoModule.java
|
| 032dea1d8406cde556ec0a441e4c90409edf9d63 |
|
08-Oct-2012 |
John Reck <jreck@google.com> |
Use framework orientation
Bug: 7292373
Change-Id: I1ec67db0bfe1fa0723f397c4361c9949bea30437
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| fd187ac6cfd6129882ae0bcea1034f4d18fcdff8 |
|
08-Oct-2012 |
Michael Kolb <kolby@google.com> |
Back key dismisses menu
Bug: 7302010
Change-Id: I527401fabb8c56374c985a388df9af8f6e469574
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 46b602f080aaf39a365962c69ea39b917cce248e |
|
07-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide switcher during video recording
Bug: 7301580
Change-Id: If0a339b53268bdb128c240f6c46f49c3a817d57d
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| da04f24a205d92c72c32d7768f0d3b4b1f93512d |
|
06-Oct-2012 |
Michael Kolb <kolby@google.com> |
New assets
Bug: 7283381
Change-Id: I183687f4702e9bc8c5dade550906ee4cadda5415
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 9aea54021361008a3515b73cdbf5f3387a067232 |
|
06-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Remove "Restore defaults" option from camera and video camera" into gb-ub-photos-arches
|
| 69853ec0cefd7efae87db0f81947f8789c42249d |
|
06-Oct-2012 |
Michael Kolb <kolby@google.com> |
Hide menu during video recording
Bug: 7289070
Change-Id: Iad59e2e181db223ea1c6eb8dcc10363a90583e75
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 57abb9e7d8c88de1431b1af75b2871bee3e09e42 |
|
06-Oct-2012 |
Doris Liu <tianliu@google.com> |
Remove "Restore defaults" option from camera and video camera
Bug: 7298919
Change-Id: Id1cfc50f8fbae0433fb506789fd63e5254716574
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| ccd32dfd9fe67daff7a428c4fc8fb5e67cfef906 |
|
05-Oct-2012 |
Doris Liu <tianliu@google.com> |
Disable white balance when scene mode is non-auto
Bug: 7286464
Change-Id: Ifa8b56c060a5c1894091f0f2074263b5cec7e1d9
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 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/VideoModule.java
|
| f04692066fc7087560248b003c49e0377c056edf |
|
03-Oct-2012 |
Doris Liu <tianliu@google.com> |
Adding second-level popup for camera settings
Bug: 7232358
Change-Id: I01a5295481c6589bf513a3f96a39e2f8872a7955
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| f04622662acfd284c6d7026caf8ec457856c9e80 |
|
03-Oct-2012 |
Michael Kolb <kolby@google.com> |
A regression in VideoModule
Bug: 7274074
Show menu on button press in video module
Change-Id: I876fe4952ebe0d34f301a48ae88a85bf3c143201
/packages/apps/Camera/src/com/android/camera/VideoModule.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/VideoModule.java
|
| f99fd501c9cbff7617129af36707d1e22952aa31 |
|
03-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix thread anti-pattern.
Do not start a thread and join immediately.
bug:7275076
Change-Id: I158016787e728c2a27cee18304ad42161bc60105
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 0185ee6471d7584bf74c0f15e1ccf1376a01c7c5 |
|
03-Oct-2012 |
Michael Kolb <kolby@google.com> |
Merge "Enable tapping on menu" into gb-ub-photos-arches
|
| f46fea16ab8391c701859ed5d5fea757f6843d5a |
|
03-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Fix ANR in VideoModule.getThumbnail." into gb-ub-photos-arches
|
| a2c4440795c9b41e1fa5343d9b99157c7730e8f0 |
|
02-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix issues for reset-to-default dialog box
Bug: 7267740
Bug: 7267540
Refine the back behavior for popups and dialog boxes.
Change-Id: I86f01cc9156f023d3f84de94e5d02e830cbf144e
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 55f0d13040df45c75704df9d633b444cb36f2465 |
|
02-Oct-2012 |
Michael Kolb <kolby@google.com> |
Enable tapping on menu
Bug: 7267773
Change-Id: Id104ffc57c317def203fc99ad344e8332a2cbe97
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 1acc316227cf39a5c5eead6b307b8b3a76f5e284 |
|
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix ANR in VideoModule.getThumbnail.
New UI does not have small thumbnail. Remove all the code related
to small thumbnail.
bug:7270478
Change-Id: I1932497523d892a4edeea7e8746c416d66e87df5
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 9dea0f8cacc6e58b3a078e45435af61fe48e33b9 |
|
01-Oct-2012 |
Michael Kolb <kolby@google.com> |
Use capture animation for video snapshot
Bug: 7248448
Change-Id: I09cde30bd3b397650425bf5aa307e90fbae466d1
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 3ce75c9a73de62e311beb79bdc8b5a2e7a096a81 |
|
30-Sep-2012 |
Doris Liu <tianliu@google.com> |
Fix settings popup orientation issue
Bug: 7238919
Also rotate settings popup in VideoModule when phone is rotated.
Change-Id: I9a4a8e04b68d2ed0d03c279dbef4ae2c6c76fb9b
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 471c997edfddccfa0762fa720c82cc95777584e8 |
|
29-Sep-2012 |
John Reck <jreck@google.com> |
Fix creating the RenderOverlay in onConfigurationChanged
Bug: 7256402
Change-Id: I42bd5307b051c010a84e1e748f392e4cd29b2023
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 78711c990e57ce7c6228c5446cfb6902f2a47cb6 |
|
29-Sep-2012 |
Doris Liu <tianliu@google.com> |
Rotate camera modes icons when phone is rotated
Bug: 7174120
Extract the orientation event listeners from photo module and video module
to cameraActivity. When orientation changes, cameraActivity gets onOrientationChanged()
callback, handles the necessary layout changes, and then current active module gets
onOrientationChanged() callback.
Change-Id: I6d32f025e033460f23c8dd2a7e439a2467fbf036
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| a82ad5a26428ae584bed4fdb1d4fa4b99fd783f5 |
|
28-Sep-2012 |
Michael Kolb <kolby@google.com> |
Add renderers again after config change
Bug: 7250440
Change-Id: I7965dcf22637d440486530e47cd201a81f8d2232
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 1cf29b911c1d8035c6862994df3cc8d4e40f31ba |
|
28-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix swipe to Gallery in different orientations
Bug: 7245761
Change-Id: Ifd315a87a09ff239052899e441a929863c1c6207
/packages/apps/Camera/src/com/android/camera/VideoModule.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/VideoModule.java
|
| 8042e7045f3e11dd49d40eebe603eb5fe12d711a |
|
26-Sep-2012 |
Michael Kolb <kolby@google.com> |
Merge focus ring and radial menu
Bug: 7233185
Both items get rendered together, and their individual states depend
on each other, so it made sense to merge them.
Show dots while focusing
Adjust initial fade animation
Change-Id: Ic3acbb3c052928e270416063c79d9a5a1ba6d417
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 571a6f842d972e4ac5eccfd16ed639b6779ebf98 |
|
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix focus touch and enable buttons
Bug: 7227829
Bug: 7225629
Bug: 7225010
Bug: 7198111
Instead of dispatching directly to FocusOverlayManager call the
module's onSingleTapUp method to perform necessary checks.
Add review buttons as touch targets.
Change-Id: Ida57a1cb7fd165eb84308785f572f9955e41c007
/packages/apps/Camera/src/com/android/camera/VideoModule.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/VideoModule.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/VideoModule.java
|
| 33af07933620f622c5922ce56189ec7d25bd55d7 |
|
20-Sep-2012 |
Michael Kolb <kolby@google.com> |
Add VideoController to VideoModule
Bug: 7198600
Change-Id: I6bdab5ad173a0a9ca705ad031555304c98ada3b9
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| b2bdc1e7eafd403f432aae323f965bdc298c0931 |
|
18-Sep-2012 |
Doris Liu <tianliu@google.com> |
Adjust videoModule layout for configuration changes
camera_app_root had been changed from LinearLayout to RelativeLayout, but videoModule still casted the camera_app_root to LinearLayout, which caused ClassCastException. This CL fixed the issue.
Bug: 7151459
Change-Id: I04922d043415c5d6720db96871b58b2b71f20d29
/packages/apps/Camera/src/com/android/camera/VideoModule.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/VideoModule.java
|
| 90ef46f0248437fbcb2c80c8a65239f4da32b039 |
|
14-Sep-2012 |
Michael Kolb <kolby@google.com> |
Support capture intent
Bug: 7166362
Change-Id: Id477525f14144638e59c53366050f431a39c4596
/packages/apps/Camera/src/com/android/camera/VideoModule.java
|
| 01725fad5b5b881ccbdb95ff6e6cd4ac3ec720e0 |
|
13-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Avoid sending messages if the activity is finishing." into gb-ub-photos-arches
|
| fe269902ba8522e01baa9be45755779f050c1d6c |
|
11-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Avoid sending messages if the activity is finishing.
The messages has references to activities. Do not send
the messages if the activity is finishing. So the
activity can be garbage collected sooner.
bug:7107047
Change-Id: I23248445cd7d87617ebfce54c5bf8d0465b0d21a
/packages/apps/Camera/src/com/android/camera/VideoModule.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/VideoModule.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/VideoModule.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/VideoModule.java
|