Merge commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06'
* commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp
* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2
* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d'
* commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d':
Check if Bluetooth is enabled before making any calls down.
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp
* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
Check if Bluetooth is enabled before making any calls down.
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2
* commit '660282dc3e81784224945be0787a9e2d4276de8c':
Check if Bluetooth is enabled before making any calls down.
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp
* commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af':
Move photo querying off main thread.
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'
* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
Clean up codes and remove/modify stale codes/comments.
Merge commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6'
* commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6':
Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'
* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2
* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
Move photo querying off main thread.
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'
* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'
* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
Rename several files so that readers would not be confused.
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp
* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'c0b0ad212a8fa55da91fd759cc2451afe8134d43' into eclair-mr2-plus-aosp
* commit 'c0b0ad212a8fa55da91fd759cc2451afe8134d43':
Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-mr2
* commit 'f0166e4dd0907e487531960e36f516406d265b73':
Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
This fixes the following glitches:
- flash at the end of animation as the widget resets. Fix: new "hold" animation holds the view for 1 second, allowing it to transition before we reset the view.
- target flashing. Fix: remove AlphaAnimation when we want to hide the target.
- bar appears to get stuck at edge. Fix: sliding bar now slides fully offscreen when hold == true. Added setHoldAfterTrigger() method to allow InCallScreen and LockScreen to have different behaviors.
- view continues to animate when shown again. Fix: reset the animations and sliders when the view is hidden.
Tested:
Answer/Decline call on CDMA and GSM device.
Unlock phone and toggle sound on/off in LockScreen on both devices.
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp
* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.
Make Constants public and rename it to VCardConstants.
Internal issue number: 2242528, 2195990
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
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.
