Chet Haase
ea3b4506f3
am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev
...
* commit '8b575ec3a733d5e08b0fc9ce995d2aa2148f47a6':
Ensure that transitions animating alpha end on a reasonable value
2013-09-16 14:08:26 -07:00
Igor Murashkin
8f64e3cd42
am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
...
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
media: Update ImageReader to remove MaxImagesAcquiredException
2013-09-16 14:08:23 -07:00
Chet Haase
8b575ec3a7
am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev
...
* commit 'c05c36285dbc715e851671cb4495d376743c4399':
Ensure that transitions animating alpha end on a reasonable value
2013-09-16 14:05:18 -07:00
Igor Murashkin
142971418c
am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
...
* commit '5cf86aa7564eff8443158644e866a420d865b1bc':
media: Update ImageReader to remove MaxImagesAcquiredException
2013-09-16 14:05:14 -07:00
Chet Haase
c05c36285d
Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev
2013-09-16 21:03:28 +00:00
Igor Murashkin
5cf86aa756
Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
2013-09-16 21:02:32 +00:00
Chet Haase
23c61f6bc5
Ensure that transitions animating alpha end on a reasonable value
...
The Fade transition sets an initial alpha value of 0 when items are
appearing. This makes items invisible to start with, and then they
eventually fade in as part of the transition when the transition's
animation runs.
But if that animation/transition gets interrupted, or not started, then
the alpha value would not be restored, and the value would stay 0,
making the items invisible indefinitely. This is what was happening in
the action bar of the People app when performing a search.
The fix is to handle Transition and animation events to restore the alpha
to its true value when the transition completes, whether that
transition is canceled or not.
Issue #10726905 ActionBar weirdness in People app
Change-Id: Idb65fd8d471d2ac0a1ddc243fee00ae99f7e72d8
2013-09-16 13:58:23 -07:00
Igor Murashkin
5454e3ddcc
am 720b1fce: am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev
...
* commit '720b1fcecd6c21bf4fbe6d3822e52c8a092b93c4':
media: Update ImageReader APIs
2013-09-16 13:24:58 -07:00
Igor Murashkin
720b1fcecd
am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev
...
* commit '26cb5fd5fffb2204ec12994cacb3b32639eb4d59':
media: Update ImageReader APIs
2013-09-16 13:22:06 -07:00
Igor Murashkin
26cb5fd5ff
Merge "media: Update ImageReader APIs" into klp-dev
2013-09-16 20:19:15 +00:00
Daniel Sandler
e0339ab5a3
am c1c5e117: am 311daf20: Merge "New platlogo for K." into klp-dev
...
* commit 'c1c5e1177d0ad675c151a7081bd42eef9b0872d2':
New platlogo for K.
2013-09-16 13:14:00 -07:00
Daniel Sandler
c1c5e1177d
am 311daf20: Merge "New platlogo for K." into klp-dev
...
* commit '311daf205348849c97822d33d6a4f7b75bfec6d8':
New platlogo for K.
2013-09-16 13:11:11 -07:00
Daniel Sandler
311daf2053
Merge "New platlogo for K." into klp-dev
2013-09-16 20:09:05 +00:00
Daniel Sandler
80c3c4e960
New platlogo for K.
...
Bug: 10605145
Change-Id: I23f285ec24118982b10f5d801b75925b9dc81c64
2013-09-16 14:40:03 -04:00
Zhijun He
cc6b5bf214
am e4688207: am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev
...
* commit 'e468820757743b95fb5622ae3010fbccb9338a0c':
Camera2: Add MAX_CAMERAS_IN_USE error case handling
2013-09-16 11:30:34 -07:00
Matthew Williams
86f4b37d19
Merge "Refactor SyncManager rename authority->target"
2013-09-16 18:29:36 +00:00
Zhijun He
e468820757
am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev
...
* commit '78a1de651968fc67f43fc881bc8ff5ac3ff380c9':
Camera2: Add MAX_CAMERAS_IN_USE error case handling
2013-09-16 11:24:30 -07:00
Zhijun He
78a1de6519
Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev
2013-09-16 18:21:17 +00:00
Chet Haase
f6e1e8e037
am fe11c5d8: am 978a455d: Merge "Plug leaks in transitions" into klp-dev
...
* commit 'fe11c5d8cd02897b5156460c9a7ae6578cad1fc6':
Plug leaks in transitions
2013-09-16 11:13:01 -07:00
Chet Haase
fe11c5d8cd
am 978a455d: Merge "Plug leaks in transitions" into klp-dev
...
* commit '978a455d665c6bccdc900eeadc72bb652a2ea294':
Plug leaks in transitions
2013-09-16 11:10:34 -07:00
Chet Haase
978a455d66
Merge "Plug leaks in transitions" into klp-dev
2013-09-16 18:05:43 +00:00
Leon Scroggins III
5387aa5029
am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev
...
* commit '3b8a7a0402fbc2cb34e59a5757b8134c8bdadedc':
Do not allocate so much memory on the stack.
2013-09-16 10:45:01 -07:00
Leon Scroggins III
3b8a7a0402
am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev
...
* commit 'b693ef60ef27538402d941702ab652a57f585158':
Do not allocate so much memory on the stack.
2013-09-16 10:41:40 -07:00
Martijn Coenen
0754cb7586
am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
...
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:37:45 -07:00
Leon Scroggins III
b693ef60ef
Merge "Do not allocate so much memory on the stack." into klp-dev
2013-09-16 17:36:58 +00:00
Martijn Coenen
1f8d7f61c0
am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
...
* commit '370b593c37569ddad8286a47e3772bfe3cdb9c9b':
Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:34:35 -07:00
Martijn Coenen
370b593c37
Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
2013-09-16 17:31:40 +00:00
Kenny Root
dbbe56c1b3
Merge "Add comment header for API 20 in public.xml"
2013-09-16 17:19:28 +00:00
Daniel Sandler
cf1d31dbdb
am ad22ba0e: am 3a6b61ff: New ADB icon for K.
...
* commit 'ad22ba0e19d59f49f2278ed70c95e60f3a2521ca':
New ADB icon for K.
2013-09-16 10:17:36 -07:00
Daniel Sandler
ad22ba0e19
am 3a6b61ff: New ADB icon for K.
...
* commit '3a6b61ffcdf2c278f26f1530a5d41b825b33ca18':
New ADB icon for K.
2013-09-16 10:14:27 -07:00
Daniel Sandler
3a6b61ffcd
New ADB icon for K.
...
Simple, to the point.
Bug: 10605145
Change-Id: Id33e06cc0ad9dba0f18cf2919adb3541ed5f0e3d
2013-09-16 12:15:12 -04:00
Daniel Sandler
fe904ecc97
am 48591ef6: am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '48591ef67e92bbb80a2a263b6813a8afcd9c2788':
Fix RenderScript crash.
2013-09-16 08:29:46 -07:00
Daniel Sandler
48591ef67e
am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '28ed00d3b7931c75ac97d1aced01b1dda465f07f':
Fix RenderScript crash.
2013-09-16 08:28:16 -07:00
Daniel Sandler
a30b7035ce
Fix RenderScript crash.
...
Also lay the groundwork for a future checkin.
Bug: 10240151
Bug: 10505742
Change-Id: I62d61c9048188c93863c8c43839e713b75a65102
2013-09-16 11:19:15 -04:00
Jonathan Dixon
a25f350add
am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
...
* commit '7c0e2122c0e9bcb83c082156d5f5300b7f62169b':
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
2013-09-15 20:34:31 -07:00
Jonathan Dixon
1dd56b656b
am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit 'c39a9ca95d98e70fc1de8a1b3aeaf7e7075ff868':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-09-15 20:29:55 -07:00
Jonathan Dixon
dc1573595c
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
...
Bug 10769282
Reverting temporary patch required for factory rom.
This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.
2013-09-16 03:09:43 +00:00
Jonathan Dixon
3d458ab916
Hide Experimental WebView from dev settings DO NOT MERGE
...
Bug 10427705
The persist.webview system property is no longer needed, so removed too.
Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
2013-09-16 03:08:41 +00:00
Zhijun He
68ebc1a7b4
Camera2: Add MAX_CAMERAS_IN_USE error case handling
...
Throw CAE with reason MAX_CAMERAS_IN when the error code is EDQUOT.
Bug: 10749544
Change-Id: I6820de8b95662a55bb37f099746ea2cbe5056f24
2013-09-15 11:55:44 -07:00
Svetoslav Ganov
a6df7120f4
am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit 'b30e185b440e04eac5119653a2868395554febfe':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44
am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12
Merge changes Id0a67846,I20b57d66 into klp-dev
...
* changes:
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 18:46:02 +00:00
Baligh Uddin
e4509e43f9
Import translations. DO NOT MERGE
...
Change-Id: I190e27f9b7d9774cf922b50e1f0ac9c5d08a5652
Auto-generated-cl: translation import
2013-09-14 20:26:04 -07:00
Baligh Uddin
e0a740e44a
Merge "Import translations. DO NOT MERGE"
2013-09-14 19:47:25 +00:00
Baligh Uddin
4a9fca8041
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-14 19:47:20 +00:00
Ying Wang
8d2373810a
am 3c9d0490: am c38acbbe: Merge "Fix docs build." into klp-dev
...
* commit '3c9d049084c6a5d5033cbf6cccee30177508267f':
Fix docs build.
2013-09-14 12:06:30 -07:00
Chet Haase
7660d121b2
Plug leaks in transitions
...
Transitions were leaking views due to TransitionsValues holding references
to views/parents. The references were fine, but the retention of the transition
objects themselves were not. There were a few different places that needed to
be plugged:
- clones were not making new copies of some fields, leading to caching references
in the original object (which was then cloned later to other clones)
- Visibility was using a persistent field to cache temporary values. This transition,
when cloned, would retain these instances, keeping references to views
- ViewTreeObserver had a bug that would leak listeners
Issue #10749071 Activity instance leak between TransitionManager and InputMethodManager
Change-Id: I1d5d457dc5e020c7b9e8392a95e3b2c488461119
2013-09-14 12:06:18 -07:00
Ying Wang
3c9d049084
am c38acbbe: Merge "Fix docs build." into klp-dev
...
* commit 'c38acbbe3060086977a1f9877b9d4befed5894be':
Fix docs build.
2013-09-14 12:03:58 -07:00
Ying Wang
930d4e52ad
Fix docs build.
...
Change-Id: I4a1608bfad809d67240db2070fda85df486179e6
2013-09-14 11:57:17 -07:00
Maggie Benthall
96b82aae35
am b964e5ed: am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
...
* commit 'b964e5edff92849c4ade7d43b86bfaca26d2a4a4':
CA cert monitoring: add notifications and actions for dialog
2013-09-14 11:04:08 -07:00