PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,334 Commits 1 Branch 0 Tags
000c73cc9888ead046c511ffe825b4387b58c93c
Commit Graph

50334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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-build SharedAccount
8998046cdc am 3a0fc70b: am 40906ea2: empty merge to avoid future conflicts 
Merge commit '3a0fc70b691201cf1806661224c94bd564354f63'

* commit '3a0fc70b691201cf1806661224c94bd564354f63':
  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 15:13:00 -07:00
Michael Chan
07673d2bad am 93979854: am 7bf9e031: Merge change Ie7e8a7ef into eclair 
Merge commit '93979854db687085e66173b10551ebf8915e7ab1'

* commit '93979854db687085e66173b10551ebf8915e7ab1':
  Don't auto-connect to OPP after pairing
 2009-10-01 15:12:16 -07:00
Amith Yamasani
5161a7b13d am 7c8a08d5: am ee52bed5: Merge change I39527366 into eclair 
Merge commit '7c8a08d51389e1c2c0411a1a4a12646880199e01'

* commit '7c8a08d51389e1c2c0411a1a4a12646880199e01':
  Use a custom system icon for native processes.
 2009-10-01 13:39:27 -07:00
Mike Cleron
dacd552d03 am d6372e99: am c5648906: Merge change I00ab9f0b into eclair 
Merge commit 'd6372e995c5a4ea2f60ea416aab1c4c3cc6debd0'

* commit 'd6372e995c5a4ea2f60ea416aab1c4c3cc6debd0':
  Fix widgets
 2009-10-01 13:39:22 -07:00
Michael Chan
c8f4a08c90 am f30ebb8b: am e6531e25: b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..." 
Merge commit 'f30ebb8bc86482e057f68083f0c09f7da1c89652'

* commit 'f30ebb8bc86482e057f68083f0c09f7da1c89652':
  b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
 2009-10-01 13:39: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
Amith Yamasani
c5a1cb8d77 am 962d3f4a: am e5cff265: Merge change Ibe023c8a into eclair 
Merge commit '962d3f4ab7efa7788a563c7c2711ff813fdc4bec'

* commit '962d3f4ab7efa7788a563c7c2711ff813fdc4bec':
  Fix Safety Settings screen bugs - 2150942, 2151440, 2151727
 2009-10-01 12:21:07 -07:00
Jaikumar Ganesh
dbbff54890 am 8c5ff4b7: am 1eb1df08: Add strings for authentication type. 
Merge commit '8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973'

* commit '8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973':
  Add strings for authentication type.
 2009-10-01 12:17:53 -07:00
Michael Chan
1fa730ec93 am eedf612f: am e3b59f19: Merge change I5eab1270 into eclair 
Merge commit 'eedf612f83c78eb8c60cb8b9034c25bd627eda8f'

* commit 'eedf612f83c78eb8c60cb8b9034c25bd627eda8f':
  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 12:15:45 -07:00
Debajit Ghosh
00e9be647b am a6ddefe6: am 99716fb4: updating sync settings icon 
Merge commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19'

* commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19':
  updating sync settings icon
 2009-10-01 12:13:27 -07:00
Hung-ying Tyan
b25e22be8a am 39087f8a: am 8fd062e1: Use the new VpnType.getDescriptionId(). 
Merge commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa'

* commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa':
  Use the new VpnType.getDescriptionId().
 2009-10-01 11:55:05 -07:00
Mike Cleron
28c6e2e962 am 9c06c4b2: am 08df1488: Newer icons 
Merge commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de'

* commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de':
  Newer icons
 2009-10-01 11:54:10 -07:00
Hung-ying Tyan
f10da8fff5 am 06167cc3: am b0883cb3: Fix bugs in credential storage settings: 
Merge commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b'

* commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b':
  Fix bugs in credential storage settings:
 2009-10-01 11:49:17 -07:00
Dianne Hackborn
986a88ab79 am 78651523: am cabb147c: Improve running services info. 
Merge commit '78651523727ee3aadec008faa7ae5a945c51ab69'

* commit '78651523727ee3aadec008faa7ae5a945c51ab69':
  Improve running services info.
 2009-10-01 11:44:45 -07:00
Jim Miller
1a9f1bd065 am 356ceb58: am be699645: Merge change I56544d0e into eclair 
Merge commit '356ceb5853243762d00d0c4e1482fbe887f66e3e'

* commit '356ceb5853243762d00d0c4e1482fbe887f66e3e':
  Fix for 2137900: Be more conservative about poking the wakelock
 2009-10-01 11:40:29 -07:00
Ken Shirriff
9bae0a3178 am f666279a: am eb8d6f78: Merge change Id80d1999 into eclair 
Merge commit 'f666279a60cd371c938955448453ccac2428b539'

* commit 'f666279a60cd371c938955448453ccac2428b539':
  Fix power widget brightness.
 2009-10-01 11:38:10 -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
Amith Yamasani
b214576f47 am 75f25db9: am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work 
Merge commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9'

* commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9':
  Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
 2009-10-01 11:16:58 -07:00
Chia-chi Yeh
f764d20a74 SecuritySettings: fix a the status before handling the intent. 2009-10-02 02:16:08 +08:00
Mike Cleron
3442d59157 am 31794fa9: am 69c51fea: New icons 
Merge commit '31794fa97992a7a17a108ac99247ae2c904b8509'

* commit '31794fa97992a7a17a108ac99247ae2c904b8509':
  New icons
 2009-10-01 11:12:20 -07: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