Merge commit '9a025349dc5a4e699fbe99a714f523e9903fa534'
* commit '9a025349dc5a4e699fbe99a714f523e9903fa534':
SipAudioCall: perform local ops before network op in endCall()
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'
* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'
* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
Making sure that the prefix is handled properly.
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten
Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
SipAudioCall: perform local ops before network op in endCall()
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp
* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp
* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
Making sure that the prefix is handled properly.
In the case when stop is pressed after takePicture has been called
but the CAMERA_MSG_COMPRESSED_IMAGE message from camera has not yet
been received, preview was not getting restarted. The reason was that
CameraSource::stop sets the camera listener to NULL and hence the
dataCallback() function which handles the CAMERA_MSG_COMPRESSED_IMAGE
message and restarts preview never got called.
Change-Id: Ib8f3bb77d9eab1ed5a67798569025ea0d63d7fd4
set/addContentView is never called.
Fix bugs around lazy initialization of ActionBar in Activities.
Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
orientation change
Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.
Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'
* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
Optimize VelocityTracker to run in linear time.
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
