summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am 7e2828e0: am 44358fd1: remove special handling for composite instant ↵Chris Wren2013-08-271-2/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upload album. * commit '7e2828e0f1c31c60e828abb981918642457a9260': remove special handling for composite instant upload album.
| | * | | | | am 44358fd1: remove special handling for composite instant upload album.Chris Wren2013-08-271-2/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | * commit '44358fd113ad0ac82aa093e66d906ce40528d24f': remove special handling for composite instant upload album.
| | | * | | remove special handling for composite instant upload album.Chris Wren2013-08-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old name is obsolete and it adds complexity (and bugs). Watch for references to the old name in settings and upgrade them. Bug: 10509455 Change-Id: Ifc50ee29fb8d69c369fdfad503efbfb4aec08a47
* | | | | | am ba7c5fcf: (-s ours) am e8dd8ba8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-260-0/+0
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | * commit 'ba7c5fcf9aa20920e083f518d945a041d4dd60cd': Import translations. DO NOT MERGE
| * | | | am e8dd8ba8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e8dd8ba8426bbd90216b492084e4ecb25d419fbc': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-08-238-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6425d0021eb5a75073036f0081c3621af8254044 Auto-generated-cl: translation import
* | | | | am 8bf0a01c: (-s ours) am 3378eb99: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8bf0a01c8c2253b4232faf3a7a2d7cca6250929b': Import translations. DO NOT MERGE
| * | | | am 3378eb99: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-220-0/+0
| |\| | | | | |_|/ | |/| | | | | | | | | | * commit '3378eb998047c21d85c028e1066e22edc1e1a3a9': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-2159-51/+477
| |/ / | | | | | | | | | | | | Change-Id: I4c441175dd0dabcf74c7483cac9fea5c3bd5701c Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-08-2159-92/+33
| | | | | | | | | | | | | | | Change-Id: Iddc432781c6c85becd98e3100a0ad6436bca4a81 Auto-generated-cl: translation import
* | | am 3bde1dbb: am 9cc1455e: Use the server\'s name for the instant upload album.Chris Wren2013-08-192-7/+0
|\| | | | | | | | | | | | | | * commit '3bde1dbb82c6232fa01611796aaa27c6bcbf290e': Use the server's name for the instant upload album.
| * | am 9cc1455e: Use the server\'s name for the instant upload album.Chris Wren2013-08-192-7/+0
| |\| | | | | | | | | | | | | * commit '9cc1455e9c71f797955dc18ede02b1f001289083': Use the server's name for the instant upload album.
| | * Use the server's name for the instant upload album.Chris Wren2013-08-192-7/+0
| | | | | | | | | | | | | | | Bug: 8853443 Change-Id: I09bf4fe469775ab384a51e3cee25029d9f490524
* | | Import translations. DO NOT MERGEBaligh Uddin2013-08-1959-31/+516
|/ / | | | | | | | | Change-Id: I343d59d9d390e2242aaf81f70a614a6577c2ba59 Auto-generated-cl: translation import
* | keep history after reset to gb-ub-photos-carlsbadQiwen Zhao2013-08-150-0/+0
|\ \ | |/ |/|
| * add a broadcast receiver that modifies the settings.Chris Wren2013-08-164-19/+112
| | | | | | | | | | | | | | | | Useful for loosly embedding the photo dreams code into other packages. Add support for albums on internal storage. Bug: 8370249 Change-Id: Ibca37c100d7f1f6b87580422591de4d19d726506 (cherry picked from commit 729f5231bf95ec7946fc4c510d44db303b07614d)
| * am dd5f6f03: am ad757b21: catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| |\ | | | | | | | | | | | | * commit 'dd5f6f03990d50bbb353b2c4d77a90f8211b5a74': catch InstantUploadAuto type.
| | * am ad757b21: catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| | |\ | | | | | | | | | | | | | | | | * commit 'ad757b21555602ec2bd5c53c842cf79e36057601': catch InstantUploadAuto type.
| * | | am 2c7d8894: am 8a73e2b2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-230-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '2c7d88949c436896d4da14841d1991158dfaa371': Import translations. DO NOT MERGE
| | * | am 8a73e2b2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-220-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '8a73e2b2210a77c432e6e8241f3a6eb700a594cb': Import translations. DO NOT MERGE
| * | | | am 2dfdf013: Import translations. DO NOT MERGEBaligh Uddin2013-04-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '2dfdf013415677f655ff4e4669f87f6477d48035': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-2/+146
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2453022af3df02eee1c4f118b61f86352d24f1d5 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib10a837f7383cb19e4fcff5ab780ac1f54bc1143 Auto-generated-cl: translation import
| * | | | am 57d36f58: am ab617db4: no blank album lists.Chris Wren2013-04-173-12/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '57d36f58a1156b51bbceb836a8373c81e1410a9b': no blank album lists.
| | * | | am ab617db4: no blank album lists.Chris Wren2013-04-173-12/+50
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab617db46883ffbb9ee77dacd54613bdc026cc2d': no blank album lists.
| * | | | | am ee47f2fe: am f362b8f1: graphics optimization to get back inside 60Hz.Chris Wren2013-04-126-74/+162
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee47f2fe85688eeb7fa7a90f9c13340635302358': graphics optimization to get back inside 60Hz.
| | * | | | am f362b8f1: graphics optimization to get back inside 60Hz.Chris Wren2013-04-126-74/+162
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f362b8f1d503df040c55ac04913dabdbb2cd7155': graphics optimization to get back inside 60Hz.
| * | | | | | am b03c9db4: am 3910ecc7: story mode: declutter by fading out the backgroun ↵Chris Wren2013-04-113-7/+76
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | images. * commit 'b03c9db455e905299be0d5c7a670ba6e4ec091d0': story mode: declutter by fading out the backgroun images.
| | * | | | | am 3910ecc7: story mode: declutter by fading out the backgroun images.Chris Wren2013-04-113-7/+76
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3910ecc7c3a93485d32f8c1eac79e47dbf3753fb': story mode: declutter by fading out the backgroun images.
| * | | | | | | am 85211917: am 84c3d558: story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85211917374bbb5e50677700aacecfbc9b8b4f31': story mode: tune timeouts and timeout management.
| | * | | | | | am 84c3d558: story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '84c3d5580e7168d1d150c1dd24340b19eb501cd2': story mode: tune timeouts and timeout management.
| * | | | | | | | am 6fc674aa: am bcfd4439: better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fc674aa76e56f9cc01a7df7059cc17eb16ac21b': better memory/cursor management for story mode.
| | * | | | | | | am bcfd4439: better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcfd4439d730a4d783a02596c8ab444796323aad': better memory/cursor management for story mode.
| * | | | | | | | | am 86569844: am a96a454c: manage obsolete threads.Chris Wren2013-04-091-16/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8656984401488c6aa01a190f893b694115e722d5': manage obsolete threads.
| | * | | | | | | | am a96a454c: manage obsolete threads.Chris Wren2013-04-091-16/+28
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a96a454c9084e98e20f263b435b536a194f25673': manage obsolete threads.
| * | | | | | | | | | am b268ccad: am a924553f: support dpads in story mode.Chris Wren2013-04-093-13/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b268ccad2d16b7db6dcafb62ed97a06b9a18baae': support dpads in story mode.
| | * | | | | | | | | am a924553f: support dpads in story mode.Chris Wren2013-04-093-13/+28
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a924553fc2a5bf5ab88ac031adf154480b970bd9': support dpads in story mode.
| * | | | | | | | | | | am 5773101d: am 88d80f44: story mode for PhotoTable. also some cleanup and ↵Chris Wren2013-04-0822-279/+717
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring also fix stuck alphas * commit '5773101d37a84138b3f38e5d0177563f98f1159f': story mode for PhotoTable. also some cleanup and refactoring also fix stuck alphas
| | * | | | | | | | | | am 88d80f44: story mode for PhotoTable. also some cleanup and refactoring ↵Chris Wren2013-04-0822-279/+717
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix stuck alphas * commit '88d80f4471c900628e2cb6eef23029b99af48e09': story mode for PhotoTable. also some cleanup and refactoring also fix stuck alphas
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2948-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69dc68e5b15ef9df370169828218cc671495bfc1 Auto-generated-cl: translation import
| * | | | | | | | | | | | am 829f0395: am 1dc94b55: add two-finger move gesture.Chris Wren2013-03-274-17/+155
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '829f039523e3750f982bd1490e08a86b8eabc182': add two-finger move gesture.
| | * | | | | | | | | | | am 1dc94b55: add two-finger move gesture.Chris Wren2013-03-274-17/+155
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1dc94b55d59f5c4dbf86788d0c32b7ac4449909a': add two-finger move gesture.
| * | | | | | | | | | | | | am b2b6ef49: am bf44ca22: add swipe-away gesture, and fix focus blink.Chris Wren2013-03-273-3/+94
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2b6ef497aef97833ea3d20ee8db1519303825be': add swipe-away gesture, and fix focus blink.
| | * | | | | | | | | | | | am bf44ca22: add swipe-away gesture, and fix focus blink.Chris Wren2013-03-273-3/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf44ca22d40dd60b4c30f6a979b80fbd2ffa0078': add swipe-away gesture, and fix focus blink.
| * | | | | | | | | | | | | | am 351de2d7: am eb702175: add keyboard navigation to photo table daydream ↵Chris Wren2013-03-274-35/+256
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrows: move focus enter: select/deselect x/del: throw away * commit '351de2d7a82a672925fbfd469b4988a3ae916fb0': add keyboard navigation to photo table daydream arrows: move focus enter: select/deselect x/del: throw away
| | * | | | | | | | | | | | | am eb702175: add keyboard navigation to photo table daydream arrows: move ↵Chris Wren2013-03-274-35/+256
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | focus enter: select/deselect x/del: throw away * commit 'eb70217554d14807d73cae033b4f756c9b80fe3b': add keyboard navigation to photo table daydream arrows: move focus enter: select/deselect x/del: throw away
| * | | | | | | | | | | | | | | am 9135d9cd: am 7ec52545: enable keyclicks in the photo daydream album ↵Chris Wren2013-03-272-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection menu. * commit '9135d9cddb2f9ebd1a1a79c0556aa5fcd7f49786': enable keyclicks in the photo daydream album selection menu.
| | * | | | | | | | | | | | | | am 7ec52545: enable keyclicks in the photo daydream album selection menu.Chris Wren2013-03-272-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ec52545cbf2f26dac8e5e0105147075c57956ac': enable keyclicks in the photo daydream album selection menu.
| * | | | | | | | | | | | | | | | am 144f49ab: am 9cf665e8: guard against NPEs in bitmap decoding.Chris Wren2013-03-271-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '144f49ab277544a08499360f650514d6a9fdd93c': guard against NPEs in bitmap decoding.
| | * | | | | | | | | | | | | | | am 9cf665e8: guard against NPEs in bitmap decoding.Chris Wren2013-03-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cf665e832e1ad67dcee625f78c78743e60aecbe': guard against NPEs in bitmap decoding.