Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-plus-aosp
* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-plus-aosp
* commit '660282dc3e81784224945be0787a9e2d4276de8c':
Check if Bluetooth is enabled before making any calls down.
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static. A lot of code used it like it was per-instance,
but this would actually block all instances. This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.
Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews. These nested views
are inflated and treated as addView() calls.
This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen. Also fixes ViewAnimator
to observe the measureAllChildren flag when set.
Fixes http://b/2239905
Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp
* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp
* commit '9284dec737da58a92b3aa916a357e700d291a68a':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp
* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
Add code to use Gservices provided values for throtting NITZ updates.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.
Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
