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 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2
* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2
* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp
* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
Squashed commit of the following:
Merge commit '744043fcbf48c32c2051f222eca552fa2df5dfcb' into eclair-mr2-plus-aosp
* commit '744043fcbf48c32c2051f222eca552fa2df5dfcb':
Update FileSource to also accept a file descriptor and a range.
Events are now cancelled given their "unique" event_id instead of the event pointer
itself (which may be reallocated in place if we're unlucky). Also the ability to
cancel multiple events matching a predicate has been added.
Merge commit '1ff57418a7d58887301766031554a146c1ededd1'
* commit '1ff57418a7d58887301766031554a146c1ededd1':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit '3a624abe2735168d288bf905ab9cb8ca60a77be5'
* commit '3a624abe2735168d288bf905ab9cb8ca60a77be5':
Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit '234e509a67eb32606f3051d21eb3ea25b272d80d'
* commit '234e509a67eb32606f3051d21eb3ea25b272d80d':
Add setPriority to allow wallpapers to run at lower cpu priority than default.
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'
* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44'
* commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44':
Minor fix for the parent style computation in the layoutlib.
Merge commit '7174fcf6031234bfc9aa29bf3085d14742cab944'
* commit '7174fcf6031234bfc9aa29bf3085d14742cab944':
dumpstate: include the contents of the last radio log
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'
* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
Rename several files so that readers would not be confused.
Merge commit '8c808187249f473702e0f4bee2147da292490963' into eclair-mr2-plus-aosp
* commit '8c808187249f473702e0f4bee2147da292490963':
Modify test code a little.
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.
