Merge commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70' into eclair-plus-aosp
* commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70':
Add better transition to rotary lock widget when triggering: spin around instead of snap back.
Merge commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6' into eclair-plus-aosp
* commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6':
Add resources to allow forcing accelerometer based orientation management when docked.
Merge commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b'
* commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
Merge commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c' into eclair-plus-aosp
* commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707'
* commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707':
Add better APIs for the battery status, and other cleanup.
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
* 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 '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 '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818'
* commit '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit '7714401570e01086f84e11e0383209eb0ccaf25f'
* commit '7714401570e01086f84e11e0383209eb0ccaf25f':
Revert "ContactsContract: Adding joined columns to the Data class definition."
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
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
ContactsContract: Adding joined columns to the Data class definition.
In particular, this no longer attempts to back up the on/off state of specific
backend syncing [gmail/contacts/calendar], nor the "background data" toggle.
The former was causing a great deal of spurious trips through backup as the
notification was being tickled during general sync operation, and the latter
makes little sense at restore time.
Fixes these issues:
b/2097613 - frequent "backup_data_changed" messages in event log
b/2131662 - should not backup background data, master sync settings
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
RawContacts.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Contacts.DISPLAY_NAME, // 5
};
The most noxious line is RawContacts.CONTACT_ID
After this change, the above declaration changes to:
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
};
Change-Id: I03bfc700e4c8c58a175bc885bf7b807d7fed0744
