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."
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
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: I03bfc700e4c8c58a175bc885bf7b807d7fed0744
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp
* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit 'ad479513541821012ca8ed9be288871976b24a02'
* commit 'ad479513541821012ca8ed9be288871976b24a02':
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.
Merge commit 'c66b3113f80ae0451bcaa48f595c732e9035e33a'
* commit 'c66b3113f80ae0451bcaa48f595c732e9035e33a':
Add one line of logging when SCO SOCKET connect starts.
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 '1e8c95318f0cce70dc66fb29036d084d5665abd8'
* commit '1e8c95318f0cce70dc66fb29036d084d5665abd8':
Show the live wallpaper on the lock screen.
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 '38a2ab36ceb5e54c820a67f2b1da1652dcfc2643'
* commit '38a2ab36ceb5e54c820a67f2b1da1652dcfc2643':
Do not attempt to retry a scrollTo with a negative position.
Merge commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c' into eclair-plus-aosp
* commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c':
Do not attempt to retry a scrollTo with a negative position.
Merge commit '06ddfd187b19186406e401fd2222017fd61da848'
* commit '06ddfd187b19186406e401fd2222017fd61da848':
When a WebView starts, we may get first layout before viewSizeChanged()
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
Merge commit '9aa012234f7b5f41dded1d018d48161344fd8544'
* commit '9aa012234f7b5f41dded1d018d48161344fd8544':
Draw shadow below title, or at top if title is off screen.
Merge commit '58992eac8373ba7260d99dd832a6fc9e3d164460' into eclair-plus-aosp
* commit '58992eac8373ba7260d99dd832a6fc9e3d164460':
Draw shadow below title, or at top if title is off screen.
Merge commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5'
* commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5':
Reserve space for the searchbox spinner, even when stopped.
Merge commit 'dfcbc046d7fcd74c8aacd9f26bd48084900d3b4a' into eclair-plus-aosp
* commit 'dfcbc046d7fcd74c8aacd9f26bd48084900d3b4a':
Reserve space for the searchbox spinner, even when stopped.
Make the searchbox spinner invisible (transparent) when it's not active. This prevents the size of the text field from varying depending on whether the spinner is spinning or not, which can cause an annoying flicker.
Bug: 2084293
Change-Id: Idd63a296d1f07c5bd47884040f21e4880038f424
Merge commit 'b2e64cb892d64af770b43a84b54ebfbca7c0c5e2'
* commit 'b2e64cb892d64af770b43a84b54ebfbca7c0c5e2':
Adopt new FastTrack API for internal widget, fix bugs.
