PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,391 Commits 1 Branch 0 Tags
3ad5cadcbcee4b80906e7a526656791c66adb4d0
Commit Graph

5391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
3ad5cadcbc am 6db7e9e0: Import translations. DO NOT MERGE 
* commit '6db7e9e04318e431c3afad68daaeac555dc71783':
  Import translations. DO NOT MERGE
 2012-03-21 14:19:35 -07:00
Eric Fischer
6db7e9e043 Import translations. DO NOT MERGE 
Change-Id: I50955bd54ef21ed5489958e92d33d5ca7efddc4f
 2012-03-21 13:34:02 -07:00
Eric Fischer
2c95ab5e48 am 5665cda1: Import translations. DO NOT MERGE 
* commit '5665cda1e1889af9bc7e48a0746f02cec3b17aef':
  Import translations. DO NOT MERGE
 2012-03-20 14:33:54 -07:00
Eric Fischer
5665cda1e1 Import translations. DO NOT MERGE 
Change-Id: I0fdd1f06fb7783649795bac398e84c9be8658845
 2012-03-20 13:01:49 -07:00
Eric Fischer
b22dff48f8 am 63cad3dd: Import translations. DO NOT MERGE 
* commit '63cad3dd8b06b0eff66be07815f1cfe54c5f7b76':
  Import translations. DO NOT MERGE
 2012-03-19 14:34:43 -07:00
Eric Fischer
63cad3dd8b Import translations. DO NOT MERGE 
Change-Id: Ic36ea190bec85b32f7614ca2c329d6ff48f93d8a
 2012-03-19 14:30:38 -07:00
Jason Chen
3f49e65fc3 am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'b0362b1bb0a3288c8de2cd8d0e5efd44ec1a831e':
 2012-03-16 17:29:35 -07:00
Jason Chen
9b06ca9476 am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '8f393645e9b66235760c3e3c9b1dd9d999ed03f1':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 17:27:13 -07:00
Jason Chen
b0362b1bb0 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 17:26:29 -07:00
Jason Chen
8f393645e9 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:32:30 -07:00
Jason Chen
d5f7e6cd6b [DO NOT MERGE] Revert "Update string in Settings" 
This reverts commit 23d0b5287a.
 2012-03-16 16:18:51 -07:00
Jason Chen
3180a46c4b am 0eb3a3fc: am 23d0b528: Update string in Settings 
* commit '0eb3a3fc4e25d4df6379d775269f561f66748c8d':
 2012-03-16 14:21:08 -07:00
Jason Chen
bb4133b1f6 am dd6c0d61: am 23d0b528: Update string in Settings 
* commit 'dd6c0d61d7a3c605be2d402c3cd2586c539df81c':
  Update string in Settings
 2012-03-16 14:19:03 -07:00
Jason Chen
dd6c0d61d7 am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:17 -07:00
Jason Chen
0eb3a3fc4e am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:17 -07:00
Jason Chen
23d0b5287a Update string in Settings 
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
 2012-03-16 11:31:19 -07:00
Irfan Sheriff
f91e52c986 am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings." 
* commit 'c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d':
  Enable EAP-pwd configuration in WiFi Settings.
 2012-03-01 22:55:17 -08:00
Irfan Sheriff
c4bf8cd955 am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings." 
* commit '2f76aaaf0105add942334ef3574e7378ee8a6097':
  Enable EAP-pwd configuration in WiFi Settings.
 2012-03-01 22:48:42 -08:00
Irfan Sheriff
2f76aaaf01 Merge "Enable EAP-pwd configuration in WiFi Settings." 2012-03-01 16:47:19 -08:00
The Android Open Source Project
9ae0b5a23d am b2a0ea35: Reconcile with ics-mr1-release 
* commit 'b2a0ea3541191318a8810cef63a2d2b7d9566e4e':
 2012-03-01 10:43:48 -08:00
The Android Open Source Project
b2a0ea3541 Reconcile with ics-mr1-release 
Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e
 2012-03-01 10:40:59 -08:00
The Android Open Source Project
224fee2e58 am 79ec613a: Reconcile with ics-mr1-release 
* commit '79ec613a66b71a16591bcd3bde5cb815f1a3d352':
 2012-03-01 10:14:25 -08:00
The Android Open Source Project
79ec613a66 Reconcile with ics-mr1-release 
Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd
 2012-03-01 10:12:39 -08:00
The Android Automerger
815b2f3467 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:15:44 -08:00
Amith Yamasani
1d42425179 am 9220d367: am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '9220d367eb30ba8f5375627cd782921b82c8b332':
 2012-02-28 10:16:55 -08:00
Amith Yamasani
35fc9c76e6 am e5cb62f5: am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit 'e5cb62f5f4af389f21d950b7847f0df909a0225f':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
 2012-02-28 10:15:11 -08:00
Amith Yamasani
9220d367eb am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
 2012-02-28 10:14:00 -08:00
Amith Yamasani
e5cb62f5f4 am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
 2012-02-28 10:13:28 -08:00
Amith Yamasani
9372484065 Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge. 
Bug: 6079494

(cherry picked from commit 5fb53f36cb)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
 2012-02-28 09:58:45 -08:00
Partha N
ba7ee527d8 Enable EAP-pwd configuration in WiFi Settings. 
EAP-pwd (RFC 5931) is an EAP method that uses a shared password
for authentication. It has the simplicity of setup as WPA2-PSK
(no certificates), but provides strong authenticaiton like 802.1x.

Modified the Settings screen so that the only visible fields
when choosing EAP-pwd are 'identity' and 'password'.

Change-Id: I9365d873b43c416ddfa4cae47b7419d902c212a7
Signed-off-by: Partha N <parthan@gmail.com>
 2012-02-26 22:26:55 -08:00
The Android Open Source Project
6cffd425da am cff569f1: Reconcile with ics-mr1-release 
* commit 'cff569f11cb4960ce5299bf6c198eeb7945dc224':
 2012-02-16 10:13:50 -08:00
The Android Open Source Project
cff569f11c Reconcile with ics-mr1-release 
Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e
 2012-02-16 10:11:02 -08:00
The Android Open Source Project
cca3be2bc4 am 7b276302: Reconcile with ics-mr1-release 
* commit '7b2763021750a2d138eaa20ee2d2828d83d1720c':
 2012-02-16 10:06:42 -08:00
The Android Open Source Project
7b27630217 Reconcile with ics-mr1-release 
Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235
 2012-02-16 10:03:02 -08:00
The Android Automerger
7ca9dcbdff merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:17:08 -08:00
Eric Fischer
41e16eaa03 am 8b24b374: am 78ef5443: Import translations. DO NOT MERGE 
* commit '8b24b374139e608182515b56ec6f7b87a8293024':
 2012-02-10 10:49:56 -08:00
Eric Fischer
10d7fe6932 am ecd9c570: (-s ours) am 78ef5443: Import translations. DO NOT MERGE 
* commit 'ecd9c570f767040e8c021aa6ed995894c0d8d754':
  Import translations. DO NOT MERGE
 2012-02-10 10:16:08 -08:00
Eric Fischer
8b24b37413 am 78ef5443: Import translations. DO NOT MERGE 
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
 2012-02-10 10:13:38 -08:00
Eric Fischer
ecd9c570f7 am 78ef5443: Import translations. DO NOT MERGE 
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
 2012-02-10 10:12:35 -08:00
Eric Fischer
78ef5443a6 Import translations. DO NOT MERGE 
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
 2012-02-08 19:08:43 -08:00
Eric Fischer
b0d203c395 am 4bec429d: Import translations. DO NOT MERGE 
* commit '4bec429dd5a6f22b3a23aff8ed29b7a68786bba5':
  Import translations. DO NOT MERGE
 2012-02-06 12:50:21 -08:00
Eric Fischer
4bec429dd5 Import translations. DO NOT MERGE 
Change-Id: I615776e4f0521a14747ecf6f9e7f8a695bc128b9
 2012-02-06 12:43:39 -08:00
Eric Fischer
f215bfff60 am 117bfe86: Import translations. DO NOT MERGE 
* commit '117bfe86cd1b71b35bef4069a2bbd8452cd37a43':
  Import translations. DO NOT MERGE
 2012-02-03 13:54:46 -08:00
Eric Fischer
117bfe86cd Import translations. DO NOT MERGE 
Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
 2012-02-03 12:46:38 -08:00
Eric Fischer
175f4154a6 resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp 
Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
 2012-02-02 14:07:34 -08:00
Eric Fischer
cbbfffca1e resolved conflicts for merge of 67a50f99 to ics-scoop 
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
 2012-02-02 14:00:17 -08:00
Eric Fischer
201a77ea39 am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE 
* commit '940f2a7479eb68af290f631d227bc79dcf29a7c5':
  Import translations. DO NOT MERGE
 2012-02-02 13:49:08 -08:00
Eric Fischer
940f2a7479 am 67a50f99: Import translations. DO NOT MERGE 
* commit '67a50f99d80b76337541fb71f98025c0b144e5b5':
  Import translations. DO NOT MERGE
 2012-02-02 13:47:17 -08:00
Eric Fischer
c61223ce85 am cd92dd07: Import translations. DO NOT MERGE 
* commit 'cd92dd07546a7fe410e3d0184cfafa3561b72050':
  Import translations. DO NOT MERGE
 2012-02-02 13:26:26 -08:00
Eric Fischer
cd92dd0754 Import translations. DO NOT MERGE 
Change-Id: I1e698fedf0d3e3f8ef30cca119303dbb4ca3f402
 2012-02-02 12:54:58 -08:00