OSDN Git Service
Android (Google) Code Review [Thu, 1 Oct 2009 14:46:26 +0000 (10:46 -0400)]
Merge change Ie7e8a7ef into eclair
* changes:
Don't auto-connect to OPP after pairing
Michael Chan [Thu, 1 Oct 2009 06:08:19 +0000 (23:08 -0700)]
Don't auto-connect to OPP after pairing
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
Android (Google) Code Review [Thu, 1 Oct 2009 01:43:48 +0000 (21:43 -0400)]
Merge change I39527366 into eclair
* changes:
Use a custom system icon for native processes.
Amith Yamasani [Wed, 30 Sep 2009 22:54:26 +0000 (15:54 -0700)]
Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
Android (Google) Code Review [Thu, 1 Oct 2009 01:34:36 +0000 (21:34 -0400)]
Merge change I00ab9f0b into eclair
* changes:
Fix widgets
Mike Cleron [Thu, 1 Oct 2009 01:29:25 +0000 (18:29 -0700)]
Fix widgets
Michael Chan [Wed, 30 Sep 2009 21:26:10 +0000 (14:26 -0700)]
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
Android (Google) Code Review [Wed, 30 Sep 2009 22:05:03 +0000 (18:05 -0400)]
Merge change Ibe023c8a into eclair
* changes:
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
Jaikumar Ganesh [Wed, 30 Sep 2009 16:43:34 +0000 (09:43 -0700)]
Add strings for authentication type.
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
Amith Yamasani [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
Handle the back key.
Finish the activity if dialog is cancelled.
Show an error and finish the activity if URL couldn't be found due to
connectivity problem and not just when Telephony is not available.
Android (Google) Code Review [Wed, 30 Sep 2009 19:39:06 +0000 (15:39 -0400)]
Merge change I5eab1270 into eclair
* changes:
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Michael Chan [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid
Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
Debajit Ghosh [Wed, 30 Sep 2009 17:51:32 +0000 (10:51 -0700)]
updating sync settings icon
Hung-ying Tyan [Wed, 30 Sep 2009 09:57:56 +0000 (17:57 +0800)]
Use the new VpnType.getDescriptionId().
Mike Cleron [Wed, 30 Sep 2009 08:18:17 +0000 (01:18 -0700)]
Newer icons
Hung-ying Tyan [Wed, 30 Sep 2009 03:56:05 +0000 (11:56 +0800)]
Fix bugs in credential storage settings:
* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
Dianne Hackborn [Wed, 30 Sep 2009 00:38:08 +0000 (17:38 -0700)]
Improve running services info.
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
Android (Google) Code Review [Tue, 29 Sep 2009 22:41:44 +0000 (18:41 -0400)]
Merge change I56544d0e into eclair
* changes:
Fix for
2137900: Be more conservative about poking the wakelock
Android (Google) Code Review [Tue, 29 Sep 2009 21:34:43 +0000 (17:34 -0400)]
Merge change Id80d1999 into eclair
* changes:
Fix power widget brightness.
Jim Miller [Tue, 29 Sep 2009 21:16:53 +0000 (14:16 -0700)]
Fix for
2137900: Be more conservative about poking the wakelock
Ken Shirriff [Tue, 29 Sep 2009 19:40:45 +0000 (12:40 -0700)]
Fix power widget brightness.
If the auto-brightness is cleared, the brightness will drop to 0, so we
need to set it again.
Amith Yamasani [Tue, 29 Sep 2009 18:10:05 +0000 (11:10 -0700)]
Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Added the official action to the Settings manifest.
Mike Cleron [Tue, 29 Sep 2009 07:30:34 +0000 (00:30 -0700)]
New icons
Michael Chan [Sat, 26 Sep 2009 13:16:17 +0000 (06:16 -0700)]
b/
2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
Android (Google) Code Review [Mon, 28 Sep 2009 20:37:00 +0000 (16:37 -0400)]
Merge change I87d7f224 into eclair
* changes:
Correct "on-screen" to "onscreen"; fix tts screen title
Nick Pelly [Mon, 28 Sep 2009 19:28:14 +0000 (12:28 -0700)]
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Change-Id: Iebf2b3ea9cac224e3e6c67e503b1063491dce5bb
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:49 +0000 (14:46 -0400)]
Merge change 27058 into eclair
* changes:
Fix device picker minor bug
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:24 +0000 (14:46 -0400)]
Merge change 27473 into eclair
* changes:
Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base
Suchi Amalapurapu [Mon, 28 Sep 2009 18:27:48 +0000 (11:27 -0700)]
Rename empty view so that the standard list view implementation
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base
Android (Google) Code Review [Mon, 28 Sep 2009 18:27:15 +0000 (14:27 -0400)]
Merge change 27471 into eclair
* changes:
Fix power widget brightness for Sholes.
Ken Shirriff [Mon, 28 Sep 2009 18:17:20 +0000 (11:17 -0700)]
Fix power widget brightness for Sholes.
The widget must disable automatic brightness before modifying the brightness.
Android (Google) Code Review [Mon, 28 Sep 2009 17:21:44 +0000 (13:21 -0400)]
Merge change 27283 into eclair
* changes:
Display cell location for CDMA in Phone info screen.
Roy West [Sun, 27 Sep 2009 19:01:46 +0000 (12:01 -0700)]
Correct "on-screen" to "onscreen"; fix tts screen title
Hung-ying Tyan [Mon, 28 Sep 2009 02:14:18 +0000 (10:14 +0800)]
Add CredentialInstaller.
Android (Google) Code Review [Sun, 27 Sep 2009 19:53:43 +0000 (15:53 -0400)]
Merge change 27285 into eclair
* changes:
b/
2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Michael Chan [Sun, 27 Sep 2009 19:46:51 +0000 (12:46 -0700)]
b/
2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Change-Id: I37c628e4a98157ed91d519518773a458dca36c00
jsh [Thu, 24 Sep 2009 16:19:22 +0000 (09:19 -0700)]
Display cell location for CDMA in Phone info screen.
Useful for debugging location issues.
b/
2134743
Wink Saville [Sat, 26 Sep 2009 23:47:18 +0000 (16:47 -0700)]
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
Dianne Hackborn [Sat, 26 Sep 2009 19:44:02 +0000 (12:44 -0700)]
Explicitly show plugged state.
Change-Id: I4592382cdcc9e116d3af102fd76057968a6ea874
Android (Google) Code Review [Sat, 26 Sep 2009 01:01:34 +0000 (21:01 -0400)]
Merge change 27181 into eclair
* changes:
Update neighboring cell printout.
johnwang [Sat, 26 Sep 2009 00:26:54 +0000 (17:26 -0700)]
Update neighboring cell printout.
Android (Google) Code Review [Fri, 25 Sep 2009 23:06:18 +0000 (19:06 -0400)]
Merge change 26706 into eclair
* changes:
Format cleanup.
johnwang [Wed, 23 Sep 2009 23:22:34 +0000 (16:22 -0700)]
Format cleanup.
Remove tailing white space.
Dan Murphy [Tue, 22 Sep 2009 16:47:08 +0000 (11:47 -0500)]
packages/apps/Setting: Make vkey button haptics part of global haptic setting
This change ties the virtual key haptics to the global haptics settings
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Android (Google) Code Review [Fri, 25 Sep 2009 17:28:10 +0000 (13:28 -0400)]
Merge change 27057 into eclair
* changes:
Restrict Bluetooth adapater name length to 200 characters.
Lixin Yue [Tue, 22 Sep 2009 02:44:51 +0000 (10:44 +0800)]
Fix device picker minor bug
When in device picker screen, if other device triggers pairing process with own
device, after paired succssfully, it should not send intent to OppReceiver to
start file sending. We need check if the paired device is the one user selected.
Original Author: Lixin Yue
Modified by: Jaikumar Ganesh (jaikumar@google.com)
Change-Id: I32df995ba94417470cccaead492844a9c61c0846
Jaikumar Ganesh [Fri, 25 Sep 2009 16:54:35 +0000 (09:54 -0700)]
Restrict Bluetooth adapater name length to 200 characters.
The max allowed as per spec is 248.
Change-Id: I287fb7f861a30e736d6078923712433c52f3031a
Android (Google) Code Review [Fri, 25 Sep 2009 17:16:26 +0000 (13:16 -0400)]
Merge change 26713 into eclair
* changes:
Set selection in single choice list. Reorder the menu entries to use the menu options as indices into the choice box directly
Android (Google) Code Review [Fri, 25 Sep 2009 17:12:40 +0000 (13:12 -0400)]
Merge change 26878 into eclair
* changes:
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Michael Chan [Thu, 24 Sep 2009 18:39:34 +0000 (11:39 -0700)]
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Change-Id: I670f29d5f9a577ec177b049cfd9c775bf91b60c3
Amith Yamasani [Fri, 25 Sep 2009 01:41:40 +0000 (18:41 -0700)]
New icon for Privacy.
Also, forgot to remove Factory reset from About phone.
Michael Chan [Thu, 24 Sep 2009 14:45:49 +0000 (07:45 -0700)]
b/
2138890 Pre-initilize Bluetooth profile managers
Change-Id: I633202457ca445308ec35b99260e603a85451042
Dianne Hackborn [Thu, 24 Sep 2009 05:24:22 +0000 (22:24 -0700)]
Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
These dialogs should clear.
Change-Id: Ie78212c1bd112d1f2f7a05f2d23eb9b5c9f02131
Suchi Amalapurapu [Wed, 23 Sep 2009 23:33:56 +0000 (16:33 -0700)]
Set selection in single choice list.
Reorder the menu entries to use the menu options as indices into
the choice box directly
Amith Yamasani [Tue, 22 Sep 2009 20:50:19 +0000 (13:50 -0700)]
New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Also fixes
2138367: Share with Google setting doesn't get updated on checking the setting
And
2098232: "Set unlock pattern" should be at the top of the section
Roy West [Wed, 23 Sep 2009 20:07:19 +0000 (13:07 -0700)]
Search and rewrite some uses of select and disable for touch and use.
Jaikumar Ganesh [Wed, 23 Sep 2009 17:32:41 +0000 (10:32 -0700)]
Filter devices by UUID and then class.
The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.
Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59
Android (Google) Code Review [Tue, 22 Sep 2009 22:38:45 +0000 (18:38 -0400)]
Merge change 26396 into eclair
* changes:
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Michael Chan [Mon, 21 Sep 2009 01:18:27 +0000 (18:18 -0700)]
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Change-Id: Ie60d1c579e40027c2174215c1989887a3250c9bc
Android (Google) Code Review [Tue, 22 Sep 2009 16:03:17 +0000 (12:03 -0400)]
Merge change 26365 into eclair
* changes:
SecuritySettings: use Credentials instead of CertTool.
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:57 +0000 (12:02 -0400)]
Merge change 26363 into eclair
* changes:
WifiSettings: use Credentials instead of CertTool.
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:34 +0000 (12:02 -0400)]
Merge change 26186 into eclair
* changes:
Settings: revise VpnSettings.
Chia-chi Yeh [Tue, 22 Sep 2009 15:59:01 +0000 (23:59 +0800)]
SecuritySettings: use Credentials instead of CertTool.
Also remove unused classes which will be replaced by CertInstaller.
Chia-chi Yeh [Tue, 22 Sep 2009 15:44:17 +0000 (23:44 +0800)]
WifiSettings: use Credentials instead of CertTool.
Dianne Hackborn [Mon, 21 Sep 2009 07:37:32 +0000 (00:37 -0700)]
Remove long animation setting (standard length is now longer).
Also a few tweaks to the running services UI.
Change-Id: I160dc5fd52a865ca95288aad787e28b814080c53
Chia-chi Yeh [Mon, 21 Sep 2009 18:28:14 +0000 (02:28 +0800)]
Settings: revise VpnSettings.
Ken Shirriff [Sun, 20 Sep 2009 22:21:28 +0000 (15:21 -0700)]
Adjust widget size.
Without this change, the widget cannot be placed on the home screen in
landscape mode because it's thought to be too big.
Android (Google) Code Review [Mon, 21 Sep 2009 16:23:14 +0000 (12:23 -0400)]
Merge change 26022 into eclair
* changes:
Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.
Chung-yih Wang [Mon, 21 Sep 2009 10:42:55 +0000 (18:42 +0800)]
Fix the typo in phase2 options.
MSCHAP2 => MSCHAPV2
Amith Yamasani [Sun, 20 Sep 2009 22:52:35 +0000 (15:52 -0700)]
Use the ratio of different CPU speeds to compute CPU power consumption per app.
Suchi Amalapurapu [Sun, 20 Sep 2009 21:25:46 +0000 (14:25 -0700)]
Change default filter to third party when launched via settings and all apps when launched via
low storage. Update string name.
fix padding for Force Stop button
Change message when clearing application data.
Android (Google) Code Review [Sun, 20 Sep 2009 20:17:52 +0000 (16:17 -0400)]
Merge change 25969 into eclair
* changes:
Fix power widget dimensions.
Ken Shirriff [Sun, 20 Sep 2009 18:04:05 +0000 (11:04 -0700)]
Fix power widget dimensions.
The widget was taking 2 units vertically on some devices.
Benny Wong [Thu, 17 Sep 2009 05:41:21 +0000 (00:41 -0500)]
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Original GID: 1062
Dianne Hackborn [Thu, 17 Sep 2009 22:15:46 +0000 (15:15 -0700)]
Follow along with startActivityPendingIntent() change.
Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02
Eric Fischer [Thu, 17 Sep 2009 21:35:43 +0000 (14:35 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 17 Sep 2009 17:24:34 +0000 (10:24 -0700)]
Use new memory API; show memory used by bg and fg processes.
Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823
Amith Yamasani [Wed, 16 Sep 2009 19:43:50 +0000 (12:43 -0700)]
Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
Android (Google) Code Review [Thu, 17 Sep 2009 05:05:12 +0000 (01:05 -0400)]
Merge change 25397 into eclair
* changes:
Fix issues with updating list when applications get installed while ManageApps is paused or stopped. When ManageApps gets started, the list of installed apps is retrieved from PackageManager and compared against the old list to figure out newly installed apps(since the app has been stopped) and also to weedout stale entries of packages which might have been deleted. Since the application objects themselves might have changed the list is usually refreshed with new objects. Deleted applications are taken care of right away by just removing from the List adapter. For newly added apps however, the size and label/resource info has to be loaded before being inserted in to the list since the list is already sorted. So just remove these entries from the list for now and let ADD_PKG message handle adding the new elements. Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and we have too many such entries one for each package.
Suchi Amalapurapu [Wed, 16 Sep 2009 23:38:10 +0000 (16:38 -0700)]
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
When ManageApps gets started, the list of installed apps is retrieved from PackageManager and
compared against the old list to figure out newly installed apps(since the app has been stopped) and
also to weedout stale entries of packages which might have been deleted.
Since the application objects themselves might have changed the list is usually refreshed with new objects.
Deleted applications are taken care of right away by just removing from the List adapter.
For newly added apps however, the size and label/resource info has to be loaded before being inserted in to
the list since the list is already sorted. So just remove these entries from the list for now and let
ADD_PKG message handle adding the new elements.
Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and
we have too many such entries one for each package.
Android (Google) Code Review [Wed, 16 Sep 2009 23:39:42 +0000 (19:39 -0400)]
Merge change 25387 into eclair
* changes:
Fix broken 9patch for hdpi.
Romain Guy [Wed, 16 Sep 2009 23:39:07 +0000 (16:39 -0700)]
Fix broken 9patch for hdpi.
Change-Id: I88c1bde1b0a19ccd9084889313e64a0a924f4bb0
Android (Google) Code Review [Wed, 16 Sep 2009 22:29:31 +0000 (18:29 -0400)]
Merge change 25354 into eclair
* changes:
Fix string name for bluetooth pairing and fix NPE
Jaikumar Ganesh [Wed, 16 Sep 2009 21:37:13 +0000 (14:37 -0700)]
Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
Debajit Ghosh [Wed, 16 Sep 2009 02:08:10 +0000 (19:08 -0700)]
make power settings widget toggle sync, not background data
Android (Google) Code Review [Wed, 16 Sep 2009 10:26:54 +0000 (06:26 -0400)]
Merge change 24646 into eclair
* changes:
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Wed, 16 Sep 2009 10:20:22 +0000 (06:20 -0400)]
Restore backlight brightness after restoring auto ALS mode.
Fixes b/
2121632
Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Hung-ying Tyan [Tue, 15 Sep 2009 09:58:57 +0000 (17:58 +0800)]
Enable cert install from sdcard in Settings...
And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
Chung-yih Wang [Wed, 16 Sep 2009 07:34:32 +0000 (15:34 +0800)]
Aggregate the security settings for WiFi network configuration.
* Merge WPA and WPA2 PSK.
* Merge WPA-EAP and IEEE8021X.
* Remove unused field "private key password" in EAP configuration.
Android (Google) Code Review [Wed, 16 Sep 2009 06:35:42 +0000 (02:35 -0400)]
Merge change 24870 into eclair
* changes:
Transient patch for the WifiConfiguration change.
Android (Google) Code Review [Tue, 15 Sep 2009 21:36:52 +0000 (17:36 -0400)]
Merge change 25125 into eclair
* changes:
Show name for incoming pairing requests.
Jaikumar Ganesh [Tue, 15 Sep 2009 21:07:22 +0000 (14:07 -0700)]
Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
Mike Lockwood [Tue, 15 Sep 2009 18:39:47 +0000 (14:39 -0400)]
Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/
2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ic4faa008357fd3d74225ba90f05801c5127fd8c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dan Murphy [Thu, 27 Aug 2009 20:05:23 +0000 (15:05 -0500)]
apps/settings: Add auto/manual brightness control to Brightness settings
Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.
These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.
If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.
Change-Id: I512c9d5dd72ddd831b33eb8fcd4680e2fc7f786e
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chung-yih Wang [Mon, 14 Sep 2009 06:25:09 +0000 (14:25 +0800)]
Transient patch for the WifiConfiguration change.
Comment out the access to the enterprise fields of
WifiConfiguration class in AccessPointState class.
And will have a new patch for accessing the new WifiConfiguration.
Hung-ying Tyan [Fri, 11 Sep 2009 17:31:11 +0000 (01:31 +0800)]
Fix setting passwd string and vpn checkbox titles.
* Add min length requirement in setting passwd string.
* Do not change vpn checkbox title with state changes.
Jaikumar Ganesh [Fri, 11 Sep 2009 16:45:11 +0000 (09:45 -0700)]
Modify settings for 2.1
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
Android (Google) Code Review [Fri, 11 Sep 2009 18:55:44 +0000 (14:55 -0400)]
Merge change 24726 into eclair
* changes:
Update AndroidManifest.xml for new Intent locations.
Nick Pelly [Fri, 11 Sep 2009 18:41:59 +0000 (11:41 -0700)]
Update AndroidManifest.xml for new Intent locations.
This will fix a regression since the recent BT API changes. The settings app
would have missed some Bluetooth events, especially pairing.
Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
Xianzhu Wang [Fri, 11 Sep 2009 06:41:05 +0000 (14:41 +0800)]
Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".