Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use MediaMuxer for the video trim and mute. | ztenghui | 2013-04-10 | 2 | -31/+179 |
| | | | | | | bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0 | ||||
* | Merge "Remove redudant setName" into gb-ub-photos-bryce | ztenghui | 2013-04-04 | 1 | -1/+0 |
|\ | |||||
| * | Remove redudant setName | ztenghui | 2013-04-04 | 1 | -1/+0 |
| | | | | | | | | Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c | ||||
* | | Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce | John Hoford | 2013-04-04 | 1 | -0/+7 |
|\ \ | |||||
| * | | fixed the value that quality was getting set to | John Hoford | 2013-04-03 | 1 | -0/+7 |
| | | | | | | | | | | | | Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4 | ||||
* | | | Merge "Adjust camera menu further" into gb-ub-photos-bryce | Michael Kolb | 2013-04-03 | 5 | -160/+143 |
|\ \ \ | |||||
| * | | | Adjust camera menu further | Michael Kolb | 2013-04-03 | 5 | -160/+143 |
| | | | | | | | | | | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40 | ||||
* | | | | Merge "Don't access mParameters dirty bit in other thread" into ↵ | Angus Kong | 2013-04-03 | 1 | -12/+8 |
|\ \ \ \ | |_|/ / |/| | | | | | | | gb-ub-photos-bryce | ||||
| * | | | Don't access mParameters dirty bit in other thread | Angus Kong | 2013-04-03 | 1 | -12/+8 |
| |/ / | | | | | | | | | | Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063 | ||||
* | | | Improve black bar to keep camera controls in place | Doris Liu | 2013-04-03 | 5 | -36/+157 |
| | | | | | | | | | | | | | | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b | ||||
* | | | fix touch action in draw | John Hoford | 2013-04-03 | 1 | -2/+2 |
|/ / | | | | | | | Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d | ||||
* | | Fix segfaults in RS filters | nicolasroard | 2013-04-02 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | We did not recreate the filters in all cases when the input size change. bug:8530112 Change-Id: I4cb47498532618271b90e56c01ec63ad991db787 | ||||
* | | Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce | John Hoford | 2013-04-02 | 1 | -1/+3 |
|\ \ | |||||
| * | | fix calling Allocation.copyFrom without context | John Hoford | 2013-04-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164 | ||||
* | | | Merge "Make stopPreview synchronous." into gb-ub-photos-bryce | Angus Kong | 2013-04-02 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Make stopPreview synchronous. | Angus Kong | 2013-04-02 | 1 | -0/+3 |
| |/ | | | | | | | | | bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6 | ||||
* | | Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce | Bobby Georgescu | 2013-04-02 | 2 | -0/+10 |
|\ \ | |/ |/| | |||||
| * | Usage statistics for photo and video capture | Bobby Georgescu | 2013-04-02 | 2 | -0/+10 |
| | | | | | | | | | | Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984 | ||||
* | | Fix stickiness issues with UI | nicolasroard | 2013-04-01 | 1 | -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.. | nicolasroard | 2013-04-01 | 1 | -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 Brunk | 2013-04-01 | 1 | -7/+2 |
| | | | | | | | | | | Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b | ||||
* | | Merge "Change panels organization. Also fixes border updates handling." into ↵ | Ruben Brunk | 2013-04-02 | 3 | -12/+40 |
|\ \ | | | | | | | | | | gb-ub-photos-bryce | ||||
| * | | Change panels organization. Also fixes border updates handling. | Ruben Brunk | 2013-04-01 | 3 | -12/+40 |
| | | | | | | | | | | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe | ||||
* | | | Merge "Pie design update" into gb-ub-photos-bryce | Michael Kolb | 2013-04-01 | 8 | -153/+343 |
|\ \ \ | |/ / |/| | | |||||
| * | | Pie design update | Michael Kolb | 2013-04-01 | 8 | -153/+343 |
| |/ | | | | | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb | ||||
* | | Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce | Angus Kong | 2013-04-01 | 1 | -4/+14 |
|\ \ | |||||
| * | | Handle InterruptedException in waitDone | Angus Kong | 2013-04-01 | 1 | -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 Brunk | 2013-04-01 | 4 | -1/+59 |
|\ \ \ | |/ / |/| | | | | | gb-ub-photos-bryce | ||||
| * | | Added apply UI callbacks for rotate/mirror operations. | Ruben Brunk | 2013-04-01 | 4 | -1/+59 |
| | | | | | | | | | | | | Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640 | ||||
* | | | Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce | Angus Kong | 2013-04-01 | 1 | -41/+27 |
|\ \ \ | |||||
| * | | | Don't use SynchronousQueue to pass results. | Angus Kong | 2013-04-01 | 1 | -41/+27 |
| | |/ | |/| | | | | | | | | | | bug:8517092 Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d | ||||
* | | | Merge "Usage statistics for camera settings" into gb-ub-photos-bryce | Bobby Georgescu | 2013-04-01 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Usage statistics for camera settings | Bobby Georgescu | 2013-04-01 | 1 | -3/+4 |
| |/ / | | | | | | | | | | Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647 | ||||
* / / | Enforce bmp type in pool, handle MTP image decode failure | Bobby Georgescu | 2013-04-01 | 2 | -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-bryce | Angus Kong | 2013-04-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix NPE when reconnecting camera. | Angus Kong | 2013-04-01 | 1 | -1/+1 |
| |/ | | | | | | | | | bug:8513852 Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3 | ||||
* | | Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce | Bobby Georgescu | 2013-04-01 | 3 | -15/+35 |
|\ \ | |/ |/| | |||||
| * | Preliminary Album grid header in new gallery | Bobby Georgescu | 2013-04-01 | 3 | -15/+35 |
| | | | | | | | | Change-Id: I90942de920795aedc5475f23cc3ede459949cc16 | ||||
* | | Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into ↵ | George Mount | 2013-04-01 | 4 | -75/+73 |
|\ \ | | | | | | | | | | gb-ub-photos-bryce | ||||
| * | | Remove ImageCache from PhotoProvider in favor of MediaCache. | George Mount | 2013-03-29 | 4 | -75/+73 |
| | | | | | | | | | | | | Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304 | ||||
* | | | Merge "Fix double-tap behaviour" into gb-ub-photos-bryce | nicolasroard | 2013-03-30 | 2 | -1/+12 |
|\ \ \ | |||||
| * | | | Fix double-tap behaviour | nicolasroard | 2013-03-30 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e | ||||
* | | | | Fixes some state synchronization issues | nicolasroard | 2013-03-30 | 2 | -7/+5 |
|/ / / | | | | | | | | | | Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c | ||||
* | | | Merge "Implements progressive rendering" into gb-ub-photos-bryce | nicolasroard | 2013-03-30 | 7 | -34/+165 |
|\ \ \ | |||||
| * | | | Implements progressive rendering | nicolasroard | 2013-03-29 | 7 | -34/+165 |
| | | | | | | | | | | | | | | | | Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf | ||||
* | | | | Merge "Added "discard unsaved changes" behavior for exiting." into ↵ | Ruben Brunk | 2013-03-30 | 1 | -15/+47 |
|\ \ \ \ | |_|/ / |/| | | | | | | | gb-ub-photos-bryce | ||||
| * | | | Added "discard unsaved changes" behavior for exiting. | Ruben Brunk | 2013-03-29 | 1 | -15/+47 |
| | |/ | |/| | | | | | | | | | | Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac | ||||
* | | | Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce | George Mount | 2013-03-29 | 6 | -3/+1300 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add initial implementation of MediaCache. | George Mount | 2013-03-29 | 6 | -3/+1300 |
| | | | | | | | | | | | | Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b | ||||
* | | | Merge "add flexable ui for parameters" into gb-ub-photos-bryce | John Hoford | 2013-03-29 | 13 | -17/+645 |
|\ \ \ | |_|/ |/| | |