Dianne Hackborn
56e75631bd
Merge "Fix issue #7342364 : JellyBean broke Toddler Lock, again" into jb-mr1-dev
2012-10-23 17:35:59 -07:00
Svetoslav Ganov
e1655c980d
Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
2012-10-23 17:35:24 -07:00
Zhihai Xu
fa0fd39a4b
License of files Bluetooth package is not updated to ASL2
...
bug 7385618
Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
2012-10-23 17:31:56 -07:00
alanv
c2798a916e
When A11y is on, use a longer interval between lockout announcements.
...
Bug: 7384471
Change-Id: I72ac1fe7646588c9c7185cb0186f1e990b3a2f72
2012-10-23 17:26:17 -07:00
Kenny Root
356f2f5941
am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
...
* commit 'da2509c434ebb2a5a0da1bc270cae7f007cbb0f9':
Check non-primary user dirs during package scan
2012-10-23 17:06:34 -07:00
Kenny Root
da2509c434
Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
2012-10-23 17:03:09 -07:00
Craig Mautner
ce1696c22a
am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
...
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
Add throwing InvalidDisplayException from addView.
2012-10-23 16:56:17 -07:00
Craig Mautner
6757572b39
Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
2012-10-23 16:53:32 -07:00
Hiroshi Lockheimer
5c731480ca
am c63aa962: Merge "Fix NPE." into jb-mr1-dev
...
* commit 'c63aa9621821b3f1e32292362cce76cd1899d932':
Fix NPE.
2012-10-23 16:30:00 -07:00
Hiroshi Lockheimer
c63aa96218
Merge "Fix NPE." into jb-mr1-dev
2012-10-23 16:26:25 -07:00
Daniel Sandler
1a3bdd5097
Fix NPE.
...
Bug: 7401286
Change-Id: I45334c4b2263bb611952b7dd949f5df98556377d
2012-10-23 19:21:20 -04:00
Adam Powell
962159addd
Fix up GlowPadView attributes
...
Change-Id: I98c14177753e713fcdaaf886c44ce10ab49eebc9
2012-10-23 16:09:40 -07:00
Chet Haase
4a4ae0b7e2
am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
...
* commit 'fbba753f62f13a12d9287c67921d1ea60e92768d':
Handle offscreen animations correctly
2012-10-23 15:48:35 -07:00
Chet Haase
fbba753f62
Merge "Handle offscreen animations correctly" into jb-mr1-dev
2012-10-23 15:46:04 -07:00
Romain Guy
aae03bb4e3
am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
...
* commit 'b75ade9cce02dffb967ff4719381254585074c58':
Use existing display list to render the resize buffer Bug #7400903
2012-10-23 15:44:23 -07:00
Danielle Millett
7c420ec698
Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
2012-10-23 15:42:22 -07:00
Romain Guy
b75ade9cce
Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
2012-10-23 15:41:42 -07:00
Christopher Tate
e82f68d016
Fix the Backup Manager's uninstall tracking
...
The bug was that when an app was uninstalled, the Backup Manager was
discarding its bookkeeping about that app being represented in the
device's current live backup dataset. This in turn meant that if the
app was subsequently reinstalled, its data would not be restored from
that most-recent dataset: it would be restored from the *ancestral*
dataset if possible, or not at all.
Now the "ever backed up" state is retained correctly, and the app
will get its most-recent-data restored as expected.
Bug 7394519
Change-Id: I733cf41737765676e0a3a05fb1bcd32b165cb4ba
2012-10-23 15:40:27 -07:00
Craig Mautner
6018aeec27
Add throwing InvalidDisplayException from addView.
...
Throw an InvalidDisplayException to addView if the display being
added to has been removed. Handle this exception in Dialog.show()
by removing the view after it has been added and rethrow the
exception from there.
Add javadoc to ViewManager.addView and Presentation.show explaining
the new exception and how best to handle it.
Bug: 7368565 partially fixed. It remains for the Videos app to
handle Presentation.show throwing the InvalidDisplayException.
Change-Id: Ib4303c9b3f7bf7a0cfa95d19bd60a0c128658c48
2012-10-23 15:34:29 -07:00
Danielle Millett
f6d0fc190c
Handling popups correctly for face unlock
...
Added a keyguardVisibilityChanged callback to indicate when the
keyguard is covered by something (alarm, phone, etc). Face unlock
doesn't start if it's not visible and it restarts appropriately when
it gains visibility again. This mostly fixes b/7362774 and b/7376783,
but there's some jank when face unlock goes away (if it was interrupted
while running).
Change-Id: I7bdf8ef6af687acaa7152d8e61bfdcc1979259ff
2012-10-23 18:34:03 -04:00
Chet Haase
3561d062ff
Handle offscreen animations correctly
...
A bug in software rendering caused animations on views that are offscreen
to not get drawn, therefore the animation doesn't continue (since old-style
animations depend on the logic in the drawing code to keep running). Fix is
to special case the isAnimating case in ViewRoot to go ahead and schedule
a traversal even if the dirty rect does not intersect with the visible region.
Issue #7396035 Animations starting offscreen don't draw run/end/draw properly (sw rendering only)
Change-Id: Iae25b3a424ddc5a16ba431ecd68cf42d5500db3f
2012-10-23 15:30:15 -07:00
Jamie Gennis
0e259dccfc
am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
...
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
Surface: add the PhysicalDisplayInfo#secure field
2012-10-23 15:24:23 -07:00
Andy McFadden
2eb8303b9c
am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
...
* commit 'd401a53c6472921ce7785059195a4f031feea7cc':
Improve systrace tag propagation
2012-10-23 15:24:20 -07:00
Jamie Gennis
cd79b35c38
Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
2012-10-23 15:22:37 -07:00
Andy McFadden
d401a53c64
Merge "Improve systrace tag propagation" into jb-mr1-dev
2012-10-23 15:21:56 -07:00
Michael Jurka
cd57bdb57a
am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev
...
* commit 'a665df573e16d79dfd327c8b9a51176a0edde5c7':
Use lighter background for Recents
2012-10-23 15:10:11 -07:00
Jamie Gennis
95429c3d1b
Surface: add the PhysicalDisplayInfo#secure field
...
Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
2012-10-23 15:07:22 -07:00
Michael Jurka
a665df573e
Merge "Use lighter background for Recents" into jb-mr1-dev
2012-10-23 15:06:46 -07:00
Michael Jurka
9ed2bebe09
Use lighter background for Recents
...
Also, re-enable gradient on tablets
(gradient will be disabled in device-specific
overlays on devices that don't render it well)
Bug: 7381275
2012-10-23 15:02:57 -07:00
Dianne Hackborn
77119bc6c9
Fix issue #7342364 : JellyBean broke Toddler Lock, again
...
Change-Id: I400c02711edc302a1bc7fbf98b62fcb9f76e5e12
2012-10-23 15:02:25 -07:00
Jim Miller
83b9647d16
Merge "Integrate new PIN pad." into jb-mr1-lockscreen-dev
2012-10-23 14:03:47 -07:00
Daniel Sandler
69bdee7c87
Integrate new PIN pad.
...
Change-Id: I08d6551dfde501c5526eb6fd641ae08475c1365b
2012-10-23 16:45:50 -04:00
Romain Guy
3a2d6aaf8e
Use existing display list to render the resize buffer
...
Bug #7400903
Change-Id: Ia2e534e47b4f67c280e2de7ce99cae0202751c42
2012-10-23 13:25:13 -07:00
Jeff Brown
f33ff92313
am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
...
* commit '6fd394ae799cc81e3b571773819ee99374a25158':
Improve auto-brightness hysteresis.
2012-10-23 12:46:50 -07:00
Jeff Brown
6fd394ae79
Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
2012-10-23 12:43:47 -07:00
Chris Wren
3867ddabbe
Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
2012-10-23 12:29:05 -07:00
Baligh Uddin
1afe77883e
am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8ed482224ccd9d43fbb7544379a9bb7c10554419':
Import translations. DO NOT MERGE
2012-10-23 11:21:57 -07:00
Baligh Uddin
22f91da2c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-23 11:20:02 -07:00
Baligh Uddin
8ed482224c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-23 11:19:07 -07:00
Romain Guy
0472d565f3
am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:51:01 -07:00
Irfan Sheriff
086dc1ce9b
am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
...
* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
Fix driver stop handling
2012-10-23 10:49:16 -07:00
Chris Wren
692bb13352
merge new multiuser avatars in from proto app
...
Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
2012-10-23 13:48:38 -04:00
Romain Guy
04c8d402fa
Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
2012-10-23 10:47:56 -07:00
Irfan Sheriff
c48ca657f8
Merge "Fix driver stop handling" into jb-mr1-dev
2012-10-23 10:45:42 -07:00
Baligh Uddin
bd28f2376f
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-23 10:42:49 -07:00
Baligh Uddin
66e893fb9b
am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '21ce854b50667bf675bc36ce0db1a3d6f0a2ab92':
Import translations. DO NOT MERGE
2012-10-23 10:42:17 -07:00
Baligh Uddin
21ce854b50
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-23 10:39:27 -07:00
Irfan Sheriff
e6464af000
Fix driver stop handling
...
Defer supplicant state change event so we do not miss it
Bug: 7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
2012-10-23 10:36:51 -07:00
Baligh Uddin
7ed59aec32
Import translations. DO NOT MERGE
...
Change-Id: Ic1848f36834beea6d08e296aff9de39435482f75
Auto-generated-cl: translation import
2012-10-23 10:36:05 -07:00
Daniel Sandler
79db48003b
am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '365ece1dd04df936b51e739ba3dde5fb94b3e527':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 10:35:13 -07:00