summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-10-1749-85/+127
| | | | | Change-Id: Ic5166da21bb2611a235ab164c883759371c456f6 Auto-generated-cl: translation import
* am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-archesnicolasroard2012-10-1710-20/+100
|\ | | | | | | | | * commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7': Fix back button behaviour
| * Merge "Fix back button behaviour" into gb-ub-photos-archesnicolasroard2012-10-1710-20/+100
| |\
| | * Fix back button behaviournicolasroard2012-10-1710-20/+100
| | | | | | | | | | | | | | | | | | bug:7290000 bug:7256201 Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
* | | am 57731ee2: Only fade out if texture creation succeededJohn Reck2012-10-172-5/+12
|\| | | | | | | | | | | | | | * commit '57731ee210c22382d33f6f562f9e7e66fce651de': Only fade out if texture creation succeeded
| * | Only fade out if texture creation succeededJohn Reck2012-10-172-5/+12
| |/ | | | | | | | | | | Bug: 7366597 Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-10-1749-826/+490
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-1649-826/+490
| | | | | | | | | | | | | | | Change-Id: I211ecc3a8acdc701586d292e3514fc8f16447a16 Auto-generated-cl: translation import
* | | am 4104415e: Merge "Add read URI permission to intent returned for ↵Mangesh Ghiware2012-10-171-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | GET_CONTENT" into gb-ub-photos-arches * commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711': Add read URI permission to intent returned for GET_CONTENT
| * | Merge "Add read URI permission to intent returned for GET_CONTENT" into ↵Mangesh Ghiware2012-10-171-2/+3
| |\ \ | | | | | | | | | | | | gb-ub-photos-arches
| | * | Add read URI permission to intent returned for GET_CONTENTMangesh Ghiware2012-10-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7366308 Bug: 7202384 GalleryProvider now requires a permission to access content. See CL ca181a6 for more details. Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
* | | | am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '77a8da71dc3a2e12266e229d2687069f68d9fe59': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-1749-826/+490
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1649-826/+490
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadc128bed94569d815e6071a74fc35493a6525bb Auto-generated-cl: translation import
* | | | | am 24958c5d: Change double tap scale from 1.5 to 1.0John Reck2012-10-171-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f': Change double tap scale from 1.5 to 1.0
| * | | | Change double tap scale from 1.5 to 1.0John Reck2012-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7287834 Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
* | | | | am 95404c66: Fix UI stuffnicolasroard2012-10-179-61/+108
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '95404c666640177abf72ca2278585a16f30cf390': Fix UI stuff
| * | | | Fix UI stuffnicolasroard2012-10-179-61/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7354368 bug:7362027 bug:7344915 Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
* | | | | am eb321f77: Merge "rotate images before saving" into gb-ub-photos-archesJohn Hoford2012-10-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1': rotate images before saving
| * | | | Merge "rotate images before saving" into gb-ub-photos-archesJohn Hoford2012-10-171-0/+1
| |\ \ \ \
| | * | | | rotate images before savingJohn Hoford2012-10-171-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | bug:7353416 Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
* | | | | am e3b50f1b: Adds GMS Core PanoramaClient to GallerySascha Haeberling2012-10-173-7/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b': Adds GMS Core PanoramaClient to Gallery
| * | | | Adds GMS Core PanoramaClient to GallerySascha Haeberling2012-10-173-7/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7319099 Also updates the API call to LightCycleHelper. This depends on http://go/ag/#/c/239523/ Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
* | | | am 3038d014: add support for configurable slider rangesJohn Hoford2012-10-176-14/+70
|\| | | | | | | | | | | | | | | | | | | * commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf': add support for configurable slider ranges
| * | | add support for configurable slider rangesJohn Hoford2012-10-176-14/+70
| | | | | | | | | | | | | | | | | | | | bug:7293391 Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
* | | | am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into ↵Nicolas Roard2012-10-1710-113/+443
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '34c807c8d89f9bfa9565ab52746d845acfb714fd': Added fixed aspect ratio support for cropping.
| * | | Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-archesNicolas Roard2012-10-1710-113/+443
| |\ \ \
| | * | | Added fixed aspect ratio support for cropping.Ruben Brunk2012-10-1610-113/+443
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7350377 Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
* | | | | am 178a1c11: Fixed flip (mirror) orientation.Ruben Brunk2012-10-171-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '178a1c115552a22526fb3a263a01c3cc66300328': Fixed flip (mirror) orientation.
| * | | | Fixed flip (mirror) orientation.Ruben Brunk2012-10-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7342859 Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
* | | | | am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-archesHung-ying Tyan2012-10-163-10/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221': Add permission to GalleryProvider.
| * | | | Merge "Add permission to GalleryProvider." into gb-ub-photos-archesHung-ying Tyan2012-10-163-10/+14
| |\ \ \ \
| | * | | | Add permission to GalleryProvider.Owen Lin2012-10-173-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
* | | | | | Merge "Read exif test images from the external storage of the test package" ↵Hung-ying Tyan2012-10-166-76/+166
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-bryce
| * | | | | | Read exif test images from the external storage of the test packageEarl Ou2012-10-176-76/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now add more exif test images under the application's private Pictures directory, and put their corresponding xml files under Xml directory. The tests will try to load them and use them as a testcase. Change-Id: I2bc82bb7703e3a4516d1bc433ac5fabed2080987
* | | | | | | am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-archesBobby Georgescu2012-10-164-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872': Update empty placeholder asset
| * | | | | | Merge "Update empty placeholder asset" into gb-ub-photos-archesBobby Georgescu2012-10-164-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update empty placeholder assetBobby Georgescu2012-10-164-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7362100 Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
* | | | | | | am a05bf471: Merge "Update Camera album overlay icon asset" into ↵Bobby Georgescu2012-10-164-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20': Update Camera album overlay icon asset
| * | | | | | Merge "Update Camera album overlay icon asset" into gb-ub-photos-archesBobby Georgescu2012-10-164-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update Camera album overlay icon assetBobby Georgescu2012-10-164-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7332688 Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
* | | | | | | am e20cc0cb: Add blue highlight when tapping 360 panorama buttonBobby Georgescu2012-10-162-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d': Add blue highlight when tapping 360 panorama button
| * | | | | | Add blue highlight when tapping 360 panorama buttonBobby Georgescu2012-10-162-1/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7336676 Change-Id: If16e5aacf1102d0bd7de7ce5d6c90efae4c786f7
* | | | | | am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" ↵Bobby Georgescu2012-10-169-88/+168
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-arches * commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e': Consistent animations & up button behavior in Gallery
| * | | | | Merge "Consistent animations & up button behavior in Gallery" into ↵Bobby Georgescu2012-10-169-88/+168
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches
| | * | | | | Consistent animations & up button behavior in GalleryBobby Georgescu2012-10-169-88/+168
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7302857 Bug: 7295464 This CL makes all of the transition animations throughout the Gallery app consistent. The animation is the previous view shrinking and fading out while the new view starts out bigger than the view port and is coming in to the viewport size as it fades in. Having consistent animations allows us to not keep PhotoPage/AlbumPage instances around in certain cases, making it possible to have consistent up button behavior when switching between the grid and filmstrip. Finally, this also makes the transitions in the camera app filmstrip/grid switching consistent with those in the gallery app. Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
* | | | | | am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into ↵John Reck2012-10-162-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3': Add hook to manipulate SurfaceTexture transform
| * | | | | Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-archesJohn Reck2012-10-162-1/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add hook to manipulate SurfaceTexture transformJohn Reck2012-10-162-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7302956 Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
* | | | | | am e34a5a5e: Fix when we cannot load an imagenicolasroard2012-10-163-2/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0': Fix when we cannot load an image