OSDN Git Service
Eric Fischer [Fri, 9 Oct 2009 00:52:46 +0000 (17:52 -0700)]
am
5204b662: am
9ef9801f: (-s ours) am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp
* commit '
5204b662a0c155f695cf4e7b6341872a803a7e80':
Jaikumar Ganesh [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]
am
db99bb36: am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp
* commit '
db99bb36449f34d6f26f61092a6c77de1bb98c91':
Eric Fischer [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
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:15:52 +0000 (15:15 -0700)]
am
9ef9801f: am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-plus-aosp
* commit '
9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
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
Jaikumar Ganesh [Thu, 8 Oct 2009 20:18:24 +0000 (13:18 -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-plus-aosp
* commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Michael Chan [Thu, 8 Oct 2009 19:07:14 +0000 (12:07 -0700)]
am
81cdaff7: b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Merge commit '
81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5' into eclair-mr2-plus-aosp
* commit '
81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5':
b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
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:41:31 +0000 (16:41 -0700)]
am
94ca23dc: am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
94ca23dcb049c11b097c3c1f9fe9091b3d40d337' into eclair-mr2-plus-aosp
* commit '
94ca23dcb049c11b097c3c1f9fe9091b3d40d337':
Nick Pelly [Wed, 7 Oct 2009 23:41:31 +0000 (16:41 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Nick Pelly [Wed, 7 Oct 2009 23:36:16 +0000 (16:36 -0700)]
am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp
* commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf':
Update application code for BluetoothAdapter.getDefaultAdapter().
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.
Eric Fischer [Wed, 7 Oct 2009 19:08:59 +0000 (12:08 -0700)]
am
06a111be: Merge change Ia3151ad3 into eclair
Merge commit '
06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp
* commit '
06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 19:08:55 +0000 (12:08 -0700)]
am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp
* commit '
c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Elliott Hughes [Wed, 7 Oct 2009 19:02:16 +0000 (12:02 -0700)]
am
c52637df: Merge change I8e1b0fb7 into eclair-mr2
Merge commit '
c52637dfab3178fa4d973ec3b41158903b71454f' into eclair-mr2-plus-aosp
* commit '
c52637dfab3178fa4d973ec3b41158903b71454f':
Fix Settings to show versionName instead of versionCode.
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.
Jaikumar Ganesh [Wed, 7 Oct 2009 18:55:47 +0000 (11:55 -0700)]
am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp
* commit '
98d76cc9b882466a97fb55913f5a507a642b5018':
Remove STOPSHIP debug log.
Eric Fischer [Wed, 7 Oct 2009 18:52:21 +0000 (11:52 -0700)]
am
c197f154: am
06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '
c197f15486c053e89bc610c7e7b497130f4fb5a7' into eclair-mr2-plus-aosp
* commit '
c197f15486c053e89bc610c7e7b497130f4fb5a7':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 18:52:17 +0000 (11:52 -0700)]
am
1cd02cac: am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
1cd02caccd4aa5b70ae342de386a21255cf9bed7' into eclair-mr2-plus-aosp
* commit '
1cd02caccd4aa5b70ae342de386a21255cf9bed7':
Add L2tpIpsec case in VpnSettings.processSecrets()
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()
Chung-yih Wang [Wed, 7 Oct 2009 18:39:17 +0000 (11:39 -0700)]
am
a8f2f72d: Add the auth_alg field back.
Merge commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp
* commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
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
Eric Fischer [Wed, 7 Oct 2009 18:36:10 +0000 (11:36 -0700)]
am
6de9fb39: Import revised translations. DO NOT MERGE
Merge commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp
* commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 7 Oct 2009 18:32:19 +0000 (11:32 -0700)]
am
6e6d2362: Merge change I25f2afba into eclair
Merge commit '
6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp
* commit '
6e6d2362ccd119e51839a4f306c26783f634ab15':
Check if a device is added to the cache before returning.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:30 +0000 (11:31 -0700)]
am
85ed0862: Merge change I454a0dbf into eclair
Merge commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp
* commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6':
SecuritySettings: revert "minor tuning".
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:26 +0000 (11:31 -0700)]
am
9767612c: Merge change If764d20a into eclair
Merge commit '
9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp
* commit '
9767612cc8207f906173dc9459b45cd07d881c4e':
SecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:22 +0000 (11:31 -0700)]
am
e61a2403: Merge change I844d3db3 into eclair
Merge commit '
e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp
* commit '
e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:18 +0000 (11:31 -0700)]
am
1e98dfb4: Merge change I446bf8b5 into eclair
Merge commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp
* commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
SecuritySettings: minor tuning.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:15 +0000 (11:31 -0700)]
am
b83ff4af: Merge change Ibf07c83d into eclair
Merge commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp
* commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465':
SecuritySettings: remove debug messages.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:11 +0000 (11:31 -0700)]
am
51e97b33: Merge change Ia7c57145 into eclair
Merge commit '
51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp
* commit '
51e97b33d265709da2aa69c861994574a0544aaa':
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:08 +0000 (11:31 -0700)]
am
c49ca127: Merge change I02f58e89 into eclair
Merge commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp
* commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c':
SecuritySettings: clean up.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:03 +0000 (11:31 -0700)]
am
d2fa30ba: Merge change I28f1a0fc into eclair
Merge commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp
* commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
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
Amith Yamasani [Tue, 6 Oct 2009 22:18:15 +0000 (15:18 -0700)]
am
cab9fe2d: Merge change I3c9f79ba into eclair-mr2
Merge commit '
cab9fe2d41eba522a485dcad2b8e91f789e48c57' into eclair-mr2-plus-aosp
* commit '
cab9fe2d41eba522a485dcad2b8e91f789e48c57':
Retain webview history when viewing Safety notices. Fixes #
2160518
Jaikumar Ganesh [Tue, 6 Oct 2009 21:50:40 +0000 (14:50 -0700)]
am
f43b1a9d: am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
f43b1a9d2428ec9e403a918ffb724ccf755ba2f9' into eclair-mr2-plus-aosp
* commit '
f43b1a9d2428ec9e403a918ffb724ccf755ba2f9':
Remove STOPSHIP debug log.
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
Chia-chi Yeh [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]
am
0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up.
Merge commit '
0bc5e275fdbbb8e80f8259136caf45a356922c40' into eclair-mr2-plus-aosp
* commit '
0bc5e275fdbbb8e80f8259136caf45a356922c40':
SecuritySettings: reduce 1 access to KeyStore and clean up.
Dan Vacura [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
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:57:04 +0000 (08:57 -0700)]
am
40906ea2: empty merge to avoid future conflicts
Merge commit '
40906ea24eceed5b06be2087d8e06738fc9cd876' into eclair-plus-aosp
* commit '
40906ea24eceed5b06be2087d8e06738fc9cd876':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
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
Michael Chan [Thu, 1 Oct 2009 14:54:39 +0000 (07:54 -0700)]
am
7bf9e031: Merge change Ie7e8a7ef into eclair
Merge commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp
* commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
Don't auto-connect to OPP after pairing
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
Amith Yamasani [Thu, 1 Oct 2009 04:15:52 +0000 (21:15 -0700)]
am
ee52bed5: Merge change I39527366 into eclair
Merge commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
Mike Cleron [Thu, 1 Oct 2009 04:15:36 +0000 (21:15 -0700)]
am
c5648906: Merge change I00ab9f0b into eclair
Merge commit '
c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp
* commit '
c564890637bf91e92ede27789e4d98863c46e681':
Fix widgets
Michael Chan [Thu, 1 Oct 2009 04:14:24 +0000 (21:14 -0700)]
am
e6531e25: b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Merge commit '
e6531e253bf646324d3a68de0e9cc612c5e1c8ac' into eclair-plus-aosp
* commit '
e6531e253bf646324d3a68de0e9cc612c5e1c8ac':
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
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
Amith Yamasani [Wed, 30 Sep 2009 22:12:56 +0000 (15:12 -0700)]
am
e5cff265: Merge change Ibe023c8a into eclair
Merge commit '
e5cff2655cd60226646820638e2dab54a4af5e9a' into eclair-plus-aosp
* commit '
e5cff2655cd60226646820638e2dab54a4af5e9a':
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
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 21:15:29 +0000 (14:15 -0700)]
am
1eb1df08: Add strings for authentication type.
Merge commit '
1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp
* commit '
1eb1df082d59bdef8b3e0cda6d1af635449833ab':
Add strings for authentication type.
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.
Michael Chan [Wed, 30 Sep 2009 19:44:42 +0000 (12:44 -0700)]
am
e3b59f19: Merge change I5eab1270 into eclair
Merge commit '
e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8' into eclair-plus-aosp
* commit '
e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
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 18:43:48 +0000 (11:43 -0700)]
am
99716fb4: updating sync settings icon
Merge commit '
99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp
* commit '
99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
updating sync settings icon
Debajit Ghosh [Wed, 30 Sep 2009 17:51:32 +0000 (10:51 -0700)]
updating sync settings icon
Hung-ying Tyan [Wed, 30 Sep 2009 10:06:58 +0000 (03:06 -0700)]
am
8fd062e1: Use the new VpnType.getDescriptionId().
Merge commit '
8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp
* commit '
8fd062e1a5c0047deff1dd817a097b94891000f2':
Use the new VpnType.getDescriptionId().
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:36:04 +0000 (01:36 -0700)]
Mike Cleron [Wed, 30 Sep 2009 08:18:17 +0000 (01:18 -0700)]
Newer icons
OSDN Git Service
