summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
|\ | | | | | | Android 4.3 release 2.1
| * am ad757b21: catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| |\ | | | | | | | | | | | | * commit 'ad757b21555602ec2bd5c53c842cf79e36057601': catch InstantUploadAuto type.
| | * catch InstantUploadAuto type.Chris Wren2013-04-231-1/+3
| | | | | | | | | | | | | | | Bug: 8693493 Change-Id: I00e792f0fe6bc11bf2f32b41399d26cad62d8a41
| * | am 8a73e2b2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-220-0/+0
| |\| | | | | | | | | | | | | * commit '8a73e2b2210a77c432e6e8241f3a6eb700a594cb': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-4/+148
| | | | | | | | | | | | | | | Change-Id: I15afe7a688c14d31e37a290e7139abc4b181e186 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-2/+146
| | | | | | | | | | | | | | | Change-Id: I2453022af3df02eee1c4f118b61f86352d24f1d5 Auto-generated-cl: translation import
| * | am ab617db4: no blank album lists.Chris Wren2013-04-173-12/+50
| |\| | | | | | | | | | | | | * commit 'ab617db46883ffbb9ee77dacd54613bdc026cc2d': no blank album lists.
| | * no blank album lists.Chris Wren2013-04-173-12/+50
| | | | | | | | | | | | | | | Bug: 8060514 Change-Id: Iaf122899f45b9fd94877e695c99872b8103bd616
| * | am f362b8f1: graphics optimization to get back inside 60Hz.Chris Wren2013-04-126-74/+162
| |\| | | | | | | | | | | | | * commit 'f362b8f1d503df040c55ac04913dabdbb2cd7155': graphics optimization to get back inside 60Hz.
| | * graphics optimization to get back inside 60Hz.Chris Wren2013-04-116-74/+162
| | | | | | | | | | | | | | | Bug: 8594598 Change-Id: Iccb1779b5dd133af4441038c3f945d1c1ac1ba8d
| * | 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.
| | * story mode: declutter by fading out the backgroun images.Chris Wren2013-04-113-7/+76
| | | | | | | | | | | | | | | Bug: 8573228 Change-Id: I8b62f9fcf6c7ae82bcb990428a421722c7197e1c
| * | am 84c3d558: story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| |\| | | | | | | | | | | | | * commit '84c3d5580e7168d1d150c1dd24340b19eb501cd2': story mode: tune timeouts and timeout management.
| | * story mode: tune timeouts and timeout management.Chris Wren2013-04-103-12/+38
| | | | | | | | | | | | | | | Bug: 8572979 Change-Id: Ica0559bec273d3628c96b5c25e6e8303226ef433
| * | am bcfd4439: better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| |\| | | | | | | | | | | | | * commit 'bcfd4439d730a4d783a02596c8ab444796323aad': better memory/cursor management for story mode.
| | * better memory/cursor management for story mode.Chris Wren2013-04-107-17/+46
| | | | | | | | | | | | | | | Bug: 8578085 Change-Id: I11c44c64a9d4318a00f6db21369eba43b586f809
| * | am a96a454c: manage obsolete threads.Chris Wren2013-04-091-16/+28
| |\| | | | | | | | | | | | | * commit 'a96a454c9084e98e20f263b435b536a194f25673': manage obsolete threads.
| | * manage obsolete threads.Chris Wren2013-04-091-16/+28
| | | | | | | | | | | | | | | Bug: 8574670 Change-Id: I79a9bdb8de2fec46de591acfe5a3cbcd30f0ecdf
| * | am a924553f: support dpads in story mode.Chris Wren2013-04-093-13/+28
| |\| | | | | | | | | | | | | * commit 'a924553fc2a5bf5ab88ac031adf154480b970bd9': support dpads in story mode.
| | * support dpads in story mode.Chris Wren2013-04-093-13/+28
| | | | | | | | | | | | | | | Bug: 8572945 Change-Id: Icabd1fc61ec7c3c5b6a2f5ef94641eb7c8deb1c3
| * | 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
| | * story mode for PhotoTable.Chris Wren2013-04-0922-279/+717
| | | | | | | | | | | | | | | | | | | | | | | | also some cleanup and refactoring also fix stuck alphas Bug: 8399588 Change-Id: Id236b29701ede3696c8f1f0ccc6522eb8256ff25
| * | am 1dc94b55: add two-finger move gesture.Chris Wren2013-03-274-17/+155
| |\| | | | | | | | | | | | | * commit '1dc94b55d59f5c4dbf86788d0c32b7ac4449909a': add two-finger move gesture.
| | * add two-finger move gesture.Chris Wren2013-03-224-17/+155
| | | | | | | | | | | | | | | Bug: 8387448 Change-Id: Ib8a54ee3e978df3c5d15058d4fe82b9e7d6a524b
| * | 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.
| | * add swipe-away gesture, and fix focus blink.Chris Wren2013-03-153-3/+94
| | | | | | | | | | | | | | | Bug: 8387448 Change-Id: I316d21069e0b81f1753c975a67f56f95282c2a8a
| * | 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
| | * add keyboard navigation to photo table daydreamChris Wren2013-03-144-35/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | arrows: move focus enter: select/deselect x/del: throw away Bug: 8387448 Change-Id: I45d9b2273051abd18aaa82a7e6201196b06f7ce0
| * | 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.
| | * enable keyclicks in the photo daydream album selection menu.Chris Wren2013-03-122-0/+3
| | | | | | | | | | | | | | | Bug: 8175092 Change-Id: Id24bd8884af48b71a72ea156c0d277ae3537c3e9
| * | am 9cf665e8: guard against NPEs in bitmap decoding.Chris Wren2013-03-271-1/+1
| |\| | | | | | | | | | | | | * commit '9cf665e832e1ad67dcee625f78c78743e60aecbe': guard against NPEs in bitmap decoding.
| | * guard against NPEs in bitmap decoding.Chris Wren2013-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Somehow people occasionally see null bitmaps with valid BitmapFactory.Options. Bug: 7403211 Change-Id: If6e18aa6b1c9ea6b8344f039d26197fbb44ff0d9
| * | am bed703ef: defensive loop guards around cursors.Chris Wren2013-03-273-38/+41
| |\| | | | | | | | | | | | | * commit 'bed703ef28f013639db3cd7a6b8a6e94d61075da': defensive loop guards around cursors.
| | * defensive loop guards around cursors.Chris Wren2013-01-093-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | I did not realize that an error in moveToNext() would result in a curor that isBeforeFirst() but not isAfterLast(). Bug: 7465164 Change-Id: I5502f18e863ad48ec88397fdf0b4ec457be723dc
| * | am 6d300649: flip less often if loading is slow.Chris Wren2013-03-271-1/+3
| |\| | | | | | | | | | | | | * commit '6d30064994fb18e7969053bd846b29204355745d': flip less often if loading is slow.
| | * flip less often if loading is slow.Chris Wren2012-12-101-1/+3
| | | | | | | | | | | | | | | | | | | | | Flipping back to a photo we just saw looks like thrashing. However we don't want to get stuck forever on a single photo. Change-Id: I1b8f317fbcbe05a3923343c6d3d2c0f6cabefcda
| * | am 2ccf92a7: Add \'select all\' to photo dream settings.Chris Wren2013-03-278-33/+142
| |\| | | | | | | | | | | | | * commit '2ccf92a79a2749a6fdaf5c1242f5d72de48ef111': Add 'select all' to photo dream settings.
| | * Add 'select all' to photo dream settings.Chris Wren2012-12-108-33/+142
| | | | | | | | | | | | | | | Bug: 7269182 Change-Id: I78898bb9e76d6233487b4888e56f896f3c6ea72d
| * | am 387363c4: tune re-deal behavior on photo table.Chris Wren2013-03-274-18/+16
| |\| | | | | | | | | | | | | * commit '387363c426e097c358bd41367e0a8f4339fc8dc3': tune re-deal behavior on photo table.
| | * tune re-deal behavior on photo table.Chris Wren2012-12-104-18/+16
| | | | | | | | | | | | | | | Bug: 7669353 Change-Id: I17aaf289067cbd688dba5cd317541b98bb4ee3dd
| * | am 98a810d8: am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | (-s ours) Reconcile with jb-mr1-release - do not merge * commit '98a810d8ad8a968136eb7fa2d5c8ca7b25a08f28':
| | * \ am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) ↵Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge * commit '8a6077ce8fb417e94ba1ace84243cca6bb3944c3':
| | | * \ am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit 'f994bd3781b06eec0f993880baa2adf23c5af9fd':
| | | | * \ am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | - do not merge * commit '8bf124f0aec220cb005be6c2941c9b17523b21d0':
| | | | | * am ae812451: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | * commit 'ae8124512833ba226216b53520051b5551eaaeba':
| | | | | * Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | |\
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2eecf2cb1358c8c77dc424e8973b7fad367a062 Auto-generated-cl: translation import
| * | | | | | am e749c32a: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e749c32a866b41702168812430ea74201c23e687':
| | * | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a96613d0058bf7a86861a7d8e7a576ffd6e7cb1
| * | | | | | | am 1d136862: am 6e7f0eed: am 85756a88: remove padding on table, also ↵Chris Wren2012-11-283-28/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lifecycle cleanup. * commit '1d136862c9b6d0c013527b29d7799ae3da2d9a82': remove padding on table, also lifecycle cleanup.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 17:03:42 +0000