OSDN Git Service
Dianne Hackborn [Tue, 13 Oct 2009 22:51:41 +0000 (15:51 -0700)]
am
9f1900dc: Fix issue #
2185893: Can not install 3D Media Gallery
Merge commit '
9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-mr2
* commit '
9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #
2185893: Can not install 3D Media Gallery
Dianne Hackborn [Tue, 13 Oct 2009 22:03:57 +0000 (15:03 -0700)]
Fix issue #
2185893: Can not install 3D Media Gallery
Allow the package details to show packages whose .apk is not installed.
Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed
Android (Google) Code Review [Tue, 13 Oct 2009 14:39:01 +0000 (10:39 -0400)]
Merge change I69ea4234 into eclair-mr2
* changes:
Remove the getHumanReadibleSsid().
Chung-yih Wang [Tue, 13 Oct 2009 10:11:52 +0000 (18:11 +0800)]
Remove the getHumanReadibleSsid().
Since we already push down the quotes handling in WifiService.java,
there is no need of the function.
Android (Google) Code Review [Tue, 13 Oct 2009 09:54:26 +0000 (05:54 -0400)]
Merge change I6983cab3 into eclair-mr2
* changes:
Add saving/restoring state in CredentialInstaller and ...
Hung-ying Tyan [Sat, 10 Oct 2009 17:34:11 +0000 (01:34 +0800)]
Add saving/restoring state in CredentialInstaller and ...
make it transparent.
Chung-yih Wang [Fri, 9 Oct 2009 03:29:45 +0000 (11:29 +0800)]
Push down the supplicant-specific double-quote handling to framework.
So we are able to connect to AP with ssid containing double-quotes.
Eric Fischer [Fri, 9 Oct 2009 00:35:21 +0000 (17:35 -0700)]
am
9ef9801f: (-s ours) am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2
* commit '
9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Fri, 9 Oct 2009 00:30:28 +0000 (17:30 -0700)]
am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2
* commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Eric Fischer [Thu, 8 Oct 2009 22:02:30 +0000 (15:02 -0700)]
am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair
* commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
Import revised translations. DO NOT MERGE
Michael Chan [Wed, 7 Oct 2009 23:13:47 +0000 (16:13 -0700)]
b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
Jaikumar Ganesh [Thu, 8 Oct 2009 15:06:27 +0000 (08:06 -0700)]
Show an error message when the remote side cancels the authentication
and show OPP device list correctly.
Dr No: Eastham
Bug:
2174874
Nick Pelly [Wed, 7 Oct 2009 23:36:07 +0000 (16:36 -0700)]
am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-mr2
* commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf':
Update application code for BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:03:34 +0000 (01:03 +0200)]
Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug:
2158765
Joke: When is a car not a car? When it turns into a driveway.
Android (Google) Code Review [Wed, 7 Oct 2009 18:58:06 +0000 (14:58 -0400)]
Merge change I8e1b0fb7 into eclair-mr2
* changes:
Fix Settings to show versionName instead of versionCode.
Eric Fischer [Wed, 7 Oct 2009 18:46:42 +0000 (11:46 -0700)]
am
06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '
06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2
* commit '
06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 18:46:38 +0000 (11:46 -0700)]
am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2
* commit '
c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Android (Google) Code Review [Wed, 7 Oct 2009 18:38:10 +0000 (14:38 -0400)]
Merge change Ia3151ad3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Elliott Hughes [Wed, 7 Oct 2009 18:12:33 +0000 (11:12 -0700)]
Fix Settings to show versionName instead of versionCode.
Android (Google) Code Review [Wed, 7 Oct 2009 00:47:46 +0000 (20:47 -0400)]
Merge change Ifad4a4c0 into eclair
* changes:
Add L2tpIpsec case in VpnSettings.processSecrets()
Eric Fischer [Tue, 6 Oct 2009 23:54:08 +0000 (16:54 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Tue, 6 Oct 2009 20:58:21 +0000 (16:58 -0400)]
Merge change I3c9f79ba into eclair-mr2
* changes:
Retain webview history when viewing Safety notices. Fixes #
2160518
Jaikumar Ganesh [Tue, 6 Oct 2009 20:35:19 +0000 (13:35 -0700)]
am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-mr2
* commit '
98d76cc9b882466a97fb55913f5a507a642b5018':
Remove STOPSHIP debug log.
Amith Yamasani [Tue, 6 Oct 2009 20:10:14 +0000 (13:10 -0700)]
Retain webview history when viewing Safety notices. Fixes #
2160518
Save and restore webview history when changing orientation.
Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]
Remove STOPSHIP debug log.
Bug:
2151872
Dr No: Eastham
Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]
Add L2tpIpsec case in VpnSettings.processSecrets()
Chia-chi Yeh [Tue, 6 Oct 2009 07:43:55 +0000 (15:43 +0800)]
SecuritySettings: reduce 1 access to KeyStore and clean up.
Chung-yih Wang [Sun, 4 Oct 2009 22:18:34 +0000 (15:18 -0700)]
am
a8f2f72d: Add the auth_alg field back.
Merge commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-mr2
* commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Eric Fischer [Sun, 4 Oct 2009 22:15:58 +0000 (15:15 -0700)]
am
6de9fb39: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-mr2
* commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Chung-yih Wang [Fri, 2 Oct 2009 08:06:22 +0000 (16:06 +0800)]
Add the auth_alg field back.
This change is to fix the issue http://b/issue?id=
2161539.
The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.
Eric Fischer [Fri, 2 Oct 2009 00:02:17 +0000 (17:02 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 1 Oct 2009 20:07:49 +0000 (16:07 -0400)]
Merge change I25f2afba into eclair
* changes:
Check if a device is added to the cache before returning.
Jaikumar Ganesh [Thu, 1 Oct 2009 18:34:17 +0000 (11:34 -0700)]
Check if a device is added to the cache before returning.
For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.
Bug id:
2160617
Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0
Android (Google) Code Review [Thu, 1 Oct 2009 18:35:13 +0000 (14:35 -0400)]
Merge change I454a0dbf into eclair
* changes:
SecuritySettings: revert "minor tuning".
Chia-chi Yeh [Thu, 1 Oct 2009 18:32:54 +0000 (02:32 +0800)]
SecuritySettings: revert "minor tuning".
Android (Google) Code Review [Thu, 1 Oct 2009 18:17:26 +0000 (14:17 -0400)]
Merge change If764d20a into eclair
* changes:
SecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Thu, 1 Oct 2009 18:16:08 +0000 (02:16 +0800)]
SecuritySettings: fix a the status before handling the intent.
Android (Google) Code Review [Thu, 1 Oct 2009 17:14:59 +0000 (13:14 -0400)]
Merge change I844d3db3 into eclair
* changes:
SecuritySettings: set the check box before further processing.
Chia-chi Yeh [Thu, 1 Oct 2009 17:13:36 +0000 (01:13 +0800)]
SecuritySettings: set the check box before further processing.
Android (Google) Code Review [Thu, 1 Oct 2009 17:12:21 +0000 (13:12 -0400)]
Merge change I446bf8b5 into eclair
* changes:
SecuritySettings: minor tuning.
Chia-chi Yeh [Thu, 1 Oct 2009 17:11:17 +0000 (01:11 +0800)]
SecuritySettings: minor tuning.
Android (Google) Code Review [Thu, 1 Oct 2009 17:04:25 +0000 (13:04 -0400)]
Merge change Ibf07c83d into eclair
* changes:
SecuritySettings: remove debug messages.
Chia-chi Yeh [Thu, 1 Oct 2009 17:03:50 +0000 (01:03 +0800)]
SecuritySettings: remove debug messages.
Android (Google) Code Review [Thu, 1 Oct 2009 16:49:08 +0000 (12:49 -0400)]
Merge change Ia7c57145 into eclair
* changes:
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Thu, 1 Oct 2009 16:48:32 +0000 (00:48 +0800)]
SecuritySettings: remove trailing spaces.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:24 +0000 (12:47 -0400)]
Merge change I02f58e89 into eclair
* changes:
SecuritySettings: clean up.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:12 +0000 (12:47 -0400)]
Merge change I28f1a0fc into eclair
* changes:
WifiSettings: use keystore namespace instead of blobl.
Chia-chi Yeh [Thu, 1 Oct 2009 16:39:14 +0000 (00:39 +0800)]
SecuritySettings: clean up.
android-build SharedAccount [Thu, 1 Oct 2009 15:46:43 +0000 (08:46 -0700)]
empty merge to avoid future conflicts
Merge branch 'eclair-release' into HEAD
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
Chia-chi Yeh [Thu, 1 Oct 2009 11:17:55 +0000 (19:17 +0800)]
WifiSettings: use keystore namespace instead of blobl.
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
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
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
Eric Fischer [Tue, 29 Sep 2009 23:44:12 +0000 (16:44 -0700)]
Import revised translations. DO NOT MERGE
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