Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
976 Commits 1 Branch 0 Tags
bd27db9782d9f7d2aeefe9a18efc80d173aa8cab
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
bd27db9782 am c7423763: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 
Merge commit 'c74237633f0e5a3c4d1c59058e45b6e056e840ea'

* commit 'c74237633f0e5a3c4d1c59058e45b6e056e840ea':
  Update application code for BluetoothAdapter.getDefaultAdapter().
 2009-10-12 12:38:35 -07:00
Elliott Hughes
d0567813b0 am c4cd095d: am c52637df: Merge change I8e1b0fb7 into eclair-mr2 
Merge commit 'c4cd095d7b90f1d35f661948283de0f2694b0b92'

* commit 'c4cd095d7b90f1d35f661948283de0f2694b0b92':
  Fix Settings to show versionName instead of versionCode.
 2009-10-12 12:32:19 -07:00
Eric Fischer
0de13921fd am 8ba6a2d5: (-s ours) am c197f154: am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair 
Merge commit '8ba6a2d5e8591173ce3d1d6a5c4317c35e684d78'

* commit '8ba6a2d5e8591173ce3d1d6a5c4317c35e684d78':
  Import revised translations.   DO NOT MERGE
 2009-10-12 12:31:37 -07:00
Hung-ying Tyan
437fc1ef21 am b08ff302: am 1cd02cac: am c0e34db1: Merge change Ifad4a4c0 into eclair 
Merge commit 'b08ff302c987c58e58b3a26881fc4dac5f016185'

* commit 'b08ff302c987c58e58b3a26881fc4dac5f016185':
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-12 12:31:33 -07:00
Amith Yamasani
a1dfb94679 am 33aa0fad: am cab9fe2d: Merge change I3c9f79ba into eclair-mr2 
Merge commit '33aa0fadf8cb0a7e4a4f23af17b30959927f083e'

* commit '33aa0fadf8cb0a7e4a4f23af17b30959927f083e':
  Retain webview history when viewing Safety notices. Fixes #2160518
 2009-10-12 11:43:56 -07:00
Jaikumar Ganesh
729aee7894 am ec77e2b0: am f43b1a9d: am 98d76cc9: Remove STOPSHIP debug log. 
Merge commit 'ec77e2b0fa087efb44587bf08d790abf445d702b'

* commit 'ec77e2b0fa087efb44587bf08d790abf445d702b':
  Remove STOPSHIP debug log.
 2009-10-12 11:43:52 -07:00
Chia-chi Yeh
edefba954d am b01a6f96: am 0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up. 
Merge commit 'b01a6f96c3da6d5ce718eca38f2f4185570a431b'

* commit 'b01a6f96c3da6d5ce718eca38f2f4185570a431b':
  SecuritySettings: reduce 1 access to KeyStore and clean up.
 2009-10-12 11:38:18 -07:00
Dan Vacura
db90cde6c7 am a89d3d35: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 
Merge commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708'

* commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708':
 2009-10-12 11:38:15 -07:00
Chung-yih Wang
fd475ade13 am 059c3f5d: am a8f2f72d: Add the auth_alg field back. 
Merge commit '059c3f5d1eb52a7564208464b1d0f76af509e891'

* commit '059c3f5d1eb52a7564208464b1d0f76af509e891':
  Add the auth_alg field back.
 2009-10-12 11:17:39 -07:00
Eric Fischer
801d52b7ed am 9ff282bb: (-s ours) am 6de9fb39: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '9ff282bb755829145245d4730e6f87c042da1de4'

* commit '9ff282bb755829145245d4730e6f87c042da1de4':
  Import revised translations.  DO NOT MERGE
 2009-10-12 11:17:35 -07:00
Jaikumar Ganesh
1157a7c4f2 am 6e6d2362: Merge change I25f2afba into eclair 
Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15'

* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
  Check if a device is added to the cache before returning.
 2009-10-12 11:17:31 -07:00
Chia-chi Yeh
cbd42fb747 am 85ed0862: Merge change I454a0dbf into eclair 
Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6'

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
 2009-10-12 11:17:26 -07:00
Chia-chi Yeh
c76a17c9c9 am 9767612c: Merge change If764d20a into eclair 
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e'

* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
  SecuritySettings: fix a the status before handling the intent.
 2009-10-12 11:17:22 -07:00
Chia-chi Yeh
9feeee2b3b am e61a2403: Merge change I844d3db3 into eclair 
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80'

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
  SecuritySettings: set the check box before further processing.
 2009-10-12 11:17:18 -07:00
Chia-chi Yeh
fd8ac18009 am 1e98dfb4: Merge change I446bf8b5 into eclair 
Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e'

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
 2009-10-12 11:17:15 -07:00
Chia-chi Yeh
bb5247da2a am b83ff4af: Merge change Ibf07c83d into eclair 
Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465'

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
  SecuritySettings: remove debug messages.
 2009-10-12 11:17:11 -07:00
Chia-chi Yeh
75bc6bc2bd am 51e97b33: Merge change Ia7c57145 into eclair 
Merge commit '51e97b33d265709da2aa69c861994574a0544aaa'

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.
 2009-10-12 11:17:07 -07:00
Chia-chi Yeh
86b3b534b9 am c49ca127: Merge change I02f58e89 into eclair 
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c'

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
 2009-10-12 11:17:03 -07:00
Chia-chi Yeh
9da18d51bc am d2fa30ba: Merge change I28f1a0fc into eclair 
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f'

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
  WifiSettings: use keystore namespace instead of blobl.
 2009-10-12 11:16:59 -07:00
Nick Pelly
c74237633f Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-07 16:41:31 -07:00
Nick Pelly
99479dd32f am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter(). 
Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().
 2009-10-07 16:36:16 -07:00
Nick Pelly
d1a04291c5 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.
 2009-10-08 01:03:34 +02:00
Eric Fischer
4f962ace77 am 06a111be: Merge change Ia3151ad3 into eclair 
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
 2009-10-07 12:08:59 -07:00
Hung-ying Tyan
d92be71168 am c0e34db1: Merge change Ifad4a4c0 into eclair 
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-07 12:08:55 -07:00
Elliott Hughes
c4cd095d7b 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.
 2009-10-07 12:02:16 -07:00
Android (Google) Code Review
c52637dfab Merge change I8e1b0fb7 into eclair-mr2 
* changes:
  Fix Settings to show versionName instead of versionCode.
 2009-10-07 14:58:06 -04:00
Jaikumar Ganesh
caf43948b7 am 98d76cc9: Remove STOPSHIP debug log. 
Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.
 2009-10-07 11:55:47 -07:00
Eric Fischer
8ba6a2d5e8 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
 2009-10-07 11:52:21 -07:00
Hung-ying Tyan
b08ff302c9 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()
 2009-10-07 11:52:17 -07:00
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