Jean-Baptiste Queru
72d3f85d09
am 300457ba
: am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '300457bad289f547430da21e72747e8840840832':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:15:22 -07:00
Jean-Baptiste Queru
300457bad2
am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '38ce5194e89b83697466abe2994016507109ec54':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:10:06 -07:00
Jean-Baptiste Queru
38ce5194e8
Merge "Enable to delete a stored persistent group from p2p settings."
2012-08-28 10:46:59 -07:00
Yoshihiko Ikenaga
f3f14665a3
Enable to delete a stored persistent group from p2p settings.
...
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.
Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com >
2012-08-28 15:16:38 +09:00
Baligh Uddin
786aacb796
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:03:31 -07:00
Baligh Uddin
0d33b292d0
Merge "Import translations. DO NOT MERGE"
2012-08-27 16:03:10 -07:00
Jeff Sharkey
4e51f92120
am d1dbff36
: am da40470d
: Merge "Always-on VPN." into jb-mr1-dev
...
* commit 'd1dbff362193c428bab38f189a041058650a7904':
Always-on VPN.
2012-08-27 15:17:24 -07:00
Baligh Uddin
43a48736c8
Import translations. DO NOT MERGE
...
Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
2012-08-27 15:11:32 -07:00
Baligh Uddin
c7bb3a1669
Import translations. DO NOT MERGE
...
Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
2012-08-27 15:08:09 -07:00
Jeff Sharkey
9fd7ac1ec7
Always-on VPN.
...
Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS. Moved "add" operation into action bar.
Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
2012-08-26 17:01:46 -07:00
Baligh Uddin
cf03309273
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-24 15:03:15 -07:00
Baligh Uddin
56d7fa5ed5
Merge "Import translations. DO NOT MERGE"
2012-08-24 15:02:56 -07:00
Dianne Hackborn
47401d924f
am 15b07df7
: am 2e3c7509
: Make settings a little aware of multi-user install.
...
* commit '15b07df79467aeabbe185a38397a90b2961a61b1':
Make settings a little aware of multi-user install.
2012-08-24 14:42:55 -07:00
Baligh Uddin
eb6f32285c
Import translations. DO NOT MERGE
...
Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f
Auto-generated-cl: translation import
2012-08-24 13:32:09 -07:00
Baligh Uddin
7b139fa097
Import translations. DO NOT MERGE
...
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
2012-08-24 13:29:14 -07:00
Dianne Hackborn
2e3c75094b
Make settings a little aware of multi-user install.
...
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
2012-08-24 13:13:46 -07:00
Jean-Baptiste Queru
22ab662ad8
am f741006e
: am 534529d0
: am 88f37936
: am 1183f487
: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit 'f741006e7e542cebaa75fb3c05ade59a1f1d0891':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-24 07:34:55 -07:00
Jean-Baptiste Queru
534529d0cc
am 88f37936
: am 1183f487
: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit '88f379367f208a75dfe95a081b25c27a54b06a1a':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-24 07:29:43 -07:00
Baligh Uddin
9bb2f8d298
Import translations. DO NOT MERGE
...
Change-Id: I4469d469295c80f83cece04b90681ab4f35c5488
Auto-generated-cl: translation import
2012-08-23 18:13:40 -07:00
Baligh Uddin
a5c6d6b32f
Import translations. DO NOT MERGE
...
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
2012-08-23 18:11:17 -07:00
Jean-Baptiste Queru
88f379367f
am 1183f487
: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-23 09:47:04 -07:00
Baligh Uddin
e3a49d7665
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-22 19:39:05 -07:00
Baligh Uddin
b35a9b6811
Merge "Import translations. DO NOT MERGE"
2012-08-22 19:38:22 -07:00
Amith Yamasani
9d290115d4
am 9a53625b
: am b18d58bd
: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
...
* commit '9a53625bd039abc5b08fd26e9d35e25c5268bfd1':
Simplify User management settings to bare minimum
2012-08-22 18:49:15 -07:00
Amith Yamasani
8e79d3ec80
Simplify User management settings to bare minimum
...
No need to restrictions or account association at this time.
Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
2012-08-22 18:43:54 -07:00
Baligh Uddin
ee1a2a65e5
Import translations. DO NOT MERGE
...
Change-Id: Iefc2d9fb4059b9ffb4a1e08d0269907ce7ca73cc
Auto-generated-cl: translation import
2012-08-22 13:01:07 -07:00
Baligh Uddin
3a61dea4bf
Import translations. DO NOT MERGE
...
Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd
Auto-generated-cl: translation import
2012-08-22 12:58:12 -07:00
Baligh Uddin
f42c9cf853
Merge "Import translations. DO NOT MERGE"
2012-08-21 12:49:43 -07:00
Baligh Uddin
8bb1195431
Import translations. DO NOT MERGE
...
Change-Id: I6f68180aa2dfc4b252a060afad0cb7f52f914548
Auto-generated-cl: translation import
2012-08-21 11:58:35 -07:00
Baligh Uddin
d75b776a7c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-21 11:57:12 -07:00
Baligh Uddin
8844edf98a
Import translations. DO NOT MERGE
...
Change-Id: I4beb9abb9778e82144be702dbab151a9e47f9c4e
Auto-generated-cl: translation import
2012-08-21 11:55:13 -07:00
Dianne Hackborn
7798f3c7eb
am 5a91b134
: am d44b53e3
: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
...
* commit '5a91b13426f55d2289e25dda2c1ade769cb10bec':
Make manage apps UI multi-user aware.
2012-08-21 11:23:02 -07:00
Dianne Hackborn
271c8b06c2
Make manage apps UI multi-user aware.
...
The details screens still need some work.
Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
2012-08-21 11:14:04 -07:00
Brian Muramatsu
e64c8a5e3a
am 391e125a
: am e54660d8
: Merge "display wireless charging status" into jb-mr1-dev
...
* commit '391e125a111b1eadfa3bd88956f7d71dce99dbda':
display wireless charging status
2012-08-20 17:01:23 -07:00
Brian Muramatsu
e54660d8b6
Merge "display wireless charging status" into jb-mr1-dev
2012-08-20 16:58:31 -07:00
Baligh Uddin
c8f0817f78
Import translations. DO NOT MERGE
...
Change-Id: Id150553c2cec9c5b01ade4ee02840b57ea47e696
Auto-generated-cl: translation import
2012-08-20 10:38:22 -07:00
Baligh Uddin
5fdc526426
Import translations. DO NOT MERGE
...
Change-Id: Idd1ece233eb5daf32683069ca5daa04718769c87
Auto-generated-cl: translation import
2012-08-20 10:35:09 -07:00
Baligh Uddin
a6c98f57a6
Import translations. DO NOT MERGE
...
Change-Id: I04bc114ed968e33f2bba9046d31dc310164edb94
Auto-generated-cl: translation import
2012-08-17 12:11:58 -07:00
Baligh Uddin
c76bfb9243
Import translations. DO NOT MERGE
...
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
2012-08-17 12:09:22 -07:00
Baligh Uddin
a4d0f7e313
Import translations. DO NOT MERGE
...
Change-Id: Ic4de59a722517410ba99820d0484708f42c52711
Auto-generated-cl: translation import
2012-08-16 14:49:51 -07:00
Baligh Uddin
77fd1d9431
Import translations. DO NOT MERGE
...
Change-Id: Ia37da41da85a756cb59799c52efadf5289eeacf3
Auto-generated-cl: translation import
2012-08-16 14:46:47 -07:00
Baligh Uddin
967e7b8ef3
Import translations. DO NOT MERGE
...
Change-Id: I8a23e638be02554c1f366e8e4c500d8b0252a4c9
Auto-generated-cl: translation import
2012-08-15 17:09:32 -07:00
Baligh Uddin
704ca026e0
Import translations. DO NOT MERGE
...
Change-Id: I72f08740932429c34f14ca0a16b2d330e8161e26
Auto-generated-cl: translation import
2012-08-15 17:06:43 -07:00
Baligh Uddin
abb27e66f4
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-15 07:48:35 -07:00
Baligh Uddin
61ada8dab2
Merge "Import translations. DO NOT MERGE"
2012-08-15 07:46:00 -07:00
Baligh Uddin
a3ea6a38e0
Import translations. DO NOT MERGE
...
Change-Id: I7c04327691d80c32adc4c7e9a5321be4ca53af68
Auto-generated-cl: translation import
2012-08-14 21:55:20 -07:00
Baligh Uddin
28ff6bf63f
Import translations. DO NOT MERGE
...
Change-Id: If631ddac7c81a880ca6a1c6ddb7b38ff25d9bb2c
Auto-generated-cl: translation import
2012-08-14 21:53:00 -07:00
Brian Muramatsu
0bd54a65d6
display wireless charging status
...
- show "Charging (wireless)" when using wireless charger
- change "Discharging" to "Not charging"
bug: 6879638
Change-Id: I20e78f2bde7a526667510b82a030f5952d9dda75
2012-08-14 15:30:22 -07:00
Baligh Uddin
133c8ca599
am c5acc132
: Import translations. DO NOT MERGE
...
* commit 'c5acc132ca3de71c36cca1ebea2635396172ab4a':
Import translations. DO NOT MERGE
2012-08-14 12:55:11 -07:00
Baligh Uddin
575754fbf3
Merge "Import translations. DO NOT MERGE"
2012-08-14 12:52:38 -07:00