Merge commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e'
* commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e':
Add ability to keep screen on while docked.
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp
* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
Add better APIs for the battery status, and other cleanup.
Merge commit 'b7b083090f7312f83453e3f3c2e40a91644a3059'
* commit 'b7b083090f7312f83453e3f3c2e40a91644a3059':
Add API to send an ordered sticky broadcast.
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp
* commit 'a382cb81187437aa389dc131687e181ceaefa8ba':
Add API to send an ordered sticky broadcast.
Merge commit 'ac810e53b70aa01c148c998c57f6888160e1557a' into eclair-plus-aosp
* commit 'ac810e53b70aa01c148c998c57f6888160e1557a':
Add new API for fetching UUIDs using SDP.
Add new API which clients can use to force an SDP query.
The result is broadcast using an intent having the UUIDs.
The intent is broadcast after a timeout, in case of an error.
This timeout is greater than the page timeout.
Change-Id: I61e6db4c05b34c42f679a66987e37e2063a793b6
Merge commit '399e4fdc27592646537582ef922a8c0a8ff9270a'
* commit '399e4fdc27592646537582ef922a8c0a8ff9270a':
Moved the toString method in the parent Connection class.
Merge commit '338c48554f35dbee3faa4e39525a972f20a7c32d' into eclair-plus-aosp
* commit '338c48554f35dbee3faa4e39525a972f20a7c32d':
Moved the toString method in the parent Connection class.
* changes:
Unhide attributes textAppearanceSearchResultSubtitle and attr/textAppearanceSearchResultTitle. We had discussed doing this in Donut but looks like it never happened. We need these attributes for voice search so now's as good a time as any.
attr/textAppearanceSearchResultTitle. We had discussed doing
this in Donut but looks like it never happened. We need these
attributes for voice search so now's as good a time as any.
Merge commit '46452f6c7efd834f54ffcf16cbb48ad0c00715d1'
* commit '46452f6c7efd834f54ffcf16cbb48ad0c00715d1':
When double tap zoom out to overview mode, force reveal the full
Merge commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00' into eclair-plus-aosp
* commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00':
When double tap zoom out to overview mode, force reveal the full
Merge commit '58c243450d054893c234159ea62262c7f2c0a139'
* commit '58c243450d054893c234159ea62262c7f2c0a139':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp
* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
Merge commit '7235e015acb796f247fc18975b6438d6543f95ee'
* commit '7235e015acb796f247fc18975b6438d6543f95ee':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp
* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit 'f44ddb6b4501906a34a05f9367333d870594798c'
* commit 'f44ddb6b4501906a34a05f9367333d870594798c':
Draw a green triangle using OpenGL 2.0 APIs.
Merge commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d' into eclair-plus-aosp
* commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d':
Draw a green triangle using OpenGL 2.0 APIs.
Merge commit '5813b3097451dc4d061eb75e5479e4ea15d886c7'
* commit '5813b3097451dc4d061eb75e5479e4ea15d886c7':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818'
* commit '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit 'a63276ed69ef10ec5cc29a5c3b392a268d25bf07'
* commit 'a63276ed69ef10ec5cc29a5c3b392a268d25bf07':
Inefficient but correct fix for 2122381: call finishBackup after every performBackup
Merge commit '7714401570e01086f84e11e0383209eb0ccaf25f'
* commit '7714401570e01086f84e11e0383209eb0ccaf25f':
Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit 'd1081266712bdd1e8d37a83e5b561c2e05abd36d'
* commit 'd1081266712bdd1e8d37a83e5b561c2e05abd36d':
Clean up some debugging and add 2 math lib routines.
The rationale is this. Since all these joined columns are currently on
different classes, we routinely see code like this:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
Data.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Data.DISPLAY_NAME, // 5
};
After this change, the above declaration changes to:
private static final String[] PROJECTION_PHONE = {
Phone._ID, // 0
Phone.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Phone.DISPLAY_NAME, // 5
};
Change-Id: I2e84bca3277aeef06eec20cee8c2119ef3b90a9f
