summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-2580-374/+1800
|\
| * am ad757b21: catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| |\
| | * catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| * | am 8a73e2b2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-220-0/+0
| |\|
| | * Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-4/+148
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-2/+146
| * | am ab617db4: no blank album lists.Chris Wren2013-04-173-12/+50
| |\|
| | * no blank album lists.Chris Wren2013-04-173-12/+50
| * | am f362b8f1: graphics optimization to get back inside 60Hz.Chris Wren2013-04-126-74/+162
| |\|
| | * graphics optimization to get back inside 60Hz.Chris Wren2013-04-116-74/+162
| * | am 3910ecc7: story mode: declutter by fading out the backgroun images.Chris Wren2013-04-113-7/+76
| |\|
| | * story mode: declutter by fading out the backgroun images.Chris Wren2013-04-113-7/+76
| * | am 84c3d558: story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| |\|
| | * story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| * | am bcfd4439: better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| |\|
| | * better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| * | am a96a454c: manage obsolete threads.Chris Wren2013-04-091-16/+28
| |\|
| | * manage obsolete threads.Chris Wren2013-04-091-16/+28
| * | am a924553f: support dpads in story mode.Chris Wren2013-04-093-13/+28
| |\|
| | * support dpads in story mode.Chris Wren2013-04-093-13/+28
| * | am 88d80f44: story mode for PhotoTable. also some cleanup and refactoring als...Chris Wren2013-04-0822-279/+717
| |\|
| | * story mode for PhotoTable.Chris Wren2013-04-0922-279/+717
| * | am 1dc94b55: add two-finger move gesture.Chris Wren2013-03-274-17/+155
| |\|
| | * add two-finger move gesture.Chris Wren2013-03-224-17/+155
| * | am bf44ca22: add swipe-away gesture, and fix focus blink.Chris Wren2013-03-273-3/+94
| |\|
| | * add swipe-away gesture, and fix focus blink.Chris Wren2013-03-153-3/+94
| * | am eb702175: add keyboard navigation to photo table daydream arrows: move f...Chris Wren2013-03-274-35/+256
| |\|
| | * add keyboard navigation to photo table daydreamChris Wren2013-03-144-35/+256
| * | am 7ec52545: enable keyclicks in the photo daydream album selection menu.Chris Wren2013-03-272-0/+3
| |\|
| | * enable keyclicks in the photo daydream album selection menu.Chris Wren2013-03-122-0/+3
| * | am 9cf665e8: guard against NPEs in bitmap decoding.Chris Wren2013-03-271-1/+1
| |\|
| | * guard against NPEs in bitmap decoding.Chris Wren2013-01-101-1/+1
| * | am bed703ef: defensive loop guards around cursors.Chris Wren2013-03-273-38/+41
| |\|
| | * defensive loop guards around cursors.Chris Wren2013-01-093-38/+41
| * | am 6d300649: flip less often if loading is slow.Chris Wren2013-03-271-1/+3
| |\|
| | * flip less often if loading is slow.Chris Wren2012-12-101-1/+3
| * | am 2ccf92a7: Add \'select all\' to photo dream settings.Chris Wren2013-03-278-33/+142
| |\|
| | * Add 'select all' to photo dream settings.Chris Wren2012-12-108-33/+142
| * | am 387363c4: tune re-deal behavior on photo table.Chris Wren2013-03-274-18/+16
| |\|
| | * tune re-deal behavior on photo table.Chris Wren2012-12-104-18/+16
| * | am 98a810d8: am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-...Jean-Baptiste Queru2013-03-110-0/+0
| |\ \
| | * \ am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Recon...Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \
| | | * \ am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-...Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \
| | | | * \ am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * am ae812451: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |/|
| | | | | * Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | |\
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-011-1/+1
| * | | | | | am e749c32a: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| |\| | | | |
| | * | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| | |\ \ \ \ \
| * | | | | | | am 1d136862: am 6e7f0eed: am 85756a88: remove padding on table, also lifecycl...Chris Wren2012-11-283-28/+27
| |\| | | | | |