Merge commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8'
* commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8':
Add drop shadow to contact name in ContactHeaderWidget
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'
* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp
* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
Don't crash search when getKeyDispatcherState() is null
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp
* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
Add drop shadow to contact name in ContactHeaderWidget
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp
* commit '99638e747251929191f7773d2a81bbea223f1e09':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '75ce6b103810efbc61af4b786651d9cc414107fd'
* commit '75ce6b103810efbc61af4b786651d9cc414107fd':
Add an API to request a system activity to turn on Bluetooth.
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp
* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
Add an API to request a system activity to turn on Bluetooth.
Merge commit '91d538447029330921e0d960f8616aac1929fb66'
* commit '91d538447029330921e0d960f8616aac1929fb66':
Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp
* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
Fading scrollbars return. But you have to opt in.
Merge commit 'c2ae2865138e8a42d49abd17542981b33a044ed4'
* commit 'c2ae2865138e8a42d49abd17542981b33a044ed4':
Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp
* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '963cd288a5bef260d06fbfd096e6f02793b83532'
* commit '963cd288a5bef260d06fbfd096e6f02793b83532':
Before we send VIEW_SIZE_CHANGED after first layout,
Merge commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c'
* commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp
* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
Before we send VIEW_SIZE_CHANGED after first layout,
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp
* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
Cache inflated view to avoid inflation of layouts in preferences
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp
* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
we should remove VIEW_SIZE_CHANGED in the queue if
there is any as we are going to send the message in
the front of the queue.
Fix http://b/issue?id=2133222
Merge commit '858089557514424175a4bd9c89276dca1f92b95d'
* commit '858089557514424175a4bd9c89276dca1f92b95d':
WebView may get message after destroy() is called.
Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'
* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
Always consider m4a files as audio, even when they contain a video track.
* changes:
Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
Merge commit '12482deafbe520ed9e88691e0caaa6f5e0e49519'
* commit '12482deafbe520ed9e88691e0caaa6f5e0e49519':
Updated status bar graphics (drop date 9/25/09).
Merge commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435'
* commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435':
don't emit GL commands when sf is in freeze mode
Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'
* commit 'aa507136493b24a899b270367b08a7158085c9b8':
Check that playlist entries refer to a row in the audio table.
