Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp
* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp
* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
Fix bugs around removing and attaching WebViews.
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp
* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
Rename several files so that readers would not be confused.
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
When removing a WebView from its Window, remove the WebTextView.
Remove the old attempt to do the same, which was not being called.
When attaching a WebView to a Window, call onWindowFocusChanged so
its state of drawing the selection ring returns.
Fixes http://b/issue?id=2257787 and http://b/issue?id=2260867
Merge commit 'dc6563393789e90d75b44b9ce97c167863bf0771' into eclair-mr2-plus-aosp
* commit 'dc6563393789e90d75b44b9ce97c167863bf0771':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2
* 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 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp
* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp
* commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2
* 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 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp
* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
Add code to use Gservices provided values for throtting NITZ updates.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp
* commit '592988d307e8d305ca163c4e58da0fb350054194':
Add unit tests for Japanization and fix several bugs.
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.
-Only perform validation when the view is *losing* focus.
-Don't perform validation when the window focus changes. This causes odd
behavior like validation being peformed when menu is pressed, or long
press dialogs pop-up.
Merge commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39' into eclair-mr2-plus-aosp
* commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39':
Fix BMW and Audi auto pairing lists.
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-mr2
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
