Commit Graph

709 Commits

Author SHA1 Message Date
Android (Google) Code Review
cab9fe2d41 Merge change I3c9f79ba into eclair-mr2
* changes:
  Retain webview history when viewing Safety notices. Fixes #2160518
2009-10-06 16:58:21 -04:00
Jaikumar Ganesh
f43b1a9d24 am 98d76cc9: Remove STOPSHIP debug log.
Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-mr2

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.
2009-10-06 13:35:19 -07:00
Amith Yamasani
3c9f79ba35 Retain webview history when viewing Safety notices. Fixes #2160518
Save and restore webview history when changing orientation.
2009-10-06 13:10:14 -07:00
Jaikumar Ganesh
98d76cc9b8 Remove STOPSHIP debug log.
Bug: 2151872
Dr No: Eastham
2009-10-06 08:01:21 -07:00
Chia-chi Yeh
0bc5e275fd SecuritySettings: reduce 1 access to KeyStore and clean up. 2009-10-06 15:46:39 +08:00
Chung-yih Wang
059c3f5d1e am a8f2f72d: Add the auth_alg field back.
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-mr2

* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
  Add the auth_alg field back.
2009-10-04 15:18:34 -07:00
Eric Fischer
9ff282bb75 am 6de9fb39: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-mr2

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE
2009-10-04 15:15:58 -07:00
Chung-yih Wang
a8f2f72da8 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.
2009-10-02 16:09:15 +08:00
Eric Fischer
6de9fb390b Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 17:02:17 -07:00
Android (Google) Code Review
6e6d2362cc Merge change I25f2afba into eclair
* changes:
  Check if a device is added to the cache before returning.
2009-10-01 16:07:49 -04:00
Jaikumar Ganesh
fca3c1cf8b 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
2009-10-01 13:05:22 -07:00
Android (Google) Code Review
85ed086217 Merge change I454a0dbf into eclair
* changes:
  SecuritySettings: revert "minor tuning".
2009-10-01 14:35:13 -04:00
Chia-chi Yeh
454a0dbf8f SecuritySettings: revert "minor tuning". 2009-10-02 02:32:54 +08:00
Android (Google) Code Review
9767612cc8 Merge change If764d20a into eclair
* changes:
  SecuritySettings: fix a the status before handling the intent.
2009-10-01 14:17:26 -04:00
Chia-chi Yeh
f764d20a74 SecuritySettings: fix a the status before handling the intent. 2009-10-02 02:16:08 +08:00
Android (Google) Code Review
e61a2403a6 Merge change I844d3db3 into eclair
* changes:
  SecuritySettings: set the check box before further processing.
2009-10-01 13:14:59 -04:00
Chia-chi Yeh
844d3db3fe SecuritySettings: set the check box before further processing. 2009-10-02 01:13:36 +08:00
Android (Google) Code Review
1e98dfb480 Merge change I446bf8b5 into eclair
* changes:
  SecuritySettings: minor tuning.
2009-10-01 13:12:21 -04:00
Chia-chi Yeh
446bf8b5bc SecuritySettings: minor tuning. 2009-10-02 01:11:17 +08:00
Android (Google) Code Review
b83ff4af8c Merge change Ibf07c83d into eclair
* changes:
  SecuritySettings: remove debug messages.
2009-10-01 13:04:25 -04:00
Chia-chi Yeh
bf07c83d92 SecuritySettings: remove debug messages. 2009-10-02 01:03:50 +08:00
Android (Google) Code Review
51e97b33d2 Merge change Ia7c57145 into eclair
* changes:
  SecuritySettings: remove trailing spaces.
2009-10-01 12:49:08 -04:00
Chia-chi Yeh
a7c5714599 SecuritySettings: remove trailing spaces. 2009-10-02 00:48:32 +08:00
Android (Google) Code Review
c49ca127aa Merge change I02f58e89 into eclair
* changes:
  SecuritySettings: clean up.
2009-10-01 12:47:24 -04:00
Android (Google) Code Review
d2fa30baee Merge change I28f1a0fc into eclair
* changes:
  WifiSettings: use keystore namespace instead of blobl.
2009-10-01 12:47:12 -04:00
Chia-chi Yeh
02f58e898d SecuritySettings: clean up. 2009-10-02 00:39:14 +08:00
android-build SharedAccount
40906ea24e empty merge to avoid future conflicts
Merge branch 'eclair-release' into HEAD
2009-10-01 08:46:43 -07:00
Android (Google) Code Review
7bf9e0317c Merge change Ie7e8a7ef into eclair
* changes:
  Don't auto-connect to OPP after pairing
2009-10-01 10:46:26 -04:00
Chia-chi Yeh
28f1a0fc5b WifiSettings: use keystore namespace instead of blobl. 2009-10-01 19:17:55 +08:00
Michael Chan
b547dda338 Don't auto-connect to OPP after pairing
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
2009-09-30 23:08:19 -07:00
Android (Google) Code Review
ee52bed514 Merge change I39527366 into eclair
* changes:
  Use a custom system icon for native processes.
2009-09-30 21:43:48 -04:00
Amith Yamasani
395273662c Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
2009-09-30 18:42:29 -07:00
Android (Google) Code Review
c564890637 Merge change I00ab9f0b into eclair
* changes:
  Fix widgets
2009-09-30 21:34:36 -04:00
Mike Cleron
00ab9f0b51 Fix widgets 2009-09-30 18:29:25 -07:00
Michael Chan
e6531e253b b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
2009-09-30 17:43:12 -07:00
Michael Chan
fa44848b0d 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
2009-09-30 15:26:18 -07:00
Android (Google) Code Review
e5cff2655c Merge change Ibe023c8a into eclair
* changes:
  Fix Safety Settings screen bugs - 2150942, 2151440, 2151727
2009-09-30 18:05:03 -04:00
Jaikumar Ganesh
1eb1df082d 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
2009-09-30 13:40:11 -07:00
Amith Yamasani
be023c8a75 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.
2009-09-30 13:13:44 -07:00
Android (Google) Code Review
e3b59f193e 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
2009-09-30 15:39:06 -04:00
Michael Chan
eaf13a2c15 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
2009-09-30 12:34:32 -07:00
Debajit Ghosh
99716fb4b4 updating sync settings icon 2009-09-30 11:01:26 -07:00
Hung-ying Tyan
8fd062e1a5 Use the new VpnType.getDescriptionId(). 2009-09-30 17:57:56 +08:00
Mike Cleron
08df148848 Newer icons 2009-09-30 01:18:17 -07:00
Hung-ying Tyan
b0883cb384 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.
2009-09-30 11:56:05 +08:00
Dianne Hackborn
cabb147ce5 Improve running services info.
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
2009-09-29 18:04:36 -07:00
Android (Google) Code Review
be699645db Merge change I56544d0e into eclair
* changes:
  Fix for 2137900: Be more conservative about poking the wakelock
2009-09-29 18:41:44 -04:00
Android (Google) Code Review
eb8d6f7830 Merge change Id80d1999 into eclair
* changes:
  Fix power widget brightness.
2009-09-29 17:34:43 -04:00
Jim Miller
56544d0e91 Fix for 2137900: Be more conservative about poking the wakelock 2009-09-29 14:16:53 -07:00
Ken Shirriff
d80d19996a Fix power widget brightness.
If the auto-brightness is cleared, the brightness will drop to 0, so we
need to set it again.
2009-09-29 12:40:45 -07:00