summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix when we cannot load an imagenicolasroard2012-10-163-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7321636 Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
* | | | | | am 20fb632c: prevent original now acts like any other FX filterJohn Hoford2012-10-162-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20fb632c407a2dfb5ec769560c61deacc77b8764': prevent original now acts like any other FX filter
| * | | | | prevent original now acts like any other FX filterJohn Hoford2012-10-162-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7353358 Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
* | | | | | am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-archesnicolasroard2012-10-167-355/+520
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db': Fix curves tool
| * | | | | Merge "Fix curves tool" into gb-ub-photos-archesnicolasroard2012-10-167-355/+520
| |\ \ \ \ \
| | * | | | | Fix curves toolnicolasroard2012-10-167-355/+520
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7344301 bug:7328680 bug:7289525 bug:7234239 Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
* | | | | | am b7a0b092: Make save button in video trimming consistentDoris Liu2012-10-163-8/+6
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | * commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d': Make save button in video trimming consistent
| * | | | Make save button in video trimming consistentDoris Liu2012-10-163-8/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7353884 Updated save button icon and text Save button in video trimming now acts like back button when no change has been made. Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
* | | | am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-archesDoris Liu2012-10-161-2/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'ea3c037a82c31734bcea1f5c74da5904882df193': Update save button in photo editor
| * | | Merge "Update save button in photo editor" into gb-ub-photos-archesDoris Liu2012-10-161-2/+3
| |\ \ \
| | * | | Update save button in photo editorDoris Liu2012-10-161-2/+3
| | |/ / | | | | | | | | | | | | | | | | Bug: 7346315 Change-Id: I64e663b3a12c19db280855282722883f6866176e
* | | | am b9c316af: Merge "filters now support orientation" into gb-ub-photos-archesJohn Hoford2012-10-161-9/+67
|\| | | | | | | | | | | | | | | | | | | * commit 'b9c316af94f66bd708d40306e4920ae009795d4b': filters now support orientation
| * | | Merge "filters now support orientation" into gb-ub-photos-archesJohn Hoford2012-10-161-9/+67
| |\ \ \
| | * | | filters now support orientationJohn Hoford2012-10-161-9/+67
| | |/ / | | | | | | | | | | | | | | | | bug:7353416 Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
* | | | am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-archesChris Craik2012-10-161-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'c7d90032c8ea9fd73634c311ed0ba9d5128fe861': Correct toast text for clarity
| * | | Merge "Correct toast text for clarity" into gb-ub-photos-archesChris Craik2012-10-161-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Correct toast text for clarityChris Craik2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7353760 Makes the English string better, but should still be a format string. Change-Id: If998aab71d8f859911df6c7b332e908dcb43afc2
* | | | am 84440670: Remove old camera classes.Wu-cheng Li2012-10-166-36/+1
|\| | | | | | | | | | | | | | | | | | | * commit '84440670da46866867ace3be2c358a54db984a6d': Remove old camera classes.
| * | | Remove old camera classes.Wu-cheng Li2012-10-166-36/+1
| | | | | | | | | | | | | | | | | | | | bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
* | | | am 030f8dad: Fixes bugs in TiledTexture.Owen Lin2012-10-1510-222/+283
|\| | | | | | | | | | | | | | | | | | | * commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab': Fixes bugs in TiledTexture.
| * | | Fixes bugs in TiledTexture.Owen Lin2012-10-1610-222/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Upload tiles in SinglePhotoDataAdapter 2. Rebuild the upload queue after the screen nails being recycled bug: 6399444 Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
* | | | am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent ↵Owen Lin2012-10-158-56/+430
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jank""" into gb-ub-photos-arches * commit 'ff025412e2cacedd8cbb7901140e580f76634ee6': Revert "Revert "Upload screennails in tiles to prevent jank""
| * | | Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into ↵Owen Lin2012-10-158-56/+430
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-arches
| | * | Revert "Revert "Upload screennails in tiles to prevent jank""Owen Lin2012-10-118-56/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ad7cf187bf0c11b05aa3eab7085148e0353f2af5. bug: 6399444 Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
* | | | am a38801ed: Merge "Fix build" into gb-ub-photos-archesJohn Reck2012-10-152-0/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'a38801edd3a39d888bf36607b567171f8b9527ad': Fix build
| * | | Merge "Fix build" into gb-ub-photos-archesJohn Reck2012-10-152-0/+4
| |\ \ \
| | * | | Fix buildJohn Reck2012-10-152-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
* | | | | am 80789c08: Merge "fix for the cache" into gb-ub-photos-archesJohn Hoford2012-10-151-9/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '80789c089e8795968426838ff9c1e71c84cfee6f': fix for the cache
| * | | | Merge "fix for the cache" into gb-ub-photos-archesJohn Hoford2012-10-151-9/+12
| |\ \ \ \
| | * | | | fix for the cacheJohn Hoford2012-10-151-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff bug:7345592
* | | | | | am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into ↵Mangesh Ghiware2012-10-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'c42bb220434926c23332c0f93baad4ca2c6b7588': Cherry-pick of 092fd92 to fix bug 7344730 also.
| * | | | | Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-archesMangesh Ghiware2012-10-151-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Cherry-pick of 092fd92 to fix bug 7344730 also.Chih-Chung Chang2012-10-151-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make getSupportedOperations() call getSupportedOperations(boolean) by default. So things will work for MediaObject who doesn't override the new method. Bug: 7336562 Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
* | | | | am b1a28418: Fix SRI Pano orientationJohn Reck2012-10-152-3/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1a28418848ce0adeb8a845a78e246b01913d176': Fix SRI Pano orientation
| * | | | Fix SRI Pano orientationJohn Reck2012-10-152-3/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 7345511 Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
* | | | am f034e3d9: Update the assets of unlock and camera icons in filmstrip.Wu-cheng Li2012-10-1512-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1': Update the assets of unlock and camera icons in filmstrip.
| * | | Update the assets of unlock and camera icons in filmstrip.Wu-cheng Li2012-10-1512-0/+0
| | | | | | | | | | | | | | | | | | | | bug:7318891 Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
* | | | am 7f1ad54d: Merge "Add stitching panorama image to secure album." into ↵Wu-cheng Li2012-10-142-1/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8': Add stitching panorama image to secure album.
| * | | Merge "Add stitching panorama image to secure album." into gb-ub-photos-archesWu-cheng Li2012-10-142-1/+19
| |\ \ \
| | * | | Add stitching panorama image to secure album.Wu-cheng Li2012-10-132-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7285105 Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
* | | | | am 5ec40a6b: Fix dimensions to use dips instead of pixelsnicolasroard2012-10-134-10/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1': Fix dimensions to use dips instead of pixels
| * | | | Fix dimensions to use dips instead of pixelsnicolasroard2012-10-134-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7343798 Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
* | | | | am b470b229: Fix cropping and saving issuesnicolasroard2012-10-133-6/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b470b229fbfd782db6758f331e4a6f918e305b02': Fix cropping and saving issues
| * | | | Fix cropping and saving issuesnicolasroard2012-10-133-6/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | bug:7342359 Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
* | | | am 48b63eec: Merge "Hide Camera button on empty gallery when not available" ↵Bobby Georgescu2012-10-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-arches * commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f': Hide Camera button on empty gallery when not available
| * | | Merge "Hide Camera button on empty gallery when not available" into ↵Bobby Georgescu2012-10-121-0/+1
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-arches
| | * | | Hide Camera button on empty gallery when not availableBobby Georgescu2012-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7342583 Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
* | | | | am 9b302e31: Icon fixJohn Hoford2012-10-123-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9b302e31fb92408e1b631988320981910edb8c37': Icon fix
| * | | | Icon fixJohn Hoford2012-10-123-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7328726 Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65
* | | | | am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-archesBobby Georgescu2012-10-124-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb': Improve performance of filmstrip