Merge commit '11cd8c5ac95334c9363a82fd81d05d85623f9d17'
* commit '11cd8c5ac95334c9363a82fd81d05d85623f9d17':
Fix for 1785342: The old PIN is required after entering New PIN
Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'
* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
High-resolution (hdpi) artwork from TAT for Settings.
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'
* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit '11dd7d5fb36a408f1d3962cbec0b58ba5212ade9'
* commit '11dd7d5fb36a408f1d3962cbec0b58ba5212ade9':
Fix the state machine for CONNECTING/DISCONNECTING states.
* changes:
Fixing bug 2064923. This is a fix to make sure that the accessibility manager does not start any of the accessibility services when it is disabled.
Merge commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7'
* commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7':
Cap the length of dictionary words to keep TextView from exploding.
* changes:
Add type to filter option to list view Make ListAdapter implement Filterable. Add new implementation for Filter to search based on prefixes. When creating the list include the filter option to create actual list entries. Since Filter.performFiltering is done on a work thread, introduce a new lock and a HashMap of packages matching a prefix which is then used to create a filtered list of applications. Also separte out modifying mAppLocalList which is the basis for list and the dependent mFilterMap used by Filter.performFiltering method to Locked methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
Make ListAdapter implement Filterable. Add new implementation for Filter
to search based on prefixes.
When creating the list include the filter option to create actual list entries.
Since Filter.performFiltering is done on a work thread, introduce a new lock
and a HashMap of packages matching a prefix which is then used to create a filtered list of applications.
Also separte out modifying mAppLocalList which is the basis for list and
the dependent mFilterMap used by Filter.performFiltering method to Locked
methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
Merge commit '64b691a8abb2bbb2952cb44a7dc04f153d717bc3' into eclair
* commit '64b691a8abb2bbb2952cb44a7dc04f153d717bc3':
Import revised translations. DO NOT MERGE
Merge commit '9182721336cd5f070aa2b5cf971193c7887c81d6'
* commit '9182721336cd5f070aa2b5cf971193c7887c81d6':
Call the correct function for canceling a pairing request.
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
