Merge commit 'c104e1b3912f1389848b0cc841866564d9314287'
* commit 'c104e1b3912f1389848b0cc841866564d9314287':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
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 '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0'
* commit '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp
* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3'
* commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3':
docs: document the 'showSearchIconAsBadge" flag and
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 '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
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.
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
Merge commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69'
* commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp
* commit 'd1a3fc38e99e0483402168529020e758ecd777ce':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-mr2
* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
Update keyguard and pattern-lock layouts for new UX designs.
-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.
