PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
924 Commits 1 Branch 0 Tags
35a4c327a94272d7bd1ec5c575e787ea3d5364cc
Commit Graph

924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
c197f15486 am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair 
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
 2009-10-07 11:46:42 -07:00
Hung-ying Tyan
1cd02caccd am c0e34db1: Merge change Ifad4a4c0 into eclair 
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-07 11:46:38 -07:00
Chung-yih Wang
02c9f8eb95 am a8f2f72d: Add the auth_alg field back. 
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp

* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
  Add the auth_alg field back.
 2009-10-07 11:39:17 -07:00
Android (Google) Code Review
06a111be6d Merge change Ia3151ad3 into eclair 
* changes:
  Import revised translations.   DO NOT MERGE
 2009-10-07 14:38:10 -04:00
Eric Fischer
098ef4cb96 am 6de9fb39: Import revised translations. DO NOT MERGE 
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE
 2009-10-07 11:36:10 -07:00
Jaikumar Ganesh
ff50d1c3a6 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.
 2009-10-07 11:32:19 -07:00
Chia-chi Yeh
21f14b5f46 am 85ed0862: Merge change I454a0dbf into eclair 
Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
 2009-10-07 11:31:30 -07:00
Chia-chi Yeh
901607e2c3 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.
 2009-10-07 11:31:26 -07:00
Chia-chi Yeh
cb741212e3 am e61a2403: Merge change I844d3db3 into eclair 
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
  SecuritySettings: set the check box before further processing.
 2009-10-07 11:31:22 -07:00
Chia-chi Yeh
85fe2beb21 am 1e98dfb4: Merge change I446bf8b5 into eclair 
Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
 2009-10-07 11:31:18 -07:00
Chia-chi Yeh
3d5f9fbf45 am b83ff4af: Merge change Ibf07c83d into eclair 
Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
  SecuritySettings: remove debug messages.
 2009-10-07 11:31:15 -07:00
Chia-chi Yeh
9cb59deecc am 51e97b33: Merge change Ia7c57145 into eclair 
Merge commit '51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.
 2009-10-07 11:31:11 -07:00
Chia-chi Yeh
ecd42371f4 am c49ca127: Merge change I02f58e89 into eclair 
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
 2009-10-07 11:31:08 -07:00
Chia-chi Yeh
69a58693d0 am d2fa30ba: Merge change I28f1a0fc into eclair 
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
  WifiSettings: use keystore namespace instead of blobl.
 2009-10-07 11:31:03 -07:00
Elliott Hughes
8e1b0fb77c Fix Settings to show versionName instead of versionCode. 2009-10-07 11:12:33 -07:00
Android (Google) Code Review
c0e34db168 Merge change Ifad4a4c0 into eclair 
* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-06 20:47:46 -04:00
Eric Fischer
a3151ad37c Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-10-06 16:54:08 -07:00
Amith Yamasani
33aa0fadf8 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
 2009-10-06 15:18:15 -07:00
Jaikumar Ganesh
ec77e2b0fa am f43b1a9d: am 98d76cc9: Remove STOPSHIP debug log. 
Merge commit 'f43b1a9d2428ec9e403a918ffb724ccf755ba2f9' into eclair-mr2-plus-aosp

* commit 'f43b1a9d2428ec9e403a918ffb724ccf755ba2f9':
  Remove STOPSHIP debug log.
 2009-10-06 14:50:40 -07:00
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
b01a6f96c3 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.
 2009-10-06 03:05:02 -07:00
Dan Vacura
a89d3d3591 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-06 03:05:02 -07:00
Hung-ying Tyan
fad4a4c07a Add L2tpIpsec case in VpnSettings.processSecrets() 2009-10-06 16:15:42 +08: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
3a0fc70b69 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
 2009-10-01 08:57:04 -07: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