Kristian Monsen
155d965ab0
am 3d1edc03: am 6e7ed13b: Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev
...
* commit '3d1edc033ff00430e1f8118cd871d9996b7172a1':
Fix for bug 8623163: Call view methods on the UI thread
2013-05-13 02:34:39 -07:00
Kristian Monsen
3d1edc033f
am 6e7ed13b: Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev
...
* commit '6e7ed13b12edc9e02580a273c3aa546e62231b5a':
Fix for bug 8623163: Call view methods on the UI thread
2013-05-13 02:33:01 -07:00
Kristian Monsen
6e7ed13b12
Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev
2013-05-13 09:30:07 +00:00
Romain Guy
a7bf9d363a
Merge "Reduce the number of measurement passes in RelativeLayout"
2013-05-11 00:59:11 +00:00
Romain Guy
4cb81d6423
Reduce the number of measurement passes in RelativeLayout
...
Change-Id: I96ad8676f6344a1e0877f9dfbe782747bc0ff36d
2013-05-10 17:58:44 -07:00
Craig Mautner
e555d16421
am c3797f40: am 4754f401: Merge "Avoid NullPointerException in getHandler()"
...
* commit 'c3797f40c1a8a8f7ca72816642110221933ff8fd':
Avoid NullPointerException in getHandler()
2013-05-10 15:17:00 -07:00
Svetoslav
6f3a6a453a
am 1e4c6589: am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
...
* commit '1e4c6589941e459871eed6e9d4675b05d977325c':
Accessibility should not query for list items when data set changed.
2013-05-10 15:16:57 -07:00
Craig Mautner
c3797f40c1
am 4754f401: Merge "Avoid NullPointerException in getHandler()"
...
* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
Avoid NullPointerException in getHandler()
2013-05-10 13:34:23 -07:00
Svetoslav
1e4c658994
am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
...
* commit 'b3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80':
Accessibility should not query for list items when data set changed.
2013-05-10 13:10:41 -07:00
Svetoslav
b3c2b21b5b
Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
2013-05-10 20:06:42 +00:00
Craig Mautner
4754f401a9
Merge "Avoid NullPointerException in getHandler()"
2013-05-10 19:50:39 +00:00
Marco Nelissen
c08d4d99e2
am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
...
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd':
Add VideoView.getAudioSessionId()
2013-05-10 12:46:36 -07:00
Marco Nelissen
1d3488cba9
am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
...
* commit '86e0b491d1b50e59221420de3005184b1dee8373':
Add VideoView.getAudioSessionId()
2013-05-10 12:44:05 -07:00
Marco Nelissen
86e0b491d1
Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
2013-05-10 14:12:13 +00:00
Dianne Hackborn
fee8cd7582
am e8c9b39e: am 83d6df27: Merge "Help on issue #8863955 : Google Services keeping phone awake..." into jb-mr2-dev
...
* commit 'e8c9b39ec976029d3571f8904a3db21d6514ecf6':
Help on issue #8863955 : Google Services keeping phone awake...
2013-05-10 03:06:35 -07:00
Dianne Hackborn
e8c9b39ec9
am 83d6df27: Merge "Help on issue #8863955 : Google Services keeping phone awake..." into jb-mr2-dev
...
* commit '83d6df27d40aed18a7dc42c9320f83656cc81ea0':
Help on issue #8863955 : Google Services keeping phone awake...
2013-05-09 23:40:28 -07:00
Jeff Brown
89efc6e6c1
am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
...
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
Add an API to allow a callback to request active scans.
2013-05-09 17:09:24 -07:00
Amith Yamasani
ecd5afe1ef
resolved conflicts for merge of 069d7e9b to master
...
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
2013-05-09 17:07:08 -07:00
Dianne Hackborn
83d6df27d4
Merge "Help on issue #8863955 : Google Services keeping phone awake..." into jb-mr2-dev
2013-05-09 23:47:22 +00:00
Chet Haase
2d4edcf2e1
am a9d5adea: am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev
...
* commit 'a9d5adea9e9676d19b7a50ce3d6c673c16ee7a6d':
Fix start delay jank in ViewPropertyAnimator
2013-05-09 16:28:33 -07:00
Matthew Xie
b50619cc14
am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev
...
* commit 'c0c7cebe3f5da99aeb48eb62bffbaf3183814194':
Donot bind to GATT service when BLE is not supported
2013-05-09 16:28:30 -07:00
Jeff Brown
da58f92bfa
am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
...
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
Add an API to allow a callback to request active scans.
2013-05-09 16:23:43 -07:00
Amith Yamasani
069d7e9b81
am 153919ed: Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev
...
* commit '153919ed2f128fb5d1b55782ea89fadcc20fc841':
Cache the scaled avatar drawables in the keyguard user switcher
2013-05-09 16:23:31 -07:00
Chet Haase
a9d5adea9e
am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev
...
* commit 'fb32c82412111983236f44cbc8fd90f113d7ea34':
Fix start delay jank in ViewPropertyAnimator
2013-05-09 16:23:29 -07:00
Matthew Xie
c0c7cebe3f
am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev
...
* commit 'b566c466c73d351d01e64d1c9ba609133efc4ffd':
Donot bind to GATT service when BLE is not supported
2013-05-09 16:23:26 -07:00
Jeff Brown
b2f6842d55
Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
2013-05-09 23:04:26 +00:00
Marco Nelissen
13bfebd6b7
Add VideoView.getAudioSessionId()
...
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565
Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
2013-05-09 15:50:38 -07:00
Dianne Hackborn
b14e42f121
Merge "Cleanup some of the thread merging."
2013-05-09 22:30:30 +00:00
Dianne Hackborn
af17baa271
Help on issue #8863955 : Google Services keeping phone awake...
...
...because of Google Play Services
Raise the limit on the number of wake locks we track per uid.
Get rid of the separate limit for the system process, since it
now isn't any larger than the new limit for regular processes.
Change-Id: Ic10c81cad7d4ad4aabf1f53f78191a0973a1d784
2013-05-09 15:27:47 -07:00
Amith Yamasani
153919ed2f
Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev
2013-05-09 22:17:51 +00:00
Chet Haase
fb32c82412
Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev
2013-05-09 22:09:18 +00:00
Amith Yamasani
6fc1d4e8e6
Cache the scaled avatar drawables in the keyguard user switcher
...
Loading the avatar icons and drawing them into the sized bitmap
turns out to be quite expensive and the cost increases with number
of users. Caching them shaves off several hundred milliseconds from
Keyguard inflation time during user switching on the lockscreen.
For instance, 15ms vs. 750ms with 3 avatars on a certain 7" tablet.
Bug: 7986933
Change-Id: I3e2065bfa25aa263133ba204ca364c3b04d7c0ff
2013-05-09 14:44:38 -07:00
Jeff Brown
66f3b39ec4
Add an API to allow a callback to request active scans.
...
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.
Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
2013-05-09 14:44:08 -07:00
Chet Haase
dcfbd6a2c9
Fix start delay jank in ViewPropertyAnimator
...
Issue #8892620 start delay jank in ViewPropertyAnimator
Change-Id: I17a57ac3351fb2c1516b594d135aa9ce9f78c88e
2013-05-09 14:40:21 -07:00
Matthew Xie
b566c466c7
Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev
2013-05-09 21:14:47 +00:00
Romain Guy
ed96ea2a07
Merge "Add the ability to disable OpenGL drivers preloading Bug #8888857 "
2013-05-09 18:28:10 +00:00
Romain Guy
c5e3638c06
Add the ability to disable OpenGL drivers preloading
...
Bug #8888857
Set ro.zygote.disable_gl_preload to true in the build properties.
Change-Id: Idd93ebb4bbd2861ce60af03ed14819a5cfa70dec
2013-05-09 11:08:17 -07:00
John Spurlock
68fcaa2c0b
Merge "Navigation hideybar via new system ui opt-in flag."
2013-05-09 13:39:24 +00:00
Matthew Xie
32ab77b4c5
Donot bind to GATT service when BLE is not supported
...
bug 8664724
Change-Id: I9b9222cd5877babcded73798a5d1ff13fd10e791
2013-05-08 19:26:57 -07:00
Romain Guy
dad7bd706a
Merge "Load OpenGL drivers libraries in Zygote"
2013-05-09 01:29:12 +00:00
Romain Guy
74c691221b
Load OpenGL drivers libraries in Zygote
...
This does not initialize EGL/GL.
Change-Id: I951ae0b7defee86eb06821ea807af3e829f4a73c
2013-05-08 18:14:37 -07:00
Daniel Sandler
fa98345745
am 617055d7: am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
...
* commit '617055d7a9e2c30d1a99bf7e596f8d9e32fab723':
Filter out dangerous CharSequences in Notification.
2013-05-08 17:32:50 -07:00
Daniel Sandler
617055d7a9
am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
...
* commit '5d6dc425287e5651e3a1fdc32591b8791dd9dd18':
Filter out dangerous CharSequences in Notification.
2013-05-08 17:30:43 -07:00
Daniel Sandler
5d6dc42528
Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
2013-05-09 00:28:11 +00:00
Yorke Lee
8b70a2166b
am 3672624c: am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev
...
* commit '3672624cdc8849f7b4944cff501bddb9a14bbdc0':
Add system setting key for dialpad autocomplete
2013-05-08 15:05:25 -07:00
Michael Jurka
82f92ee5bd
am 7741b63c: am 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev
...
* commit '7741b63c5a8e14b5123c4b735dc768cf55fa2ed5':
Fix bug where thumbnails flashed more often in Recents
2013-05-08 15:05:18 -07:00
Fabrice Di Meglio
8be78240f3
am 6eb036e7: am 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev
...
* commit '6eb036e7894758bcc357fc282070aa8677227ce1':
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"
2013-05-08 15:04:33 -07:00
Fergus Henderson
e4085c9967
am 6c641d3c: am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
...
* commit '6c641d3c67bbd91033254debedff56893d6c53a1':
Fix for TTS.setLanguage throwing MissingResourceException
2013-05-08 15:04:22 -07:00
Jamie Gennis
8afcf4411e
am 211eae98: am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
...
* commit '211eae98fce88c7c502eb8f59d956c1a249d77bc':
Add the trace tag for Dalvik.
2013-05-08 15:03:58 -07:00
Alan Viverette
5e6fbf2694
am fa4c935e: am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
...
* commit 'fa4c935edcfa09bb53a3aac411a285842a00ddee':
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
2013-05-08 15:03:49 -07:00