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.
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom. Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.
see screen shots in http://b/2045023 for the differences.
* changes:
b/2026622 Fixed the problem with the UI keeps showing that BT is scanning even though it has stopped. For some reason, the framework does not notify the settings app when the scan is done while the screen is off.
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
