- Exposing the specific resolution profile levels
QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.
Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp
* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
Fix number counter will keep going after window losed focus.
Merge commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3'
* commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3':
Allow two SurfaceViews inbetween the app and the wallpaper.
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'
* commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
Make sure OutOfMemoryError is handled by WallpaperManager
gingerbread had an import android.os.*. master doesn't. auto-merger
applied it fine, but it doesn't compile.
Change-Id: I28d7b5053616a40223eeb29a0669831d5ca76d9e
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp
* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
Allow two SurfaceViews inbetween the app and the wallpaper.
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp
* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'
* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
Changed menu and expandedMenu background color to dark.
Merge commit '38f75b97d92508633c69eb6461efd353a61dab96'
* commit '38f75b97d92508633c69eb6461efd353a61dab96':
This was already deprecated, but not picked up by the tool DO NOT MERGE
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'
* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
Avoid pre-processing images when they won't be used
Merge commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d'
* commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d':
Make @deprecated without a comment an error DO NOT MERGE
Merge commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5'
* commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5':
Fix the last remaining @deprecated tag without comment warning.
Merge commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f'
* commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f':
Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
- Added hasProfile to CamcorderProfile and JNI.
- Added hasCamcorderProfile to MediaProfiles.
- using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera
in get().
Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
- Added enums QUALITY_{QCIF,480P,720P,1080P}
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile
and corresponding ones in MediaProfiles.
- Added functions createDefaultCamcorderTimeLapseLowProfile,
createDefaultCamcorderTimeLapseHighProfile to set default values.
- Moved javadoc for constants to the get() function.
Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp
* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
Changed menu and expandedMenu background color to dark.
