Svetoslav Ganov
3405dac287
am e4c9ac2d: Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev
...
* commit 'e4c9ac2df26f640fa9aeab5928e82bcc59a33da2':
Remember which list child has A11y focus BEFORE clearing A11y focus.
2013-03-18 21:28:02 +00:00
Svetoslav Ganov
e4c9ac2df2
Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev
2013-03-18 21:23:45 +00:00
Irfan Sheriff
73cf20728d
am 6750d9bd: Merge "Fix tethering" into jb-mr2-dev
...
* commit '6750d9bd5611cb1abd0e964eae9f0f5afd164e9e':
Fix tethering
2013-03-18 21:19:01 +00:00
Irfan Sheriff
6750d9bd56
Merge "Fix tethering" into jb-mr2-dev
2013-03-18 21:13:48 +00:00
Craig Mautner
769b610eb2
am 2fc8ad1f: Merge "Properly close Surface when done." into jb-mr2-dev
...
* commit '2fc8ad1fe68cc819a337e1c48dc27389a823c304':
Properly close Surface when done.
2013-03-18 21:12:06 +00:00
Craig Mautner
2fc8ad1fe6
Merge "Properly close Surface when done." into jb-mr2-dev
2013-03-18 20:57:26 +00:00
Irfan Sheriff
367a96b0f3
Fix tethering
...
Using sendMessageAtFrontofQueue() causes issues here since there can be a start
that is deferred and it basically has no effect. Use defer which is more clean
and obvious here.
Bug: 8410547
Change-Id: I4fbf299283847e7c3009b87a81cb56e765b0e1e1
2013-03-18 13:56:32 -07:00
Dianne Hackborn
0964bb20f4
am 338b1884: Merge "Improve/flesh-out shared library version check." into jb-mr2-dev
...
* commit '338b18844434379de54050ff582d36ff6da3ba11':
Improve/flesh-out shared library version check.
2013-03-18 18:47:28 +00:00
Dianne Hackborn
338b188444
Merge "Improve/flesh-out shared library version check." into jb-mr2-dev
2013-03-18 18:44:52 +00:00
Chet Haase
24dd6b2d9c
am 72871325: DO NOT MERGE: ListView transient state fix
...
* commit '728713258ffef4df053b85e0a3488334cbcba24c':
DO NOT MERGE: ListView transient state fix
2013-03-18 18:26:26 +00:00
Chet Haase
728713258f
DO NOT MERGE: ListView transient state fix
...
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.
A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.
Issue #8254775 View.setHasTransient state has side-effects when deleting content in ListView
Change-Id: I2fc25e71ed6655af30b9c3f47fdf014e9b667616
2013-03-18 10:06:27 -07:00
Craig Mautner
e50d7fcd97
Properly close Surface when done.
...
Surface.destroy was not being called. Leading to warning from
StrictMode.
Fixes bug 8388527.
Change-Id: I472fb57ed2c3f6389e53d8f020f3b22b2d0740c8
2013-03-18 10:06:21 -07:00
Lorenzo Colitti
79dcd9ae7d
am 952e4805: Merge "Framework changes for 464xlat." into jb-mr2-dev
...
* commit '952e4805f72c0835bbd158051fc56dc64d1d660d':
Framework changes for 464xlat.
2013-03-18 16:46:10 +00:00
Lorenzo Colitti
952e4805f7
Merge "Framework changes for 464xlat." into jb-mr2-dev
2013-03-18 16:41:58 +00:00
Baligh Uddin
87ceab3bbc
am 14f9fac2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '14f9fac204a04f74605c79ef38f5345425eea561':
Import translations. DO NOT MERGE
2013-03-18 16:39:35 +00:00
Baligh Uddin
14f9fac204
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-18 16:37:35 +00:00
Baligh Uddin
b885442820
Import translations. DO NOT MERGE
...
Change-Id: I18e0b1bb666d62540c921e8e83508ef6dc3f01af
Auto-generated-cl: translation import
2013-03-18 09:15:53 -07:00
Lorenzo Colitti
caee4f9308
am cba45c0e: Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev
...
* commit 'cba45c0eeff6e8f57bec54fbdb89951b5387d14c':
Catch RuntimeException in NMService notifications
2013-03-18 15:47:36 +00:00
Lorenzo Colitti
cba45c0eef
Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev
2013-03-18 15:45:01 +00:00
Chet Haase
fb38986e45
am 138c58a9: Merge "Add overlays to views" into jb-mr2-dev
...
* commit '138c58a941e624c6a969f874ef2f1da1d04b0132':
Add overlays to views
2013-03-18 14:32:54 +00:00
Chet Haase
138c58a941
Merge "Add overlays to views" into jb-mr2-dev
2013-03-18 14:29:06 +00:00
Wink Saville
1648989280
am b8c5ce29: Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev
...
* commit 'b8c5ce29dcc5b9cd3c644da75b383cee761a02b4':
Add new StateMachine constructor with name and handler params.
2013-03-17 21:30:58 +00:00
Wink Saville
b8c5ce29dc
Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev
2013-03-17 21:27:19 +00:00
Wink Saville
24d248acdf
Add new StateMachine constructor with name and handler params.
...
Change-Id: Ic252de6cac24a043050b37d81767d19e2739b2fc
2013-03-17 14:26:21 -07:00
Chris Craik
857c133cde
am c8a9fdff: Merge "Reset draw modifiers after flushing" into jb-mr2-dev
...
* commit 'c8a9fdff4b229b129920aecb1d048d1ff36729b4':
Reset draw modifiers after flushing
2013-03-17 16:24:05 +00:00
Dianne Hackborn
6acbd7c60a
am bb131f52: Merge "Fix issue #8401553 : It\'s possible to startForeground()..." into jb-mr2-dev
...
* commit 'bb131f52daf0792c3f1566df992024d5d7640f25':
Fix issue #8401553 : It's possible to startForeground()...
2013-03-17 16:24:03 +00:00
Lorenzo Colitti
d9b3d55152
Catch RuntimeException in NMService notifications
...
Currently, NetworkManagementService only catches RemoteExceptions
when calling the BaseNetworkObserver notification methods (e.g.,
interfaceStatusChanged). However, if the observer is in the same
process, unchecked exceptions can occur as well.
When this happens, finishBroadcast does not get called, and no
further notifications can be sent, because any attempt to do so
fails with a "beginBroadcast() called while already in a
broadcast" exception.
Fix this by catching RuntimeException as well.
Bug: 8397534
Bug: 8276725
Change-Id: Icd6f32128707244978943c48a9ea3a2b952a2957
2013-03-17 03:21:35 +09:00
Chris Craik
c8a9fdff4b
Merge "Reset draw modifiers after flushing" into jb-mr2-dev
2013-03-16 02:09:16 +00:00
Dianne Hackborn
bb131f52da
Merge "Fix issue #8401553 : It's possible to startForeground()..." into jb-mr2-dev
2013-03-16 01:59:29 +00:00
Chris Craik
d0afeac6df
Reset draw modifiers after flushing
...
bug:8401910
This avoids leaving the renderer in a state with stale pointers (to,
e.g., shaders or color filters)
Change-Id: Idf8b63657041352e70e34e91ea416fe4385d4bc2
2013-03-15 18:48:41 -07:00
Dianne Hackborn
282add7bc3
Fix issue #8401553 : It's possible to startForeground()...
...
...with no visible Notification
Don't allow a 0 icon resource.
Change-Id: I52e93533e6c45c6027ff3c185060cd54d087d077
2013-03-15 18:48:04 -07:00
Robert Greenwalt
1218742a11
am 2e6ce4f7: am 3fafccdd: am 519ba7b1: Merge "update APN version for MVNO"
...
* commit '2e6ce4f737dcdeb748f467836dd12490c0cdfd22':
update APN version for MVNO
2013-03-16 01:03:36 +00:00
Robert Greenwalt
2e6ce4f737
am 3fafccdd: am 519ba7b1: Merge "update APN version for MVNO"
...
* commit '3fafccdd180fa9918e900e1176de97cdfec6bccd':
update APN version for MVNO
2013-03-15 17:58:57 -07:00
Robert Greenwalt
3fafccdd18
am 519ba7b1: Merge "update APN version for MVNO"
...
* commit '519ba7b10c4e0da3586aeeaa9696349f28313898':
update APN version for MVNO
2013-03-15 17:56:52 -07:00
Robert Greenwalt
519ba7b10c
Merge "update APN version for MVNO"
2013-03-16 00:18:52 +00:00
Robert Greenwalt
0665691376
am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev
...
* commit 'ab672ba66458e540062f824861303a484d3065fd':
Revert of Ifd0c4081a. Turning off logging.
2013-03-15 23:33:10 +00:00
Robert Greenwalt
ab672ba664
Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev
2013-03-15 23:30:59 +00:00
Dianne Hackborn
5e2552bd16
am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev
...
* commit 'd468df73d59635aa0f3e0661b84093d02c4c6ca0':
Fix a bug where we could lose a loader content change.
2013-03-15 23:12:56 +00:00
Dianne Hackborn
d468df73d5
Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev
2013-03-15 23:10:47 +00:00
Chris Craik
524f12c4f8
am f40b8a93: Merge "Fully deferred displaylist replay" into jb-mr2-dev
...
* commit 'f40b8a939fef0a19b40188f007a3364311d6dabf':
Fully deferred displaylist replay
2013-03-15 22:55:54 +00:00
Chris Craik
f40b8a939f
Merge "Fully deferred displaylist replay" into jb-mr2-dev
2013-03-15 22:54:16 +00:00
Chet Haase
91cedf1c3d
Add overlays to views
...
It is useful, particularly in animations, to be able to add a view, or at
least some graphics, on top of a view. For example, to have a child of a layout
fade away, we might want to remove the child from that layout and then fade it out
gradually. Meanwhile, we have to have a place to put that view where it will be
drawn. We could do this in the content container sometimes, but this is not a
reliable workaround in the general case, and may obscure other siblings/parents of
the layout/view in the hierarchy. A better approach would be to place a view/graphic
temporarily in the layout itself.
This feature adds the ability to add one or more Views and Drawables to an "overlay"
layer, after which the view will handle drawing that extra content when it redraws itself.
Issue #8350510 Add APIs needed for future animation capabilities
Change-Id: I70bf78c46ee3db8bd87ea1cdc2ecb5c0747ccbf9
2013-03-15 15:53:31 -07:00
Chet Haase
08e84b6b7d
am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev
...
* commit '30527267d12d4338820d4ec2526c6bf81c7f7785':
Reset reverse state when an animator ends
2013-03-15 22:52:26 +00:00
Chet Haase
1c9f587582
am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev
...
* commit '2de8dac82dfa23f2382a6f6b1f9a2a995ef366eb':
Log warning when animator detects NaN value
2013-03-15 22:52:23 +00:00
Chet Haase
e7955865a1
am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev
...
* commit 'd2e1e4474dbdd87a51a8d75c946d1a027b6655e4':
Use same default duration (300) for animator resources as for other animators
2013-03-15 22:52:20 +00:00
Chet Haase
30527267d1
Merge "Reset reverse state when an animator ends" into jb-mr2-dev
2013-03-15 22:51:07 +00:00
Chet Haase
2de8dac82d
Merge "Log warning when animator detects NaN value" into jb-mr2-dev
2013-03-15 22:50:51 +00:00
Alan Viverette
b53c5f6b6f
Remember which list child has A11y focus BEFORE clearing A11y focus.
...
Bug: 8332399
Change-Id: I0293efe5cef4a011a584e62fc4a64cde7d354efe
2013-03-15 15:50:37 -07:00
Chet Haase
d2e1e4474d
Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev
2013-03-15 22:50:06 +00:00
kmccormick
963d1002bb
am ec6c2059: am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
...
* commit 'ec6c2059f99e3d8035ec05be0bf9885dea1f7b35':
Doc update: Add memory mgt lesson to bitmaps class
2013-03-15 22:36:26 +00:00