Dianne Hackborn
2e3c75094b
Make settings a little aware of multi-user install.
...
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
2012-08-24 13:13:46 -07:00
Jeff Sharkey
f3de41a24d
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
2012-08-24 11:33:02 -07:00
Jeff Sharkey
745e6212e7
Migrate legacy VPN arguments to system_server.
...
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.
Bug: 5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
2012-08-24 11:17:57 -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
a5c6d6b32f
Import translations. DO NOT MERGE
...
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
2012-08-23 18:11:17 -07:00
Amith Yamasani
6413d9658b
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
2012-08-23 11:28:07 -07:00
Amith Yamasani
cd98f810f5
Show the license dialog only if the activity is still showing
...
Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
2012-08-23 11:25:18 -07:00
John Spurlock
05b5097d18
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
2012-08-23 10:47:16 -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
Jean-Baptiste Queru
1183f487c8
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
2012-08-23 09:31:36 -07:00
John Spurlock
e5a84b2ea1
Settings: Minimal refactor to support new dreams api.
...
Fix breaking changes to the dreams api. Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.
Bug:7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
2012-08-23 10:21:50 -04:00
Baligh Uddin
e3a49d7665
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-22 19:39:05 -07:00
Amith Yamasani
b18d58bdf5
Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
2012-08-22 18:45:52 -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
Irfan Sheriff
9e0fdfec70
Merge "Simplify proxy regex" into jb-mr1-dev
2012-08-22 14:21:41 -07:00
Irfan Sheriff
e8d4f2f98b
Simplify proxy regex
...
Bug: 6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d
2012-08-22 14:19:52 -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
Irfan Sheriff
50c1e5dee8
Merge "Update view on UI thread" into jb-mr1-dev
2012-08-22 11:57:18 -07:00
Irfan Sheriff
21d07b954a
Update view on UI thread
...
Bug: 6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014
2012-08-22 11:37:20 -07:00
Jeff Brown
395f5f7007
Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
2012-08-21 23:15:26 -07:00
Jeff Brown
9674b32324
Add a flag to control auto-brightness adjustment.
...
The feature is still disabled, it's just disabled using
a flag now.
Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
2012-08-21 21:13:48 -07:00
Jean-Baptiste Queru
4641f4b537
am 997b1f74
: am 578700af
: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '997b1f74c49314162635c5976fa369dfcd3385fb':
Settings: disable Lock SIM card till response is received
2012-08-21 14:34:56 -07:00
Jean-Baptiste Queru
997b1f74c4
am 578700af
: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
Settings: disable Lock SIM card till response is received
2012-08-21 14:33:50 -07:00
Jean-Baptiste Queru
578700afb1
Merge "Settings: disable Lock SIM card till response is received"
2012-08-21 13:40:29 -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
d44b53e37a
Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
2012-08-21 11:19:17 -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
Jeevaka Badrappan
48c0383125
Settings: disable Lock SIM card till response is received
...
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.
Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 9954
2012-08-21 17:00:22 +08:00
Jake Hamby
0141872d29
am 0de311b4
: am c46455ac
: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit '0de311b4956acc6ec05d25707f1075c1b8a38280':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:08:02 -07:00
Jake Hamby
0de311b495
am c46455ac
: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:06:25 -07:00
Jake Hamby
c46455ac7a
Merge "Enable "APN roaming protocol" for all platforms"
2012-08-20 17:27:36 -07:00
Brian Muramatsu
e54660d8b6
Merge "display wireless charging status" into jb-mr1-dev
2012-08-20 16:58:31 -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
c76bfb9243
Import translations. DO NOT MERGE
...
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
2012-08-17 12:09:22 -07:00
Jean-Baptiste Queru
b40815c150
am 71742eb1
: am 0c869d69
: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
...
* commit '71742eb13276e93d18f6aead10a8f767134ab0af':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:57:04 -07:00
Jean-Baptiste Queru
43231f2d6e
am f4cc034e
: am d61c23b3
: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:57:03 -07:00
Jean-Baptiste Queru
71742eb132
am 0c869d69
: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
...
* commit '0c869d694b59a55c8d53b57a12393b55530e798e':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c
am d61c23b3
: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:55:51 -07:00
Jean-Baptiste Queru
0c869d694b
Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
2012-08-17 08:51:18 -07:00
Jean-Baptiste Queru
d61c23b3c2
Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
2012-08-17 08:51:14 -07:00
The Android Open Source Project
c8cd7d9335
am 8543723f
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':
2012-08-16 18:59:04 -07:00
The Android Open Source Project
8543723f37
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
2012-08-16 18:57:02 -07:00
The Android Automerger
7a6674d1b1
merge in jb-mr0-release history after reset to jb-dev
2012-08-16 17:57:52 -07:00
Baligh Uddin
61ddf10d63
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-16 15:01:28 -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
Dianne Hackborn
bb06a427eb
Rename UserId to UserHandle.
...
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
2012-08-16 12:47:09 -07:00
Li Wenji
83397eab96
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
...
When click Tethering, the checkbox will be checked and then unchecked,
and finally move to checked states. This causes confusing to end user,
we need to keep Tethering checkbox unchecked before tethering is really
up.
Change-Id: If2314b7dd1369e619dead45af38fd53c7e89c34e
Author: Li Wenji <wenji.li@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 18281
2012-08-16 14:47:43 +08:00
Wu, Hao
b76be1f8d4
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
...
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.
Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 27200
2012-08-16 14:45:55 +08: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