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
Merge commit '58992eac8373ba7260d99dd832a6fc9e3d164460' into eclair-plus-aosp
* commit '58992eac8373ba7260d99dd832a6fc9e3d164460':
Draw shadow below title, or at top if title is off screen.
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 '0050ee36398c3ab6e5f1ee0038609aff8cf4f0e9' into eclair-plus-aosp
* commit '0050ee36398c3ab6e5f1ee0038609aff8cf4f0e9':
Adopt new FastTrack API for internal widget, fix bugs.
Change internal widget to use new FastTrack API instead of
using SHOW_OR_CREATE. Also reset the internal Uri when
reused in lists. Fixes http://b/2087222
Merge commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5' into eclair-plus-aosp
* commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5':
CertTool: avoid using final static array.
Merge commit 'cd25c56ad442fd5574c1fa49e0d443a80551ee1f' into eclair-plus-aosp
* commit 'cd25c56ad442fd5574c1fa49e0d443a80551ee1f':
Add each contact in vCard into "My Groups" if account is for Google's and it has such a group.
* changes:
Add each contact in vCard into "My Groups" if account is for Google's and it has such a group. This fix should be temporal. Should be fixed in the near future.
Merge commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e' into eclair-plus-aosp
* commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e':
Fix issue #2093608: Calendar widget takes a few seconds to launch
Avert your eyes!
The key change here is that RemoteViews can now call a Context API to
start its pending intent, which inside of the activity manager we can
use to determine to cancel the timeout delay for external entities
to disrupt the home screen.
Change-Id: If097cf7478cbed7a3c04a304050bd7fd5703d197
Merge commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2' into eclair-plus-aosp
* commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2':
Some tweaks to the rotary lock widget.
Merge commit '2b1e67790bf101b2d65e0b38c8b0f3b8676d0129' into eclair-plus-aosp
* commit '2b1e67790bf101b2d65e0b38c8b0f3b8676d0129':
do not use transactions for calls that just read the DB
- don't show arrows above widget when in resting state
- don't show other icon once you press one (e.g don't show silent mode icon when you are pressing the lock icon)
- wider target for triggering action
Merge commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83' into eclair-plus-aosp
* commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83':
Make the EditText error popup correctly resize when the view resizes.
