Merge commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6' into eclair-plus-aosp
* commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6':
Add resources to allow forcing accelerometer based orientation management when docked.
Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp
* commit 'b8155068ef855147d86465817be2660a5212a6bb':
Wake the screen if the proximity wakelock is released while the proximity sensor is active.
Merge commit '2b1cfef19efb11d283a08042d37a326141c28429' into eclair-plus-aosp
* commit '2b1cfef19efb11d283a08042d37a326141c28429':
Change the broadcast intent for dock state changes from a sticky broadcast to
* changes:
Change the broadcast intent for dock state changes from a sticky broadcast to a sticky ordered broadcast. This is so individual apps can override the default behavior and stop the related dock app from launching.
This fixes a problem that resulted in the screen staying off indefinitely if the prox sensor
is active at the beginning of a bluetooth call and could result in the screen staying off
in other similar circumstances.
Change-Id: Icfa0046d3179f9bb2247e7a3c1f9ff073312667a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c' into eclair-plus-aosp
* commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
The process for starting wifi was using a wakelock around a message-pass and this was causing
an exception for meer mortals (who don't have WAKE_LOCK permission).
bug: 1750535
Merge commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893' into eclair-plus-aosp
* commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893':
Implement compareStrictly() using phone_number_compare() written in C.
As per several discussions, we stick to the default behavior now.
In stead, we provide compareStrictly() as a hidden method, so that some
internal components are able to use the method if needed.
Since these are static methods, they cannot refer to the configuration files,
whose values can be obtained only via Resources object.
Please make callers' side if you want to use strict version of compare().
Internal issue number: 1892808
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 '338c48554f35dbee3faa4e39525a972f20a7c32d' into eclair-plus-aosp
* commit '338c48554f35dbee3faa4e39525a972f20a7c32d':
Moved the toString method in the parent Connection class.
* 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 '22bfcbca4f9f4e88dee120c5bf71545f40289e00' into eclair-plus-aosp
* commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00':
When double tap zoom out to overview mode, force reveal the full
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp
* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp
* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d' into eclair-plus-aosp
* commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d':
Draw a green triangle using OpenGL 2.0 APIs.
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 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp
* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
ContactsContract: Adding joined columns to the Data class definition.
