PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,473 Commits 1 Branch 0 Tags
0e3232fea01018a3be5fe8ca9a6899c78b0f672c
Commit Graph

6473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
e2fd7e0dcd Merge "Add support for wifi verification before connect" 2012-02-29 19:35:17 -08:00
Irfan Sheriff
09a9b38fbc Add support for wifi verification before connect 
Change-Id: Ie1fb9c2fad4f75985077236eab61c296314f4fe4
 2012-02-29 19:32:40 -08:00
Chia-chi Yeh
94cc1bbf32 VpnSettings: show more error messages when VPN fails. 
Bug: 6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
 2012-02-29 16:12:35 -08:00
Chia-chi Yeh
44a520a9b1 VpnSettings: use profiles instead of networks in the context of VPN. 
Change-Id: Ic43a7972ccd8abbedc5235b3685451fc36f59eec
 2012-02-29 15:40:28 -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
Eric Fischer
215cb8f183 Merge "Import translations. DO NOT MERGE" 2012-02-28 14:00:52 -08:00
Eric Fischer
92fefe282d Import translations. DO NOT MERGE 
Change-Id: If06bc1fe79c024b2c393b0cb36b72763242a96fe
 2012-02-28 13:20:49 -08:00
Amith Yamasani
4c18b58f45 am 1d424251: (-s ours) am 9220d367: am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '1d42425179607774dcd4c588a2a5b5453c2587ed':
 2012-02-28 10:19:18 -08:00
Amith Yamasani
db6a1f75db am 35fc9c76: (-s ours) am e5cb62f5: am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '35fc9c76e6a341d0c35ae0b003f8dbcb3e61bc03':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
 2012-02-28 10:17:30 -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
6130420fa9 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:08 -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
Amith Yamasani
ae3b75f0fb Merge "Don't crash if there's no bluetooth functionality (such as in an emulator)" 2012-02-28 09:34:05 -08:00
Joe Onorato
50339f3da1 turn off log spew 
Change-Id: I10f70d5f173cb04e9f58434d9daf0bb01498b813
 2012-02-27 22:32:43 -08:00
Amith Yamasani
5fb53f36cb Don't crash if there's no bluetooth functionality (such as in an emulator) 
Bug: 6079494
Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
 2012-02-27 17:18:45 -08:00
Eric Fischer
71bf428a3a Import translations. DO NOT MERGE 
Change-Id: I227e80744e9b0a7fb4a05f42d77592bbf0f33e21
 2012-02-27 15:53:10 -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
Robert Greenwalt
aaef0f6b2b Merge "Use the framework rather than RIL constants" 2012-02-24 15:00:21 -08:00
Jeff Sharkey
49cd8d5481 Merge "Reduce string lengths to fit on narrow screens." 2012-02-23 17:25:33 -08:00
Jeff Sharkey
6112d08142 Reduce string lengths to fit on narrow screens. 
Bug: 5780676
Change-Id: I841bc6c9a358af9dcf31badf5b3545ad6ec885fe
 2012-02-23 17:24:35 -08:00
Eric Fischer
fffd9f0b11 Import translations. DO NOT MERGE 
Change-Id: I2c4f903d7850328ebc3ea3e89f4b9eb121d9d2cc
 2012-02-23 14:25:07 -08:00
Daisuke Miyakawa
94cd0af735 Merge "Remove "Vibrate and ring" option" 2012-02-22 18:35:26 -08:00
Daisuke Miyakawa
b9bac4a98e Remove "Vibrate and ring" option 
It will be part of Phone's settings. See Ifb19b53b850ee8a4c15

Bug: 6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
 2012-02-22 14:30:06 -08:00
Eric Fischer
e4b09cf191 Import translations. DO NOT MERGE 
Change-Id: I32958249019d55f0f7301fa5a37879f562b31345
 2012-02-22 14:16:48 -08:00
Eric Fischer
2bcfa10d01 Import translations. DO NOT MERGE 
Change-Id: I7547b6ad8816a57f6dff7dd61c47bf6525090daf
 2012-02-21 14:18:22 -08:00
Irfan Sheriff
15c0da1314 Merge "Fix cursor position for password" 2012-02-17 16:05:44 -08:00
Irfan Sheriff
bd3d66cac5 Fix cursor position for password 
Bug: 5757292
Change-Id: Iad34b09ee56c24694ebf45350f0dbc398f2cfa06
 2012-02-17 16:04:05 -08:00
Eric Fischer
7943f2fd89 Import translations. 
Change-Id: I1e023de5eab792b15df68fa6bdffdb0d6118a876
 2012-02-17 15:58:31 -08:00
Robert Greenwalt
e37f427cbb Use the framework rather than RIL constants 
bug:5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
 2012-02-17 15:25:14 -08:00
Eric Fischer
85cbfee88c Merge "Import translations." 2012-02-16 21:11:25 -08:00
Dianne Hackborn
5fe5ef21cf Fix issue #6026576 de_source_broad_Android - GoogleJob [192291 / - ] 
-GTT_request character limit extension

Change-Id: Id0ef1c025dca8f8cbd7914f551d897ce9b044763
 2012-02-16 15:11:18 -08:00
Eric Fischer
aa1fd3b246 Import translations. 
Change-Id: I465465b1b620e22dcdcf642e4c12ebee1aff3da7
 2012-02-16 14:56:08 -08:00
The Android Open Source Project
c09adbc086 am 6cffd425: am cff569f1: Reconcile with ics-mr1-release 
* commit '6cffd425dac595da0ecd825b6e337a726916d9e8':
 2012-02-16 11:25:36 -08:00
The Android Open Source Project
c59994eb54 am cca3be2b: am 7b276302: Reconcile with ics-mr1-release 
* commit 'cca3be2bc474191f9d86e00e55152771803727d6':
 2012-02-16 11:25:22 -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
Eric Fischer
29baed9713 Import translations. 
Change-Id: Ied8b68c4e16a93835b769dc05a38f066d0b43837
 2012-02-15 14:34:26 -08:00
Eric Fischer
28df2d3038 Merge "Import translations." 2012-02-14 16:08:03 -08:00
Eric Fischer
070c5e922a Import translations. 
Change-Id: I998fa1d4ddeec81d4532143ed5313db39f53bbde
 2012-02-14 16:00:20 -08:00
Irfan Sheriff
8f046d6d6a Merge "Concurrency wifi p2p and client operation support" 2012-02-14 15:39:09 -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
Dianne Hackborn
c1cca607cf Merge "Add debug app / wait for debugger dev options." 2012-02-14 14:07:03 -08:00
Dianne Hackborn
9244df4c64 Add debug app / wait for debugger dev options. 
Re-organize dev options a bit.

Change-Id: I291b177c87cb8fb4bd8316d05aa6eadfaaf5f0d2
 2012-02-14 13:46:27 -08:00
Irfan Sheriff
52cc2cd5d3 am 9386b388: Merge "Fix NPE" 
* commit '9386b388f6ea29a6aa7558eee13ebfeeab8ae2cb':
  Fix NPE
 2012-02-13 22:35:09 -08:00
Irfan Sheriff
9386b388f6 Merge "Fix NPE" 2012-02-13 22:33:14 -08:00