Merge commit 'e4d51bb2a9706a08c3160eb39e076a89c225257c' into eclair-plus-aosp
* commit 'e4d51bb2a9706a08c3160eb39e076a89c225257c':
fix [2152247] Windows sometimes drawn scaled up.
invalidate the surface when the physical changes
introduce the notion of the requested size in the Layer state
remove unused code
Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp
* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
* changes:
fix [2152247] Windows sometimes drawn scaled up.
invalidate the surface when the physical changes
introduce the notion of the requested size in the Layer state
remove unused code
Merge commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020' into eclair-plus-aosp
* commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020':
Add a simple test of OpenGL ES 1.x.
This introduces problems when scrolling through preference screens, due
to a clash in this cache versus the ListView's cache.
This reverts commit 01dbc2ed55.
Merge commit '15f0699504e64c1e290ef8955b1306d2a4a08201' into eclair-plus-aosp
* commit '15f0699504e64c1e290ef8955b1306d2a4a08201':
Updated status bar icons.
(Statusbar_Icons280909_All drop.)
Still to be tweaked:
ringer_vibrate
roaming_cdma_0
roaming_cdma_flash_anim0
tty_mode
Change-Id: I96aad5c650bf0022a2c5f03f5f77ab333b834e97
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp
* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '27d8514f56574011c606daedc5cabf0219b5be81' into eclair-plus-aosp
* commit '27d8514f56574011c606daedc5cabf0219b5be81':
Fix possible crash in AutoCompleteTextView.
- move poster drawing on the WebKit side
- get rid of the child views
- add prepareToPlay method to the MediaPlayer iface.
Fixes http://b/issue?id=2156592
Merge commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661' into eclair-plus-aosp
* commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661':
Handle bad lines in /proc/wakelocks : Fix for 2124260
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.
This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.
This change also fixes a couple of typos.
Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp
* commit '1537a25520405f384b072c58fee935a29c4e14ea':
Remove unused api in QuickContact.java and fix the build.
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp
* commit '85d86af982026145aa69a4ca280d394b9ea90372':
Fix vCard composer in three points.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
Use the return value from the native parser to skip over bad lines. When
the wakelocks overflow, there could be empty or badly formatted lines.
Skip over them.
