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
Merge commit '2c9b21f048303469f040f30ec386e9ba25930ee9'
* commit '2c9b21f048303469f040f30ec386e9ba25930ee9':
Create a shared preference setting and use it before loading/unloading cache
Merge commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf' into eclair
* commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf':
Create a shared preference setting and use it before loading/unloading cache
Merge commit '2818107dcc5c7e6ddf152448de8836ce01d3e1ad'
* commit '2818107dcc5c7e6ddf152448de8836ce01d3e1ad':
cut number of frames in lock screen demo animation from 15 to 8
Merge commit 'aafb491d35e2512c504356bc441ae48b48a9f5db' into eclair
* commit 'aafb491d35e2512c504356bc441ae48b48a9f5db':
Import revised translations. DO NOT MERGE
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair
* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
cut number of frames in lock screen demo animation from 15 to 8
Merge commit 'da99054ace677782c02cfd3e8cf3461ce15d61c1' into eclair
* commit 'da99054ace677782c02cfd3e8cf3461ce15d61c1':
Import revised translations. DO NOT MERGE
This fixes parsing of the kernel version string in so that groups
3 and 4 can be shown in About phone.
Submitted on behalf of Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Merge commit 'd63c0112251ab4e4e977545368dd703d875012a4'
* commit 'd63c0112251ab4e4e977545368dd703d875012a4':
Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
Merge commit '5eb32e86a244b7cddde109dc4d2d466553c1a4b7'
* commit '5eb32e86a244b7cddde109dc4d2d466553c1a4b7':
b/2005377 Fixed the problem where previously paired devics can't be access(grayed out) in Bluetooth settings after a reboot.
Merge commit '110befc20e9be195a8c87339bc83c229f34a19a7'
* commit '110befc20e9be195a8c87339bc83c229f34a19a7':
do not merge: cherry-pick e9f4f5dd39 from master branch
* changes:
1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
