summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use MediaMuxer for the video trim and mute.ztenghui2013-04-103-31/+183
| | | | | | bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
* Merge "Remove redudant setName" into gb-ub-photos-bryceztenghui2013-04-041-1/+0
|\
| * Remove redudant setNameztenghui2013-04-041-1/+0
| | | | | | | | Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
* | Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryceJohn Hoford2013-04-041-0/+7
|\ \
| * | fixed the value that quality was getting set toJohn Hoford2013-04-031-0/+7
| | | | | | | | | | | | Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
* | | Merge "Adjust camera menu further" into gb-ub-photos-bryceMichael Kolb2013-04-035-160/+143
|\ \ \
| * | | Adjust camera menu furtherMichael Kolb2013-04-035-160/+143
| | | | | | | | | | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
* | | | Merge "Don't access mParameters dirty bit in other thread" into ↵Angus Kong2013-04-031-12/+8
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Don't access mParameters dirty bit in other threadAngus Kong2013-04-031-12/+8
| |/ / | | | | | | | | | Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
* | | Improve black bar to keep camera controls in placeDoris Liu2013-04-035-36/+157
| | | | | | | | | | | | | | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
* | | fix touch action in drawJohn Hoford2013-04-031-2/+2
|/ / | | | | | | Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
* | Fix segfaults in RS filtersnicolasroard2013-04-021-2/+11
| | | | | | | | | | | | | | | | We did not recreate the filters in all cases when the input size change. bug:8530112 Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
* | Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryceRuben Brunk2013-04-024-3/+77
|\ \
| * | Speed improvements for ExifOutputStream.Ruben Brunk2013-04-024-3/+77
| |/ | | | | | | Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
* | Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryceJohn Hoford2013-04-021-1/+3
|\ \
| * | fix calling Allocation.copyFrom without contextJohn Hoford2013-04-021-1/+3
| | | | | | | | | | | | | | | bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
* | | Merge "Make stopPreview synchronous." into gb-ub-photos-bryceAngus Kong2013-04-021-0/+3
|\ \ \ | |/ / |/| |
| * | Make stopPreview synchronous.Angus Kong2013-04-021-0/+3
| |/ | | | | | | | | bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
* | Merge "Cleanup sloppy memory handling in ExifOutputStream." into ↵Ruben Brunk2013-04-021-4/+3
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Cleanup sloppy memory handling in ExifOutputStream.Ruben Brunk2013-04-021-4/+3
| |/ | | | | | | Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
* | Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryceBobby Georgescu2013-04-023-0/+14
|\ \ | |/ |/|
| * Usage statistics for photo and video captureBobby Georgescu2013-04-023-0/+14
| | | | | | | | | | Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
* | Fix stickiness issues with UInicolasroard2013-04-011-9/+11
| | | | | | | | | | | | | | | | The renderGeometryIcon() function shouldn't be synchronized -- it's independent of the rest of the pipeline and is only used to apply a given geometry. Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
* | Don't try freeing resources on a different thread..nicolasroard2013-04-011-1/+0
| | | | | | | | | | | | | | | | | | This call to freeResources happens on the main thread. It's also not really useful. The geometry instance shouldn't be shared either. bug:8522497 Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
* | Changed editor back button behavior.Ruben Brunk2013-04-011-7/+2
| | | | | | | | | | Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
* | Merge "Change panels organization. Also fixes border updates handling." into ↵Ruben Brunk2013-04-023-12/+40
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Change panels organization. Also fixes border updates handling.Ruben Brunk2013-04-013-12/+40
| | | | | | | | | | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
* | | Merge "Pie design update" into gb-ub-photos-bryceMichael Kolb2013-04-018-153/+343
|\ \ \ | |/ / |/| |
| * | Pie design updateMichael Kolb2013-04-018-153/+343
| |/ | | | | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
* | Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryceAngus Kong2013-04-011-4/+14
|\ \
| * | Handle InterruptedException in waitDoneAngus Kong2013-04-011-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Dirty bit for mParameters should be set properly if getParameters is not finished. bug:8517092 Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
* | | Merge "Added apply UI callbacks for rotate/mirror operations." into ↵Ruben Brunk2013-04-014-1/+59
|\ \ \ | |/ / |/| | | | | gb-ub-photos-bryce
| * | Added apply UI callbacks for rotate/mirror operations.Ruben Brunk2013-04-014-1/+59
| | | | | | | | | | | | Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
* | | Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryceAngus Kong2013-04-011-41/+27
|\ \ \
| * | | Don't use SynchronousQueue to pass results.Angus Kong2013-04-011-41/+27
| | |/ | |/| | | | | | | | | | bug:8517092 Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
* | | Merge "Usage statistics for camera settings" into gb-ub-photos-bryceBobby Georgescu2013-04-011-3/+4
|\ \ \
| * | | Usage statistics for camera settingsBobby Georgescu2013-04-011-3/+4
| |/ / | | | | | | | | | Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
* / / Enforce bmp type in pool, handle MTP image decode failureBobby Georgescu2013-04-012-6/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | - GalleryBitmapPool didn't reject bitmap types other than ARGB_8888 which could lead to problems when a different type is used for recycling. - BitmapFactory throws an exception rather than returning null when image decoding fails and an existing bitmap was supplied for recycling, even if the failure was not caused by the use of that bitmap. When decoding things from an MTP device, we need to handle this since unsupported formats may be returned. Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
* | Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryceAngus Kong2013-04-011-1/+1
|\ \
| * | Fix NPE when reconnecting camera.Angus Kong2013-04-011-1/+1
| |/ | | | | | | | | bug:8513852 Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
* | Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryceBobby Georgescu2013-04-013-15/+35
|\ \ | |/ |/|
| * Preliminary Album grid header in new galleryBobby Georgescu2013-04-013-15/+35
| | | | | | | | Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
* | Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into ↵George Mount2013-04-015-84/+82
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Remove ImageCache from PhotoProvider in favor of MediaCache.George Mount2013-03-295-84/+82
| | | | | | | | | | | | Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
* | | Merge "Fix double-tap behaviour" into gb-ub-photos-brycenicolasroard2013-03-302-1/+12
|\ \ \
| * | | Fix double-tap behaviournicolasroard2013-03-302-1/+12
| | | | | | | | | | | | | | | | Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
* | | | Fixes some state synchronization issuesnicolasroard2013-03-302-7/+5
|/ / / | | | | | | | | | Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
* | | Merge "Implements progressive rendering" into gb-ub-photos-brycenicolasroard2013-03-307-34/+165
|\ \ \
| * | | Implements progressive renderingnicolasroard2013-03-297-34/+165
| | | | | | | | | | | | | | | | Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
* | | | Merge "Added "discard unsaved changes" behavior for exiting." into ↵Ruben Brunk2013-03-301-15/+47
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce