Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge "Save video using MediaSaveService." into gb-ub-photos-bryce | Angus Kong | 2013-04-19 | 2 | -148/+98 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Save video using MediaSaveService. | Angus Kong | 2013-04-19 | 2 | -148/+98 | |
| | | | | | | | | | | | | | | | bug:8511719 Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c | |||||
* | | | Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce | Angus Kong | 2013-04-19 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Pass the camera to recorders after all is set. | Angus Kong | 2013-04-18 | 1 | -0/+1 | |
| | |/ | |/| | | | | | | | | | | bug:8049369 Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5 | |||||
* | | | Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce | Doris Liu | 2013-04-19 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Fix memory leak in pie controller | Doris Liu | 2013-04-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | Bug: 7622218 Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251 | |||||
* | | | | Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce | Doris Liu | 2013-04-19 | 5 | -12/+44 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Allow swiping to filmstrip from blocker bar | Doris Liu | 2013-04-18 | 5 | -12/+44 | |
| |/ / | | | | | | | | | | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c | |||||
* | | | Add more menu options/icons | Michael Kolb | 2013-04-18 | 2 | -42/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4 | |||||
* | | | Merge "Change labels so that it doesn't clash with PanoUiLib." into ↵ | George Mount | 2013-04-18 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | | | | gb-ub-photos-bryce | |||||
| * | | Change labels so that it doesn't clash with PanoUiLib. | George Mount | 2013-04-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a | |||||
* | | | Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce | Sascha Haeberling | 2013-04-18 | 1 | -3/+6 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Add method for returning SoundPool audio type. | Sascha Haeberling | 2013-04-17 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | Bug: 7402245 Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa | |||||
* | | | First part of asset drop | Michael Kolb | 2013-04-17 | 2 | -9/+22 | |
|/ / | | | | | | | | | | | | | | | Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53 | |||||
* / | Don't wait for Mosaic Renderer ready in UI thread. | Angus Kong | 2013-04-16 | 1 | -12/+3 | |
|/ | | | | | bug:8292711 Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d | |||||
* | Merge "Angle menu at edge of screen" into gb-ub-photos-bryce | Michael Kolb | 2013-04-16 | 1 | -6/+34 | |
|\ | ||||||
| * | Angle menu at edge of screen | Michael Kolb | 2013-04-15 | 1 | -6/+34 | |
| | | | | | | | | | | | | | | | | Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3 | |||||
* | | Use extra copy of parameters for concurrent access | Angus Kong | 2013-04-15 | 5 | -25/+19 | |
| | | | | | | | | | | bug:8585306 Change-Id: I21b8915c53508e4820e46b49171149189cb6012e | |||||
* | | Also, add labels to video menu | Michael Kolb | 2013-04-15 | 1 | -0/+5 | |
|/ | | | | | | Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c | |||||
* | Add menu labels | Michael Kolb | 2013-04-15 | 7 | -4/+85 | |
| | | | | | | Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f | |||||
* | Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce | Michael Kolb | 2013-04-12 | 1 | -22/+31 | |
|\ | ||||||
| * | Add checks for NPE in video pie menu. | Jason Noguchi | 2013-04-11 | 1 | -22/+31 | |
| | | | | | | | | | | | | Bug: 8536361 Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9 | |||||
* | | Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce | Michael Kolb | 2013-04-12 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix NPE in PieRenderer | Michael Kolb | 2013-04-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574 | |||||
* | | | Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce | Doris Liu | 2013-04-12 | 1 | -19/+27 | |
|\ \ \ | ||||||
| * | | | Fix ICS recording aspect ratio | Doris Liu | 2013-04-11 | 1 | -19/+27 | |
| | |/ | |/| | | | | | | | Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0 | |||||
* | | | Merge "Integrate FilmStripView." into gb-ub-photos-bryce | Angus Kong | 2013-04-11 | 5 | -52/+201 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Integrate FilmStripView. | Angus Kong | 2013-04-11 | 5 | -52/+201 | |
| | | | | | | | | | | | | Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d | |||||
* | | | Fix camera preview being squished | Doris Liu | 2013-04-10 | 2 | -1/+3 | |
|/ / | | | | | | | | | Bug: 8585407 Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd | |||||
* / | Refactor CameraDataAdapter for other data types. | Angus Kong | 2013-04-09 | 2 | -174/+215 | |
|/ | | | | Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4 | |||||
* | Fix to imports in NewPhotoModule. | Ruben Brunk | 2013-04-09 | 1 | -1/+1 | |
| | | | | Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef | |||||
* | Merge "Moving crop to a separate activity. Refactoring." into ↵ | Ruben Brunk | 2013-04-09 | 1 | -1/+1 | |
|\ | | | | | | | gb-ub-photos-bryce | |||||
| * | Moving crop to a separate activity. Refactoring. | Ruben Brunk | 2013-04-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce | |||||
* | | Merge "Add more gestures and animations in FilmStripView." into ↵ | Angus Kong | 2013-04-09 | 3 | -118/+557 | |
|\ \ | | | | | | | | | | gb-ub-photos-bryce | |||||
| * | | Add more gestures and animations in FilmStripView. | Angus Kong | 2013-04-08 | 3 | -118/+557 | |
| |/ | | | | | | | | | | | Now supports fullscreen mode and filmstrip mode. Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f | |||||
* | | Refresh parameters during recording. | Angus Kong | 2013-04-09 | 3 | -0/+15 | |
| | | | | | | | | | | bug:8504803 Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66 | |||||
* | | Work in progress - Put preview in TextureView | Doris Liu | 2013-04-09 | 16 | -7/+7295 | |
|/ | | | | | | | | | | | 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 | |||||
* | Don't add unsupported options to menu | Michael Kolb | 2013-04-05 | 1 | -4/+8 | |
| | | | | | | | | | Bug: 8549712 Exposure compensation and whitebalance were not checked when added to the menu. Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df | |||||
* | 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 | |||||
* | 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 | |||||
* | | 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 | |||||
* | | 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 |