summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Michael Bestas2014-10-151-0/+29
| | | | Change-Id: Ica2f3926640da255a91c455efbf91e8440982e63
* Automatic translation importcm-11.0-XNPH44S-bacon-5fa8c79c0bMichael Bestas2014-08-233-3/+3
| | | | Change-Id: I88b16f9012c99aef513974aa2be4631605519412
* Automatic translation importcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aMichael Bestas2014-06-301-0/+29
| | | | Change-Id: I81010fc70d0655ac2de7f6380d5a3995f415aee2
* Automatic translation importMichael Bestas2014-06-221-0/+9
| | | | Change-Id: If6a5765d1c618f76072228c1bb3516e787d3fe09
* Automatic translation importcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaMichael Bestas2014-05-212-0/+49
| | | | Change-Id: I92d139165ce7fefc890805fc09df0cc67cd4252a
* Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-061-1/+3
|\ | | | | | | Android 4.4.1 Release 1
| * am 17bd2d15: fix race condition in photo dreams settings activityChris Wren2013-10-181-1/+3
| |\ | | | | | | | | | | | | * commit '17bd2d15dd9630dabf8defb353fdda8ba379f528': fix race condition in photo dreams settings activity
| | * fix race condition in photo dreams settings activityChris Wren2013-10-161-1/+3
| | | | | | | | | | | | | | | Bug: 11225307 Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07
| * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \
| * \ \ merge in KQS81MEd Heyl2013-10-080-0/+0
| |\ \ \
* | \ \ \ Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0180-118/+868
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Android 4.4 Release 1.0
| * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-292-0/+60
| | | | | | | | | | | | | | | | | | | | Change-Id: Ief99dccd46303fc8aab9613a2015401ece7d0468 Auto-generated-cl: translation import
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-280-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-238-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6425d0021eb5a75073036f0081c3621af8254044 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I696e08968e770345b729c0fb787f444a3bdecdd2 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-282-0/+60
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ief99dccd46303fc8aab9613a2015401ece7d0468 Auto-generated-cl: translation import
| * | | | 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
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-08-238-0/+240
| | | | | | | | | | | | | | | | | | | | Change-Id: I6425d0021eb5a75073036f0081c3621af8254044 Auto-generated-cl: translation import
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-08-2159-51/+477
| | |/ | |/| | | | | | | | | | Change-Id: I4c441175dd0dabcf74c7483cac9fea5c3bd5701c Auto-generated-cl: translation import
| * | 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
| * | 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 2c7d8894: am 8a73e2b2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-230-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '2c7d88949c436896d4da14841d1991158dfaa371': 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-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 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 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 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 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 86569844: am a96a454c: manage obsolete threads.Chris Wren2013-04-091-16/+28
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8656984401488c6aa01a190f893b694115e722d5': 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 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
| | * | | | | | | | | | | | 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 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 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 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 144f49ab: am 9cf665e8: guard against NPEs in bitmap decoding.Chris Wren2013-03-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '144f49ab277544a08499360f650514d6a9fdd93c': guard against NPEs in bitmap decoding.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am de9f38ac: am bed703ef: defensive loop guards around cursors.Chris Wren2013-03-273-38/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de9f38ac52d0523e84ed6f71cca5803367225f60': defensive loop guards around cursors.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2a5bbf30: am 6d300649: flip less often if loading is slow.Chris Wren2013-03-271-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a5bbf30855489393c7f2b5a555dca06bdf85cd8': flip less often if loading is slow.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 998de5ac: am 2ccf92a7: Add \'select all\' to photo dream settings.Chris Wren2013-03-278-33/+142
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '998de5ac11e9b8e9b32097f35b9de89cc02ce814': Add 'select all' to photo dream settings.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d7ef973: am 387363c4: tune re-deal behavior on photo table.Chris Wren2013-03-274-18/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d7ef97309a40e50a0e911add6781f95d8daa27d': tune re-deal behavior on photo table.
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6512451f3c77e115115dcf24194b72fcb3424725 Auto-generated-cl: translation import
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab4a7d2b32dda757a4cd194edafe96ef45041a7d Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:47:07 +0000