Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce | John Reck | 2013-05-21 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode. | Sascha Haeberling | 2013-05-21 | 3 | -1/+37 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | am 80a3d636: Make capture thumbnail tappable in video mode. | Sascha Haeberling | 2013-05-21 | 3 | -1/+37 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into g... | Doris Liu | 2013-05-21 | 1 | -0/+5 | |
| |\| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-b... | Doris Liu | 2013-05-21 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into... | John Hoford | 2013-05-21 | 1 | -1/+5 | |
| |\| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos... | John Hoford | 2013-05-21 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image typ... | Ruben Brunk | 2013-05-20 | 1 | -26/+50 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | am 286afab1: Merge "Avoid using region decoder for bad image types when setti... | Ruben Brunk | 2013-05-20 | 1 | -26/+50 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo p... | Sascha Haeberling | 2013-05-20 | 1 | -18/+2 | |
| |\| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | am 7af7156a: Merge "Make sure canceling a filter does not undo previous filte... | Sascha Haeberling | 2013-05-20 | 1 | -18/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce | John Hoford | 2013-05-20 | 1 | -1/+15 | |
| |\| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce | John Hoford | 2013-05-20 | 1 | -1/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders | Michael Kolb | 2013-05-17 | 6 | -13/+142 | |
| |\| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am 1a266f16: Highlight selected option in FX and Borders | Michael Kolb | 2013-05-17 | 6 | -13/+142 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-b... | John Reck | 2013-05-16 | 1 | -3/+2 | |
| |\| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce | John Reck | 2013-05-16 | 1 | -3/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce | John Reck | 2013-05-16 | 3 | -8/+10 | |
| |\| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce | John Reck | 2013-05-16 | 3 | -8/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce | John Reck | 2013-05-16 | 1 | -0/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce | John Reck | 2013-05-16 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state"... | Michael Kolb | 2013-05-15 | 1 | -3/+12 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-p... | Michael Kolb | 2013-05-15 | 1 | -3/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am da046959: am 655e208d: Merge "Correct label position after rotation" into ... | Michael Kolb | 2013-05-15 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-... | Michael Kolb | 2013-05-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into ... | ztenghui | 2013-05-15 | 1 | -0/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-... | ztenghui | 2013-05-15 | 1 | -0/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev | Marco Nelissen | 2013-05-15 | 1 | -0/+34 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable virtualization" into jb-mr2-dev | Marco Nelissen | 2013-05-15 | 1 | -0/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Enable virtualization | Marco Nelissen | 2013-05-13 | 1 | -0/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured im... | Doris Liu | 2013-05-14 | 1 | -0/+2 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers. | George Mount | 2013-05-09 | 5 | -248/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce | ztenghui | 2013-05-09 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am de8d7096: am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce | Bart Sears | 2013-05-08 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c3ec037f: am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub... | Michael Kolb | 2013-05-08 | 3 | -24/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop d... | Sascha Haeberling | 2013-05-08 | 1 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 17b4b977: am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce | Michael Kolb | 2013-05-08 | 4 | -158/+102 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b45e0eab: am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" in... | Bobby Georgescu | 2013-05-08 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons... | Doris Liu | 2013-05-07 | 4 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dcd90240: am 0a830ce4: Merge "Add animation to slice selection" into gb-ub... | Michael Kolb | 2013-05-07 | 1 | -1/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a8e0de46: am 6febbfc6: Merge "Avoid rounding errors from cropping uncroppe... | Sascha Haeberling | 2013-05-07 | 2 | -3/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d7ec31f0: am 48ce39b8: Fix review button placement | Michael Kolb | 2013-05-07 | 1 | -53/+66 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dec72c89: am ed1224f1: Resize children to avoid laying out outside parent | Doris Liu | 2013-05-07 | 1 | -16/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp | Elliott Hughes | 2013-05-06 | 3 | -9/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone's IDE chose the wrong Date. | Elliott Hughes | 2013-05-06 | 2 | -8/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5b188c94: Disabled further filters after Tiny Planet. | Ruben Brunk | 2012-12-18 | 2 | -1/+36 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 695e1aa0: Force a layout pass if the display rotation changes | John Reck | 2012-12-10 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am db99a10b: Fix NPE in PhotoPage | Bobby Georgescu | 2012-12-05 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 870e62ac: Handle the case where the orientation column is not here... | nicolasroard | 2012-12-04 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches | Michael Kolb | 2012-12-04 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |