summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Disable operations when no item is selectedDoris Liu2012-10-311-0/+9
| | | | | | | | | | | | | | | Bug: 7441208 Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
* | | Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryceBobby Georgescu2012-10-311-1/+1
|\ \ \
| * | | Fix jank on videoplayer auto-exitBobby Georgescu2012-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7344292 Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
* | | | Merge "Gingerbread support-ish" into gb-ub-photos-bryceJohn Reck2012-10-31382-80/+33982
|\ \ \ \ | |/ / / |/| | |
| * | | Gingerbread support-ishJohn Reck2012-10-31382-80/+33982
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
* | | | am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-310-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-3130-1836/+936
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-3030-1836/+936
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-10-3130-1836/+936
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-3030-1836/+936
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: I781515fc164ea84a6e30d96612724b0dcb10a8f7 Auto-generated-cl: translation import
* | | | | am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '8d0392d623a88ace36fc4358c0d78e00377ca97f': Import translations. DO NOT MERGE
| * | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-311-1/+1
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-301-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-10-311-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-301-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: Ibf40bc990f7f5e8d0ed266141a3fc75825f6e864 Auto-generated-cl: translation import
* | | | | Merge "Handle invalid data type in ExifParser" into gb-ub-photos-bryceHung-ying Tyan2012-10-302-1/+18
|\ \ \ \ \
| * | | | | Handle invalid data type in ExifParserEarl Ou2012-10-312-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
* | | | | | Merge "Handle images with multile APP1 in ExifParser" into gb-ub-photos-bryceHung-ying Tyan2012-10-301-14/+19
|\| | | | |
| * | | | | Handle images with multile APP1 in ExifParserEarl Ou2012-10-311-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
* | | | | | Merge "Handle the last null byte in Exif tag." into gb-ub-photos-bryceHung-ying Tyan2012-10-303-28/+75
|\| | | | |
| * | | | | Handle the last null byte in Exif tag.Earl Ou2012-10-313-28/+75
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
* | | | | | am 471d8986: Add keyguard camera widget meta-data to gallery manifest.Wu-cheng Li2012-10-301-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * commit '471d898606bc15878b4d1708236f60157bab08df': Add keyguard camera widget meta-data to gallery manifest.
| * | | | Add keyguard camera widget meta-data to gallery manifest.Wu-cheng Li2012-10-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7445471 Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264
* | | | | Do not use UTF-8 to decode string in ExifOutputStreamEarl Ou2012-10-311-4/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
* | | | | print image path when setup error in Exif testEarl Ou2012-10-311-9/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4391571695ea518eac53f2b8c6b1a2acb5159c1
* | | | | am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystemMangesh Ghiware2012-10-301-1/+1
|\| | | | | |/ / / |/| | | | | | | | | | | * commit '589381bffb30f4f4a84ebe59b9bc3a140153831c': Change protection level for GALLERY_PROVIDER to signatureOrSystem
| * | | Change protection level for GALLERY_PROVIDER to signatureOrSystemMangesh Ghiware2012-10-301-1/+1
| |/ / | | | | | | | | | | | | Bug: 7433498 Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5
* | | am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to ↵Tenghui Zhu2012-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | null for video." into gb-ub-photos-arches * commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50': DO NOT MERGE: Do not set the background to null for video.
| * | Merge "DO NOT MERGE: Do not set the background to null for video." into ↵Tenghui Zhu2012-10-301-21/+1
| |\ \ | | | | | | | | | | | | gb-ub-photos-arches
| | * | DO NOT MERGE: Do not set the background to null for video.Romain Guy2012-10-301-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7275145 Bug 7405595 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Cherry pick the Romain's change from jb-mr1-dev: https://googleplex-android-review.googlesource.com/#/c/234571/ Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
* | | | am c7536cfa: Merge "Show sync error toast only when both loading and syncing ↵Bart Sears2012-10-307-15/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.
| * | | Merge "Show sync error toast only when both loading and syncing are done." ↵Bart Sears2012-10-307-15/+58
| |\ \ \ | | |/ / | |/| | | | | | into gb-ub-photos-arches
| | * | Show sync error toast only when both loading and syncing are done.Hung-ying Tyan2012-10-307-15/+58
| | | | | | | | | | | | | | | | | | | | Bug: 7427597 Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
* | | | am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-archesGeorge Mount2012-10-301-32/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'aa8228a42b25b60f0663770beea9acdce536f699': Don't use an album for UriImages.
| * | | Merge "Don't use an album for UriImages." into gb-ub-photos-archesGeorge Mount2012-10-301-32/+0
| |\ \ \ | | |/ / | |/| |
| | * | Don't use an album for UriImages.George Mount2012-10-291-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7422455 Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
* | | | Merge "Gallery: Do not set the background to null for video." into ↵Teng-Hui Zhu2012-10-301-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | Gallery: Do not set the background to null for video.Teng-Hui Zhu2012-10-301-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix screen corruption when exit while video complete or rotate while video playing. bug:7405595 Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
* | | | | am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-290-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043': Import translations. DO NOT MERGE
| * | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-2918-1619/+809
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-2918-1619/+809
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c74eeda009683c4866e6d409d88c761fd3cd78c Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-10-2918-1619/+809
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-2918-1619/+809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc56fac50486b6af23e8ea9f44e015849fa16c84 Auto-generated-cl: translation import
* | | | | | Disable save button when there's no modificationDoris Liu2012-10-299-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7353884 Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
* | | | | | am dc03ae14: Reset rotation flagnicolasroard2012-10-291-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'dc03ae144d838714446b239f2b0c519d956af6ff': Reset rotation flag
| * | | | | Reset rotation flagnicolasroard2012-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7386221 Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
* | | | | | am 98990049: Merge "Fix zooming position" into gb-ub-photos-archesnicolasroard2012-10-294-29/+180
|\| | | | | | |/ / / / |/| | | | | | | | | | | | | | * commit '98990049451cda3540f6cff1ae8065c3675ed3d8': Fix zooming position
| * | | | Merge "Fix zooming position" into gb-ub-photos-archesnicolasroard2012-10-294-29/+180
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix zooming positionnicolasroard2012-10-284-31/+180
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7386221 Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
* | | | | am 17540e58: Do not copy XMP data if it has TinyPlanet filterJohn Hoford2012-10-291-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter