Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge "Show loading indicator in full-screen importer view" into ↵ | Bobby Georgescu | 2013-04-11 | 1 | -2/+9 | |
|\ | | | | | | | gb-ub-photos-bryce | |||||
| * | Show loading indicator in full-screen importer view | Bobby Georgescu | 2013-04-11 | 1 | -2/+9 | |
| | | | | | | | | | | Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f | |||||
* | | Merge "Integrate FilmStripView." into gb-ub-photos-bryce | Angus Kong | 2013-04-11 | 2 | -4/+30 | |
|\ \ | |/ |/| | ||||||
| * | Integrate FilmStripView. | Angus Kong | 2013-04-11 | 2 | -4/+30 | |
| | | | | | | | | Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d | |||||
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce | Baligh Uddin | 2013-04-10 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-04-10 | 1 | -1/+1 | |
| |/ | | | | | | | | | Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533 Auto-generated-cl: translation import | |||||
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce | Baligh Uddin | 2013-04-10 | 49 | -0/+94 | |
|\ \ | ||||||
| * | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-04-10 | 49 | -0/+94 | |
| |/ | | | | | | | | | Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194 Auto-generated-cl: translation import | |||||
* | | Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce | Bobby Georgescu | 2013-04-10 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | Correctly scale images in MTP importer | Bobby Georgescu | 2013-04-10 | 1 | -1/+1 | |
| | | | | | | | | | | Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4 | |||||
* | | Merge "support icon styles" into gb-ub-photos-bryce | John Hoford | 2013-04-10 | 2 | -1/+7 | |
|\ \ | ||||||
| * | | support icon styles | John Hoford | 2013-04-09 | 2 | -1/+7 | |
| | | | | | | | | | | | | Change-Id: I9a4af2826824fd519099363b3190fc417b67c022 | |||||
* | | | Merge "Implements swipe in editor menu" into gb-ub-photos-bryce | nicolasroard | 2013-04-09 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | Implements swipe in editor menu | nicolasroard | 2013-04-09 | 1 | -1/+2 | |
| |/ / | | | | | | | | | | Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393 | |||||
* | | | Merge "Moving crop to a separate activity. Refactoring." into ↵ | Ruben Brunk | 2013-04-09 | 1 | -0/+55 | |
|\ \ \ | |/ / |/| | | | | | gb-ub-photos-bryce | |||||
| * | | Moving crop to a separate activity. Refactoring. | Ruben Brunk | 2013-04-09 | 1 | -0/+55 | |
| | | | | | | | | | | | | | | | | | | Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce | |||||
* | | | Merge "ui cleanup" into gb-ub-photos-bryce | John Hoford | 2013-04-09 | 4 | -16/+21 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | ui cleanup | John Hoford | 2013-04-09 | 4 | -16/+21 | |
| | | | | | | | | | | | | Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01 | |||||
* | | | Work in progress - Put preview in TextureView | Doris Liu | 2013-04-09 | 4 | -0/+476 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Fix panel color background in landscape | nicolasroard | 2013-04-09 | 1 | -0/+2 | |
|/ / | | | | | | | Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d | |||||
* | | Fix history original image | nicolasroard | 2013-04-09 | 2 | -0/+2 | |
| | | | | | | | | | | | | Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add | |||||
* | | Fix positioning of cancel/done buttons | nicolasroard | 2013-04-08 | 1 | -8/+7 | |
| | | | | | | | | Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699 | |||||
* | | make basic editor based on ParametricEditor | John Hoford | 2013-04-08 | 1 | -0/+38 | |
| | | | | | | | | Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61 | |||||
* | | Add menu item to start the simple editor | nicolasroard | 2013-04-08 | 2 | -1/+9 | |
| | | | | | | | | Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0 | |||||
* | | Increase the CHAR LIMIT for color_pick_select | John Hoford | 2013-04-08 | 1 | -1/+1 | |
|/ | | | | | bug: 8131770 Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797 | |||||
* | Import translations. DO NOT MERGE | Baligh Uddin | 2013-04-05 | 8 | -64/+32 | |
| | | | | | Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b Auto-generated-cl: translation import | |||||
* | Merge "Adjust camera menu further" into gb-ub-photos-bryce | Michael Kolb | 2013-04-03 | 1 | -4/+4 | |
|\ | ||||||
| * | Adjust camera menu further | Michael Kolb | 2013-04-03 | 1 | -4/+4 | |
| | | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40 | |||||
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce | Baligh Uddin | 2013-04-03 | 48 | -0/+224 | |
|\ \ | ||||||
| * | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-04-03 | 48 | -0/+224 | |
| |/ | | | | | | | | | Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16 Auto-generated-cl: translation import | |||||
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce | Baligh Uddin | 2013-04-03 | 2 | -8/+8 | |
|\ \ | ||||||
| * | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-04-03 | 2 | -8/+8 | |
| |/ | | | | | | | | | Change-Id: I3d22344797079b775de3781b0e3d8b73623dcec9 Auto-generated-cl: translation import | |||||
* / | Improve black bar to keep camera controls in place | Doris Liu | 2013-04-03 | 3 | -8/+9 | |
|/ | | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b | |||||
* | Merge "Change panels organization. Also fixes border updates handling." into ↵ | Ruben Brunk | 2013-04-02 | 1 | -11/+28 | |
|\ | | | | | | | gb-ub-photos-bryce | |||||
| * | Change panels organization. Also fixes border updates handling. | Ruben Brunk | 2013-04-01 | 1 | -11/+28 | |
| | | | | | | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe | |||||
* | | Pie design update | Michael Kolb | 2013-04-01 | 2 | -20/+33 | |
|/ | | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb | |||||
* | Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce | Bobby Georgescu | 2013-04-01 | 4 | -15/+146 | |
|\ | ||||||
| * | Preliminary Album grid header in new gallery | Bobby Georgescu | 2013-04-01 | 4 | -15/+146 | |
| | | | | | | | | Change-Id: I90942de920795aedc5475f23cc3ede459949cc16 | |||||
* | | Fixes some state synchronization issues | nicolasroard | 2013-03-30 | 1 | -1/+2 | |
| | | | | | | | | Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c | |||||
* | | Merge "Added "discard unsaved changes" behavior for exiting." into ↵ | Ruben Brunk | 2013-03-30 | 1 | -0/+11 | |
|\ \ | | | | | | | | | | gb-ub-photos-bryce | |||||
| * | | Added "discard unsaved changes" behavior for exiting. | Ruben Brunk | 2013-03-29 | 1 | -0/+11 | |
| |/ | | | | | | | | | Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac | |||||
* | | Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce | George Mount | 2013-03-29 | 1 | -0/+0 | |
|\ \ | ||||||
| * | | Add initial implementation of MediaCache. | George Mount | 2013-03-29 | 1 | -0/+0 | |
| | | | | | | | | | | | | Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b | |||||
* | | | Merge "add flexable ui for parameters" into gb-ub-photos-bryce | John Hoford | 2013-03-29 | 9 | -10/+156 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | add flexable ui for parameters | John Hoford | 2013-03-29 | 9 | -10/+156 | |
| | | | | | | | | | | | | Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921 | |||||
* | | | Re-enable caching step in RS filters | nicolasroard | 2013-03-28 | 1 | -0/+1 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b | |||||
* / | Moves ownership of the environment to the pipeline | nicolasroard | 2013-03-26 | 1 | -45/+11 | |
|/ | | | | Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec | |||||
* | Merge "Adding switcher background back in" into gb-ub-photos-bryce | Doris Liu | 2013-03-25 | 2 | -2/+2 | |
|\ | ||||||
| * | Adding switcher background back in | Doris Liu | 2013-03-25 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938 | |||||
* | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-03-22 | 42 | -84/+168 | |
| | | | | | | | | | | Change-Id: I5037cd2630cb0f95db7ca665133a85c0826240d3 Auto-generated-cl: translation import |