Eric Fischer
8d3c1b51c6
Import translations. DO NOT MERGE
...
Change-Id: If243350912de447caaf65ae0d3fe1e0d4d639fd4
2012-03-13 15:09:56 -07:00
Irfan Sheriff
42f0f19b47
Merge "Enhance static IP UI"
2012-03-13 14:28:39 -07:00
Irfan Sheriff
db529dd66b
Enhance static IP UI
...
Based on the IP address provided, choose a default gateway, network prefix
and DNS to reduce typing for common scenarios
Bug: 6006249
Change-Id: I27878ce7895386b744013f267d29b3309208ec07
2012-03-13 11:16:14 -07:00
Eric Fischer
e9aa05829c
Import translations. DO NOT MERGE
...
Change-Id: I3e41f60d64f58cd7b999359e7aea7461c9a40a32
2012-03-12 14:51:05 -07:00
Irfan Sheriff
87a59e84c2
Merge "Increase char limit"
2012-03-12 10:38:19 -07:00
Irfan Sheriff
6e0ddded14
Increase char limit
...
Bug: 6126418
Change-Id: I1addfec2dd8810028cd0e19c27eff5602358c6b9
2012-03-12 10:13:54 -07:00
Jeff Sharkey
3f3a7f5400
Merge "Save timezone when setting data cycle reset date."
2012-03-09 18:33:51 -08:00
Jeff Sharkey
e5223a0577
Save timezone when setting data cycle reset date.
...
Bug: 5938567
Change-Id: I9df8da9d030169952098efc04cfde79e3e42e1f8
2012-03-09 18:24:01 -08:00
Irfan Sheriff
32a67b3df3
Merge "Fix p2p settings NPE"
2012-03-09 16:27:59 -08:00
Irfan Sheriff
a318d1e821
Fix p2p settings NPE
...
Bug: 6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
2012-03-09 15:18:42 -08:00
Eric Fischer
4409a951ae
Import translations. DO NOT MERGE
...
Change-Id: I3c88f810d7ef01a594865e8102048c0090dde1f5
2012-03-09 13:31:11 -08:00
Irfan Sheriff
891b3ca807
Merge "Use a different place holder name for string"
2012-03-09 01:17:50 -08:00
Eric Fischer
2e103b6a36
Merge "Import translations. DO NOT MERGE"
2012-03-08 17:45:43 -08:00
Irfan Sheriff
b7e2467adf
Use a different place holder name for string
...
Bug: 6132597
Change-Id: Ie6bf125413da4c1bcd288ae329e6d0f07200db85
2012-03-08 16:51:39 -08:00
Eric Fischer
be14916066
Import translations. DO NOT MERGE
...
Change-Id: I8b363dd496956ef7205b7d22a7ff6a080398d0e3
2012-03-08 13:40:33 -08:00
Amith Yamasani
d220c8a6fe
Fix NPE due to removed preference.
...
Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
2012-03-08 11:15:49 -08:00
Eric Fischer
e90f31596b
Merge "Import translations. DO NOT MERGE"
2012-03-07 15:17:40 -08:00
Eric Fischer
2e613d138f
Import translations. DO NOT MERGE
...
Change-Id: I0a6f821b47bcd8d1a67f6c7436eb79b5bd9b6798
2012-03-07 14:09:26 -08:00
Irfan Sheriff
bb0c3c60dc
Merge "P2p UI fixes"
2012-03-07 11:22:06 -08:00
Irfan Sheriff
6ac5554d30
P2p UI fixes
...
- Move Wi-Fi direct as a setting in Wi-Fi
- Handle some UI refresh issues
Change-Id: Idc43a2ca98acc4b904ca1f5fe0b1447ee612f218
2012-03-07 10:54:06 -08:00
Irfan Sheriff
e866733a6c
Merge "Remove dead strings and code"
2012-03-06 12:37:49 -08:00
Irfan Sheriff
37c2c2e9a2
Remove dead strings and code
...
Change-Id: Iacd5c1bee978a52b2e534a2c9db5a1b98f5bd48e
2012-03-06 12:27:44 -08:00
Dianne Hackborn
8650963a03
Merge "Use a component name that actually exists when enabling/disabling."
2012-03-06 10:33:41 -08:00
Dianne Hackborn
7d09187e41
Use a component name that actually exists when enabling/disabling.
...
Change-Id: Id6422a0039060bce3dc1bdc39551f04a4e4adbe6
2012-03-05 18:37:54 -08:00
Eric Fischer
b7fa58cc9e
Also restore a deleted array that is still referenced.
...
Change-Id: I6b9aecd9dc634eb55c2d256ab9dc9f623ad4feb5
2012-03-05 16:09:48 -08:00
Eric Fischer
1d832c66e2
Restore deleted strings still referenced from resources.
...
Change-Id: I29b16678900a1056ee6f41e530d68bb308ef27c9
2012-03-05 15:54:04 -08:00
Eric Fischer
ba0ad52226
Import translations. DO NOT MERGE
...
Change-Id: Ica141533e5f8c8791b55304152524e4c26fc673b
2012-03-05 15:17:09 -08:00
satok
2f467dbbc4
Fix spell checker settings layout
...
Change-Id: Ida36af8ae4e2ebd74a29d7b941bf718604de3b12
2012-03-05 16:06:07 +09:00
Irfan Sheriff
9c2d34e31c
Merge "Enhance and fix WPS UI"
2012-03-02 16:33:10 -08:00
Irfan Sheriff
90380120e7
Enhance and fix WPS UI
...
- Fixes WPS usage for open network
- Exposes WPS on UI for easy access to push button and pin based techniques
- Adds support for cancelling WPS
- Adds a dialog that reports a progress since WPS can take quite a bit of time
to complete
The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com
on partner source.
Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca
2012-03-02 14:25:00 -08:00
Eric Fischer
b1064d310b
Import translations. DO NOT MERGE
...
Change-Id: I784ea3784067393b951c50a50938b9140a36f236
2012-03-02 14:15:42 -08:00
Irfan Sheriff
6c9c305b28
am f91e52c9
: am c4bf8cd9
: am 2f76aaaf
: Merge "Enable EAP-pwd configuration in WiFi Settings."
...
* commit 'f91e52c986f4e7f8094a794c471813ac05d5d59c':
Enable EAP-pwd configuration in WiFi Settings.
2012-03-01 23:57:12 -08: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
bb826f26cb
am 9ae0b5a2
: am b2a0ea35
: Reconcile with ics-mr1-release
...
* commit '9ae0b5a23d8bc010589e77d29926b55903f3a31e':
2012-03-01 16:46:23 -08:00
Irfan Sheriff
5974ff9d03
Merge "Use new WifiManager API"
2012-03-01 16:26:58 -08:00
The Android Open Source Project
c77eab8812
am 224fee2e
: am 79ec613a
: Reconcile with ics-mr1-release
...
* commit '224fee2e581afd70a63b29e6a0bdcb0f10a15b33':
2012-03-01 15:51:22 -08:00
Irfan Sheriff
8f2f08e0ee
Use new WifiManager API
...
Change-Id: I9cc092e98412146a07c1829cacab47b8cea0bc9a
2012-03-01 13:53:37 -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
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