Jean-Michel Trivi
e215af22bf
am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev
...
* commit 'c79a9eaced675d176dda570da6a08c6e54743bec':
New action and extra in RecognizerIntent for "hands free" voice search
2012-05-17 17:17:07 -07:00
Michael Jurka
e673396387
resolved conflicts for merge of ede4d56e to jb-dev-plus-aosp
...
Change-Id: I8893e819f0f814a1fe1e0fb7f70dba860e889135
2012-05-17 17:13:14 -07:00
Jean-Michel Trivi
c79a9eaced
Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev
2012-05-17 16:06:54 -07:00
Michael Jurka
ede4d56ec7
Merge "Fix issue where static wallpaper was offset on boot" into jb-dev
2012-05-17 16:01:35 -07:00
Michael Jurka
321357b606
Fix issue where static wallpaper was offset on boot
...
Bug: 6447391
Change-Id: Ie89bfdfd81dbf80ad7d109717f83c4bc7b42acf1
2012-05-17 15:50:51 -07:00
Owen Lin
5558f66efe
am cb949887: Merge "Release the constraint on the requested version." into jb-dev
...
* commit 'cb949887d0e8cca616dca532daf2be5b6f4a77af':
Release the constraint on the requested version.
2012-05-17 15:45:53 -07:00
Owen Lin
bdf6b5dde1
am 61382964: Merge "Nvidia\'s patch for reusing bitmap in image region decoding." into jb-dev
...
* commit '613829644e689a8281bb9110638e15d17602d57e':
Nvidia's patch for reusing bitmap in image region decoding.
2012-05-17 15:45:51 -07:00
Jean-Michel Trivi
482c9bb390
New action and extra in RecognizerIntent for "hands free" voice search
...
New action and extra for android.speech.RecognizerIntent:
ACTION_VOICE_SEARCH_HANDS_FREE
EXTRA_SECURE
Change-Id: I1f390ede4f4087bae1781347bb211dc0a093e857
2012-05-17 15:43:40 -07:00
Adam Powell
b3af144ffe
am d2cc8744: Merge "Update framework assets for switches." into jb-dev
...
* commit 'd2cc8744412e9dac5fc83b3bf3dba6adda1806ad':
Update framework assets for switches.
2012-05-17 15:42:17 -07:00
Owen Lin
cb949887d0
Merge "Release the constraint on the requested version." into jb-dev
2012-05-17 15:41:08 -07:00
Owen Lin
613829644e
Merge "Nvidia's patch for reusing bitmap in image region decoding." into jb-dev
2012-05-17 15:40:52 -07:00
Adam Powell
d2cc874441
Merge "Update framework assets for switches." into jb-dev
2012-05-17 15:40:00 -07:00
Martijn Coenen
47e5794baa
am d42ad1da: Merge "NFC API documentation." into jb-dev
...
* commit 'd42ad1da2fbf29382d624ad1e1bd2c7519e3377f':
NFC API documentation.
2012-05-17 15:32:45 -07:00
Adam Powell
c32b7c68a8
Update framework assets for switches.
...
Bug 6283949
Change-Id: I74a48b14f3484e707861e05851c4a9f87c8156c9
2012-05-17 15:30:51 -07:00
Martijn Coenen
d42ad1da2f
Merge "NFC API documentation." into jb-dev
2012-05-17 15:30:08 -07:00
George Mount
aa5f858176
am ea1603de: Merge "Update the IME with selection and composing region changes." into jb-dev
...
* commit 'ea1603de2a364cd857b800579e5b90f3c03b030a':
Update the IME with selection and composing region changes.
2012-05-17 15:23:28 -07:00
George Mount
e0df34f603
am bb8549db: Merge "Sync the selection cursor when adjusting caret handle." into jb-dev
...
* commit 'bb8549dbb1fbe5c60cbe70e4afcb5ef802893bf6':
Sync the selection cursor when adjusting caret handle.
2012-05-17 15:23:26 -07:00
George Mount
ea1603de2a
Merge "Update the IME with selection and composing region changes." into jb-dev
2012-05-17 15:21:07 -07:00
George Mount
bb8549dbb1
Merge "Sync the selection cursor when adjusting caret handle." into jb-dev
2012-05-17 15:21:01 -07:00
Jeff Brown
031ffb15ac
am 7852a59d: Merge "Use FLAG_LONG_PRESS for headset long press interactions." into jb-dev
...
* commit '7852a59d5d0e9a2ba5a954f4759d16c500b6b035':
Use FLAG_LONG_PRESS for headset long press interactions.
2012-05-17 15:16:10 -07:00
Jeff Brown
7852a59d5d
Merge "Use FLAG_LONG_PRESS for headset long press interactions." into jb-dev
2012-05-17 15:14:12 -07:00
Irfan Sheriff
46579dc8af
am f82e7693: Merge "handleAirplaneModeToggled cleanup" into jb-dev
...
* commit 'f82e7693ca4396435ef91c7be5348731d9e863c0':
handleAirplaneModeToggled cleanup
2012-05-17 14:22:41 -07:00
Irfan Sheriff
f82e7693ca
Merge "handleAirplaneModeToggled cleanup" into jb-dev
2012-05-17 14:19:46 -07:00
Irfan Sheriff
42d73bba66
handleAirplaneModeToggled cleanup
...
Addressing a cosmetic comment from the previous CL
Bug: 6504534
Change-Id: I04981f8b541611cb93110e8b88cd7751027060cc
2012-05-17 14:14:44 -07:00
Irfan Sheriff
16cf17ce60
am ce66556a: Merge "Fix persisting wifi state on setWifiEnabled() call" into jb-dev
...
* commit 'ce66556a345aacad517f8eb72ddec20160ce9d61':
Fix persisting wifi state on setWifiEnabled() call
2012-05-17 14:12:59 -07:00
Irfan Sheriff
ce66556a34
Merge "Fix persisting wifi state on setWifiEnabled() call" into jb-dev
2012-05-17 14:10:35 -07:00
George Mount
e41dfd9759
Sync the selection cursor when adjusting caret handle.
...
Bug 6512357
Change-Id: Ie8b0c6a17ea668b2c4ba9f3de404fdc0c2d319f8
2012-05-17 14:10:28 -07:00
Irfan Sheriff
f03d62007c
Fix persisting wifi state on setWifiEnabled() call
...
When somebody makes a quick setWifiEnabled calls in back to back succession,
we were missing setting the last state because we were only doing that
when wifi was in a particular state from a state machine's perspective.
This was done to handle the interaction b/w airplane and wifi and was
done in the wrong way. That part is now moved to the code which detects
airplane mode changes.
In the longer term, I want to move the whole persisting code as part of
wifi state machine which is more aware of the exact states wifi is in.
Bug: 6504534
Change-Id: I452f3f4efdeb84458dcfd280269e09ffa3844f05
2012-05-17 14:05:56 -07:00
Jeff Brown
ab624c2fd4
Use FLAG_LONG_PRESS for headset long press interactions.
...
Handle canceled key events correctly and don't synthesize
key events in that case.
Unfortunately, the state machine was confused by some sequences
of key events that it might receive from the input dispatcher
when new activities take focus during a long-press on the headset key.
The audio service may receive a cancel event intended for the old
window, followed by a repeated down and finally an up for the new window.
Simplified this down to just two booleans.
Bug: 6484717
Change-Id: I9587d0a5e282419ef4d7c17665940682aacea96a
2012-05-17 14:00:34 -07:00
Craig Mautner
a978d9bfef
am d51a68b3: Merge "Eliminate deferred surface destruction." into jb-dev
...
* commit 'd51a68b3d2d347be989b53af1777454f97ad9b46':
Eliminate deferred surface destruction.
2012-05-17 13:13:56 -07:00
Craig Mautner
d51a68b3d2
Merge "Eliminate deferred surface destruction." into jb-dev
2012-05-17 13:11:50 -07:00
Owen Lin
3bbcbcd5f9
Release the constraint on the requested version.
...
Allowing to request a region that partially outsides the image.
bug: 5884845
Change-Id: I32344930ab9e2a7f22a706914babb165843e8de7
2012-05-17 12:48:11 -07:00
Owen Lin
f970c2e6de
Nvidia's patch for reusing bitmap in image region decoding.
...
bug: 5884845
Change-Id: I43d4d86ee94591b0b53393dfba13c7cc5c4e428d
2012-05-17 12:48:02 -07:00
Jesse Wilson
0ddb5d3b5d
am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev
...
* commit '9cb376e792567b5278e0eb418a3aeb848339a283':
Change NPN to forbid empty lists of protocols.
2012-05-17 11:20:21 -07:00
Jesse Wilson
9cb376e792
Merge "Change NPN to forbid empty lists of protocols." into jb-dev
2012-05-17 11:18:33 -07:00
Jean-Michel Trivi
1644f0d9ee
am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev
...
* commit '0a95ce9ffbfa39def9186c736f6b135d251bc810':
Handle media button events during phone calls and when ringing
2012-05-17 11:17:12 -07:00
Jean-Michel Trivi
0a95ce9ffb
Merge "Handle media button events during phone calls and when ringing" into jb-dev
2012-05-17 11:14:56 -07:00
Daniel Sandler
94496d5741
am cb5ed06a: Merge "Hide the expanded status bar view when not in use." into jb-dev
...
* commit 'cb5ed06ada51f3421b236c4053b6742d5306ace2':
Hide the expanded status bar view when not in use.
2012-05-17 11:00:52 -07:00
Daniel Sandler
cb5ed06ada
Merge "Hide the expanded status bar view when not in use." into jb-dev
2012-05-17 10:55:58 -07:00
George Mount
cdd48a70df
Update the IME with selection and composing region changes.
...
Bug 6507332
The IME must be informed whenever the selection or composing
region changes so that it can adjust its replacement regions
and suggestions.
Change-Id: I484b112a2fede6528b0bc506711284b59bd886d1
2012-05-17 10:51:18 -07:00
Jesse Wilson
2108ead7f1
Change NPN to forbid empty lists of protocols.
...
Bug: http://b/6438423
Change-Id: Ie89220e5bc219396c15dbe1feaa2f74fa1b243eb
2012-05-17 13:46:17 -04:00
Jean-Michel Trivi
722b808662
Handle media button events during phone calls and when ringing
...
Add functionality in AudioManager/AudioService to register a
media button receiver for telephony that, when registered, gets
priority for media button key events during a phone call or
when ringing.
Bug 6484717
Change-Id: I0835fc02cb24d06ca59af5a32c3ba0ae93e54442
2012-05-17 10:38:36 -07:00
Daniel Sandler
3ac558b6bf
Hide the expanded status bar view when not in use.
...
Bug: 6511388
Change-Id: I8df11f80871cbd739712179034e04f49bb6b0d9d
2012-05-17 13:38:11 -04:00
Svetoslav Ganov
91408aae7a
am 308904dc: Merge "Refactor WebView accessibility code into a separate class." into jb-dev
...
* commit '308904dcd01c7bdadd183f262ead408856822a0e':
Refactor WebView accessibility code into a separate class.
2012-05-17 10:34:19 -07:00
Svetoslav Ganov
308904dcd0
Merge "Refactor WebView accessibility code into a separate class." into jb-dev
2012-05-17 10:32:27 -07:00
Daniel Sandler
9fd6156829
am a5d17288: Merge "New null (disconnected) RSSI for wifi and mobile." into jb-dev
...
* commit 'a5d17288ffeba130fe6ee4673f0ad880b3b42fb7':
New null (disconnected) RSSI for wifi and mobile.
2012-05-17 10:22:36 -07:00
Daniel Sandler
a5d17288ff
Merge "New null (disconnected) RSSI for wifi and mobile." into jb-dev
2012-05-17 10:20:40 -07:00
Daniel Sandler
d4b7e92744
New null (disconnected) RSSI for wifi and mobile.
...
On wifi-only devices we now show the null wifi RSSI if wifi
is enabled but not connected.
Bug: 6449811
Change-Id: Ib0cb11bcbef86d44ec633690806cff38796ffc3e
2012-05-17 13:02:50 -04:00
Amith Yamasani
00e5d8bbc9
am e43e08bb: Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev
...
* commit 'e43e08bb24f1ecb85c2f045ae66799f23588de43':
Avoid launching dialogs twice from double-clicking a preference.
2012-05-17 10:00:24 -07:00
Amith Yamasani
e43e08bb24
Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev
2012-05-17 09:57:38 -07:00