Chris Craik
12981923b8
Merge "Additional layer logging" into lmp-dev
2014-09-10 23:19:08 +00:00
Svetoslav
212a8bf326
am a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev
...
* commit 'a6b5869f409f9674ef046e8f997e5f97b71b794a':
Fix a crash in print spooler.
2014-09-10 23:10:46 +00:00
Svetoslav
993137dcdc
am 930f4fe4: Merge "Accessibilty support for the print UI." into lmp-dev
...
* commit '930f4fe4cb27f9363d177848f4f832b4a79d2819':
Accessibilty support for the print UI.
2014-09-10 23:10:41 +00:00
Chris Craik
bfd1cd6209
Additional layer logging
...
bug:17208461
Track layer's last known state.
Change-Id: Ic1799191f5839a1d6cc56f598f2ac2671dc27a6f
2014-09-10 16:10:24 -07:00
Alan Viverette
362f984df3
Make SearchView styles public, remove public Holo styles added in L
...
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.
BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
2014-09-10 16:05:35 -07:00
Svetoslav
e03ddd0bcc
Merge "Fix a crash in print spooler." into lmp-dev
2014-09-10 23:00:42 +00:00
Svetoslav
c65510a7bc
Merge "Accessibilty support for the print UI." into lmp-dev
2014-09-10 22:59:50 +00:00
Jeff Sharkey
4ef7b1442a
am bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev
...
* commit 'bed348e3f1090417df2694d394ad11ef07a1e44a':
Manage mode shouldn't block for other providers.
2014-09-10 22:45:34 +00:00
Eric Laurent
ad6491a0cc
am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev
...
* commit '0b381432c45fd7918bef8f3ba8f0a97e28687951':
AudioEffect JNI: fix queryEffects()
2014-09-10 22:45:29 +00:00
Jeff Sharkey
2e52871211
Merge "Manage mode shouldn't block for other providers." into lmp-dev
2014-09-10 22:39:45 +00:00
Eric Laurent
ea9aa9a282
Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev
2014-09-10 22:37:26 +00:00
Jeff Sharkey
c9d7150680
Manage mode shouldn't block for other providers.
...
When loading DocumentsUI in management mode (for Downloads), we
normally focus on a single authority and let the other providers
keep loading async. However, when one of the providers kicks a
change notification, we end up blocking the main thread.
Simple fix is to move the blocking into the AsyncTask.
Bug: 17452691
Change-Id: Ie5212ad825b7df719690b29941c9ae9ba2cabe4b
2014-09-10 15:27:59 -07:00
Xin Guan
2bcb97bfb5
Using the correct package name for ContentResolver
...
Change-Id: I0518391f7262c78043fbd42ddfefef0f2451382c
2014-09-10 15:19:16 -07:00
Eric Laurent
4fc28d78cb
AudioEffect JNI: fix queryEffects()
...
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.
Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
2014-09-10 15:05:03 -07:00
Adam Lesinski
65e76d1200
Output recent configs in am get-config command
...
Change-Id: Ic516e73d2e72ac0dc3136f7226cedd851fe22b85
2014-09-10 15:02:59 -07:00
Svetoslav
3ef8e203c8
Fix a crash in print spooler.
...
1. Leftover code was setting the state to configuring
before initialization is complete.
2. We were not cancelling the print job if cancelled
when initializing.
3. The remote print document was cancelled even if
doing nothing.
bug:17451600
Change-Id: I79a80b723af8537da260012470748b4e8831fd9e
2014-09-10 15:00:11 -07:00
Dianne Hackborn
92a5b0d59f
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
...
...can lead to launching of un-exported activities
We now validate the array map after unparcelling to make sure there
are no duplicate keys.
And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values. There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.
Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
2014-09-10 21:55:27 +00:00
George Mount
70e865972e
am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
...
* commit '0b46b9133b6c7d19c316d9d8ae472aafdfce4029':
Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:49:16 +00:00
Tao Bai
2ca2501f5f
am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
...
* commit '3350edacefea92e2dfb5ad07a7b719334db8f157':
Revise createIntent and parseResult API.
2014-09-10 21:49:12 +00:00
George Mount
05c4f7ad76
Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
2014-09-10 21:47:58 +00:00
John Spurlock
4829719465
am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev
...
* commit '1f35a9b62db9cb420dd69676f1c4b7c18b6f01ba':
QS: Fix NPE path inside cell tile.
2014-09-10 21:44:30 +00:00
Craig Mautner
bb869ba791
am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit 'cef60b6ac6e490803a1b14d4a4214e097cc5d269':
Wait for animation complete before completing boot
2014-09-10 21:44:25 +00:00
Nancy Chen
74d99a1498
am 61922585: Merge "Add docs to Conference object." into lmp-dev
...
* commit '61922585c8e03bbbfe5776b4cbf6c272994dfb7b':
Add docs to Conference object.
2014-09-10 21:44:20 +00:00
Tao Bai
bebc56209d
Merge "Revise createIntent and parseResult API." into lmp-dev
2014-09-10 21:43:04 +00:00
John Spurlock
66c0d0cb8c
Merge "QS: Fix NPE path inside cell tile." into lmp-dev
2014-09-10 21:40:43 +00:00
John Spurlock
f7f00ea9d3
QS: Fix NPE path inside cell tile.
...
Bug:17456632
Change-Id: Ifc859cf8c1620152fd333d3a92bcd1a47ac1d7e7
2014-09-10 17:34:56 -04:00
Craig Mautner
ebcd9189e3
Merge "Wait for animation complete before completing boot" into lmp-dev
2014-09-10 21:33:43 +00:00
Nancy Chen
23a7a394f5
Merge "Add docs to Conference object." into lmp-dev
2014-09-10 21:33:02 +00:00
George Mount
18812b4c63
am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit 'b74b8d498f584dc5b51b67190da45e266f95edf3':
Move capturing entering views until just before transition.
2014-09-10 21:32:31 +00:00
Chet Haase
ee75b75ec8
am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '804df9eb62ed13668aacbd1609640a92846932f9':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:27:11 +00:00
vandwalle
abdf298d67
am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
...
* commit '9e444d7a905f4fbfb4e3511380d7e668d9700561':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
2014-09-10 21:27:06 +00:00
George Mount
4245e161c6
Merge "Move capturing entering views until just before transition." into lmp-dev
2014-09-10 21:26:23 +00:00
Chet Haase
6f6578e81c
Use constant state in AnimatedVectorDrawable
...
Complex animated vector drawables can be expensive to load due to
sub-optimal parsing of the String-based pathData. Suffering that penalty
every time the same drawable is loaded (such as material-themed
ProgressBars) is painful.
The new approach caches constant state of both the VectorDrawable (including
the pathData geometry) and the animators (which includes potentially expensive
path-based interpolators).
issue #17366831 Material ProgressBar taking 200+ms to inflate
Change-Id: Iba3b541e24cfce8c07f5aa9fe6aa7d7b92b2fe1c
2014-09-10 21:21:53 +00:00
vandwalle
9da6c90577
Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
2014-09-10 21:16:58 +00:00
Mathieu Chartier
26c60db184
am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
...
* commit '6a5930128cbd3fa5dace9262ee6cefa7db53d378':
Change EmptyArray System.identityHashCode to Object.hashCode.
2014-09-10 21:06:15 +00:00
Raph Levien
a857719419
am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
Remove auto spaceifying behavior on paste
2014-09-10 21:06:10 +00:00
Alan Viverette
8683a4f819
Only force drawing in RippleDrawable when necessary
...
BUG: 17451761
Change-Id: Ibb9d1c64791ec54eb90608c957eeb5efb1712b4a
2014-09-10 14:05:15 -07:00
Jorim Jaggi
cfc18c7327
Fix inconsistent layout param in notification
...
Might increase the measure performance a bit.
Bug: 17040206
Change-Id: I2fff039cefdb4f21aff2674b6e7449549f5f8670
2014-09-10 23:04:43 +02:00
Mathieu Chartier
1b848d4894
Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
2014-09-10 21:02:26 +00:00
Jean-Michel Trivi
e1f07060b8
am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
...
* commit 'e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd':
Do not restore the media button event receiver
2014-09-10 20:59:32 +00:00
Raph Levien
20dbc370e3
Merge "Remove auto spaceifying behavior on paste" into lmp-dev
2014-09-10 20:55:51 +00:00
Jorim Jaggi
d19273ee87
am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev
...
* commit '303fa8368258ec03d8a9a6994e5c38884ed2b129':
Fix PIN/PUK flow
2014-09-10 20:53:43 +00:00
Jorim Jaggi
1cfeaa6147
am 70968134: Merge "Fix invisible Keyguard" into lmp-dev
...
* commit '70968134205bcaf97076b84f5fda9ee867aa21e5':
Fix invisible Keyguard
2014-09-10 20:53:38 +00:00
vandwalle
e26bc8fda7
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
...
Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
2014-09-10 13:49:48 -07:00
Jorim Jaggi
e81d5c97e8
Merge "Fix PIN/PUK flow" into lmp-dev
2014-09-10 20:48:46 +00:00
Jean-Michel Trivi
e825f0eec5
am 60f22fbf: Do not restore the media button event receiver
...
* commit '60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
Do not restore the media button event receiver
2014-09-10 20:47:57 +00:00
Jorim Jaggi
ef764551c9
Merge "Fix invisible Keyguard" into lmp-dev
2014-09-10 20:43:51 +00:00
Jon Miranda
7cc8603199
am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:42:51 +00:00
Jon Miranda
83e3ec9d4e
Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
2014-09-10 20:34:08 +00:00
Jae Seo
f01b8517d9
am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices
...
* commit '5ea50c1ae245170d4c553894d98e80e1448e9389':
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
2014-09-10 20:26:36 +00:00