Amith Yamasani
b7808c7187
am 6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
...
* commit '6413d9658b0b7ac425621c488eb7c13b4fd295f4':
Show the license dialog only if the activity is still showing
2012-08-23 11:30:45 -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
156d6afa77
am 05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
...
* commit '05b5097d1871fc445fec27734b2f667539a13da0':
Settings: Minimal refactor to support new dreams api.
2012-08-23 10:48:30 -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
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
ba2ab869e9
am e3a49d76: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e3a49d7665b6eda9a19375bb4f306113163ddc93':
Import translations. DO NOT MERGE
2012-08-22 19:41:22 -07:00
Baligh Uddin
e3a49d7665
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-22 19:39:05 -07:00
Amith Yamasani
9a53625bd0
am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
...
* commit 'b18d58bdf5501a50d4a2d726c875676b16a657e2':
Simplify User management settings to bare minimum
2012-08-22 18:47:11 -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
The Android Open Source Project
f1a3161ef3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I85140e245de7ea2f1cb63252294e4cfe71b8006e
2012-08-22 15:36:24 -07:00
Irfan Sheriff
aea749fa94
am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev
...
* commit '9e0fdfec70f181ec71198822fa39e749248c5f87':
Simplify proxy regex
2012-08-22 14:24:20 -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
5a2dce6092
am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev
...
* commit '50c1e5dee8e45edf8f7593c722399735659127e7':
Update view on UI thread
2012-08-22 12:17:13 -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
The Android Automerger
783482f410
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:34:22 -07:00
Jeff Brown
500421e671
am 395f5f70: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
...
* commit '395f5f700718aac811ea8216fdb60bdd08452553':
Add a flag to control auto-brightness adjustment.
2012-08-21 23:17:06 -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
The Android Open Source Project
e696e53483
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id59555adc024005fc53103e2006e987e72283811
2012-08-21 16:07:03 -07:00
Jean-Baptiste Queru
5d8378c0ba
am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '4641f4b53790ad1ff6c6c1c17951b6b200a3f07c':
Settings: disable Lock SIM card till response is received
2012-08-21 14:35:54 -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
ccc7193490
am d75b776a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd75b776a7c2cb741793cfa5d1af524db96b738ef':
Import translations. DO NOT MERGE
2012-08-21 11:58:52 -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
5a91b13426
am d44b53e3: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
...
* commit 'd44b53e37abed9632d30df37259b3efcb10332aa':
Make manage apps UI multi-user aware.
2012-08-21 11:21:11 -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
The Android Automerger
65586bf0b4
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:35:02 -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
785a81ee2b
am 0141872d: am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit '0141872d29945e85733eee74222d207ff9b80608':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:09:40 -07: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
391e125a11
am e54660d8: Merge "display wireless charging status" into jb-mr1-dev
...
* commit 'e54660d8b66e5c3aebbeefbb727386602714c621':
display wireless charging status
2012-08-20 16:59:50 -07:00
Brian Muramatsu
e54660d8b6
Merge "display wireless charging status" into jb-mr1-dev
2012-08-20 16:58:31 -07:00
Baligh Uddin
097593e553
am 5fdc5264: Import translations. DO NOT MERGE
...
* commit '5fdc526426f6250bda522235a6db56548c89cb0a':
Import translations. DO NOT MERGE
2012-08-20 14:51:17 -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
The Android Automerger
ee6bd99204
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:35:42 -07:00
Baligh Uddin
6e6a468c7f
am c76bfb92: Import translations. DO NOT MERGE
...
* commit 'c76bfb9243d7fae3f2f6f785685f709c28b41097':
Import translations. DO NOT MERGE
2012-08-17 15:57:59 -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
db3262676e
am b40815c1: am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
...
* commit 'b40815c150fb3b4a53e7447d249316e3b3fc9502':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:58:08 -07:00
Jean-Baptiste Queru
ba094d3fd3
am 43231f2d: am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit '43231f2d6edef60859ffd3d92d43afe48f5916f6':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:58:07 -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
