Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp
* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
handle calendars with an access level of "root"
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp
* commit 'd163f4babe101b89aaf322c34d3bafeae237f7da':
Don't back up / restore certain sync-related settings
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp
* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
Add better APIs for the battery status, and other cleanup.
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 '22bfcbca4f9f4e88dee120c5bf71545f40289e00' into eclair-plus-aosp
* commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00':
When double tap zoom out to overview mode, force reveal the full
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp
* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
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
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp
* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp
* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
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
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: I820e68efd6c1364241596f826c4da1b9c2defe11
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp
* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
Add a Gservices setting to controll the app error reporting feature.
This keeps consistency with Bluez which uses upper case string address. It's
important to keep the case the same so that .equals() in BluetoothService.java
work.
Change-Id: I6404ca137d0aec3cc2e6e7cb79763d5305a03547
Merge commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d' into eclair-plus-aosp
* commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d':
Add progress view and default poster for the <video> implementation
Merge commit '93727454caf1b3540a352328abd0400c2242902b' into eclair-plus-aosp
* commit '93727454caf1b3540a352328abd0400c2242902b':
Add one line of logging when SCO SOCKET connect starts.
Merge commit 'ffda371c220de9c97663fef4e9d14bee7267383d' into eclair-plus-aosp
* commit 'ffda371c220de9c97663fef4e9d14bee7267383d':
Show the live wallpaper on the lock screen.
This is to help collect information from Moto QA about delays connecting BT
audio.
Change-Id: I790c65f5b64c85aaffc0e68ebe8b6202f476b39f
http://b/2129464
Merge commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c' into eclair-plus-aosp
* commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c':
Do not attempt to retry a scrollTo with a negative position.
Merge commit '6ed525ecee76541aa60ca95598330e990fa16ffa' into eclair-plus-aosp
* commit '6ed525ecee76541aa60ca95598330e990fa16ffa':
When a WebView starts, we may get first layout before viewSizeChanged()
This also takes care of the problem of system dialogs like the
crash dialog causing the status bar to dim behind the lock screen.
On the down side, the fade transition from the lock screen is
now gone, and I'm not sure how likely it is for it to return.
Change-Id: I7f9e6d0f3510a1fdbbe6ad252d986bd85a16475d
