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
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
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
53c4523f85
am aea749fa
: am 9e0fdfec
: Merge "Simplify proxy regex" into jb-mr1-dev
...
* commit 'aea749fa94f9d1c0b5dd7c16247b8c2eeca23462':
Simplify proxy regex
2012-08-22 14:25:28 -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
Irfan Sheriff
fa8c1fc833
am 5a2dce60
: am 50c1e5de
: Merge "Update view on UI thread" into jb-mr1-dev
...
* commit '5a2dce6092c9686f285652da42ca8d0556b7b17d':
Update view on UI thread
2012-08-22 12:19:01 -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
3be5dbf7da
am 500421e6
: am 395f5f70
: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
...
* commit '500421e671de3853babec393a28569bf009e432d':
Add a flag to control auto-brightness adjustment.
2012-08-21 23:18:53 -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
8f97db22a9
am 5d8378c0
: am 4641f4b5
: am 997b1f74
: am 578700af
: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '5d8378c0bad90a7088e38ccb0d537b5d1a5efcdd':
Settings: disable Lock SIM card till response is received
2012-08-21 14:36:55 -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
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
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
3a4177c940
am 785a81ee
: am 0141872d
: am 0de311b4
: am c46455ac
: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit '785a81ee2b3a34e5af8b3ad4714e2126ab032fb8':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:11:34 -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
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
Jean-Baptiste Queru
d9125340b9
am db326267
: am b40815c1
: am 71742eb1
: am 0c869d69
: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
...
* commit 'db3262676ed903f49d8dc4e4908e5265ab722a25':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:59:48 -07:00
Jean-Baptiste Queru
06a5ea9c4a
am ba094d3f
: am 43231f2d
: am f4cc034e
: am d61c23b3
: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit 'ba094d3fd32f97e46b29aedb6fe391de711eb8da':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:59:47 -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
Jeevaka Badrappan
26ef2c3436
Settings: Fix crash seen when setting the radio band
...
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.
Check the activity status before displaying the
set radio band result alert dialog.
Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
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: 39317
2012-08-17 14:21:08 +08:00
Dianne Hackborn
88303fe5aa
am 2de17ff4
: am bb06a427
: Rename UserId to UserHandle.
...
* commit '2de17ff49a6bb11148f085eba6bc37aee834345b':
Rename UserId to UserHandle.
2012-08-16 12:53: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
Jeff Brown
3be4c81d36
am 62ff6791
: am 0a5f02a7
: Merge "Use new power manager API." into jb-mr1-dev
...
* commit '62ff679154f6249371c0add904febb369367c667':
Use new power manager API.
2012-08-15 10:33:05 -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
Jeff Brown
748ba16a04
Use new power manager API.
...
Change-Id: If0c58a9bee05ec0de434879e78cd95299e54e3fe
2012-08-14 14:38:12 -07:00
Jean-Baptiste Queru
1b4a1b0903
am f07797d8
: am b1f96237
: am 291389ed
: am 5dbc1f64
: Merge "Fix use of holo drawables in a few more places"
...
* commit 'f07797d858abc701cce541f2a66761123b21b554':
Fix use of holo drawables in a few more places
2012-08-14 08:45:09 -07:00
Jean-Baptiste Queru
b1f962377e
am 291389ed
: am 5dbc1f64
: Merge "Fix use of holo drawables in a few more places"
...
* commit '291389ed5ce3c97c7f5ec145f00a6bc68862f8f4':
Fix use of holo drawables in a few more places
2012-08-14 08:41:17 -07:00
Jean-Baptiste Queru
291389ed5c
am 5dbc1f64
: Merge "Fix use of holo drawables in a few more places"
...
* commit '5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
2012-08-14 08:39:24 -07:00
Przemyslaw Szczepaniak
178eba477d
am 72529f17
: am ccd80ec9
: Fix for setting TTS language to recently downloaded one
...
* commit '72529f179b6ba1c0f0430f31d97dd4fedbbfbb11':
Fix for setting TTS language to recently downloaded one
2012-08-14 08:33:56 -07:00
Przemyslaw Szczepaniak
ccd80ec95f
Fix for setting TTS language to recently downloaded one
...
If user added new voice pack, then set it as a default language,
went level back and went to TTS settings again, it ended in crash.
This is because first updateVoiceDetails uses old voice data details
that settings retreived long time ago.
locales preference is hidden until TTs engine returns list of locales.
Change-Id: I33a81ff259c69adb4c051ee693b6c41b93f302d0
2012-08-14 08:29:05 -07:00
Björn Lundén
c8272b0752
Fix use of holo drawables in a few more places
...
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
2012-08-14 01:25:21 +02:00
Jeff Sharkey
ceb001a728
am adfa7fb2
: am 1c7d15e8
: am 865a914f
: am 42eb3fb2
: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
...
* commit 'adfa7fb2a70f459de53a72b3c3ace9aee0a781c6':
Fix the issue the setting crashes after unmount SD card in landscape
2012-08-13 16:10:26 -07:00