This fixes the bug preventing switching between global and in-app search,
and also enables long press for voice search (I think).
Bug: 2127442
Change-Id: I045a0f7b2c797c016191709a3983b6b33fc6186e
Merge commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107' into eclair-plus-aosp
* commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107':
Set intent_component of in-app shortcuts to app itself
Fixes http://b/issue?id=2130474
"Shortcuts created by pivoted-in search do not
have intent_component_name set"
Change-Id: I702fe39348b762393ed08ce9905771eb892bf782
Merge commit '718970bcf35252451ae15a326bd897b436ba93f3' into eclair-plus-aosp
* commit '718970bcf35252451ae15a326bd897b436ba93f3':
Send the UUID intent even if apps have not requested for it.
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp
* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
Track CPU speed stepping to get more accurate CPU cost per app.
Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp
* commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c':
Unhide Camera lock and unlock API.
This will help apps listening to this intent to update icons etc
if the remote uuid changes. For example, the settings app used to
refresh the icons when the class bits change. It can do it now
when the remote ends uuids changes too.
Change-Id: Ib9af45780e83118d8877b0ef16f5b39b87fb4bef
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.
Also, fix for 2062930: NPE at VolumePreference.onKey()
Merge commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c' into eclair-plus-aosp
* commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c':
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Merge commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7' into eclair-plus-aosp
* commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7':
Fix 2092386: Support yuyv for camera preview format.
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."
