PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,700 Commits 1 Branch 0 Tags
0aeb8f2ee1fcdaaf624e38a4abef47a1a5909b95
Commit Graph

7700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
The Android Open Source Project
f9b00a844d Reconcile with jb-mr1-release - do not merge 
Change-Id: I6e4530661a9c7119cc4082297def851f063112c7
 2012-08-16 19:11:13 -07:00
The Android Open Source Project
3270759700 am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'c8cd7d9335863d19a0a37569a4a539f13ebd1858':
 2012-08-16 19:01:50 -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
5694cd0058 am 61ddf10d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '61ddf10d63faa686fa0155c002f97732013390df':
  Import translations. DO NOT MERGE
 2012-08-16 15:03:08 -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
2de17ff49a am bb06a427: Rename UserId to UserHandle. 
* commit 'bb06a427eb471227cf42a8078a54ca0581309493':
  Rename UserId to UserHandle.
 2012-08-16 12:51:41 -07:00
Dianne Hackborn
bb06a427eb Rename UserId to UserHandle. 
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
 2012-08-16 12:47:09 -07:00
The Android Automerger
8bb5a08a6d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:34:38 -07:00
Baligh Uddin
acd44fb66b am 704ca026: Import translations. DO NOT MERGE 
* commit '704ca026e0919c9361859d755b1f3f4eb1315c64':
  Import translations. DO NOT MERGE
 2012-08-16 06:16:04 -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
Jeff Brown
62ff679154 am 0a5f02a7: Merge "Use new power manager API." into jb-mr1-dev 
* commit '0a5f02a736e5183ca996b4a286ecb0e6467d263d':
  Use new power manager API.
 2012-08-15 10:30:25 -07:00
Jeff Brown
0a5f02a736 Merge "Use new power manager API." into jb-mr1-dev 2012-08-15 10:27:02 -07:00
The Android Open Source Project
7e266298b9 Reconcile with jb-mr1-release - do not merge 
Change-Id: I8c04d0993640dd9ad32dc8a383266b28ab0c5494
 2012-08-15 08:28:39 -07:00
Baligh Uddin
011919f2d2 am 9056ce4e: am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9056ce4ed2a3dc44f13e5c046d2222aa69bdfd60':
  Import translations. DO NOT MERGE
 2012-08-15 08:01:07 -07:00
Baligh Uddin
9056ce4ed2 am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '8ddcdbd494298eb5198643600fb1f8693b618995':
  Import translations. DO NOT MERGE
 2012-08-15 07:59:00 -07:00
Baligh Uddin
8ddcdbd494 am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1166503886e834f74953bfdb6f0ee54d6c834249':
  Import translations. DO NOT MERGE
 2012-08-15 07:56:52 -07:00
Baligh Uddin
1166503886 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-08-15 07:54:44 -07:00
Baligh Uddin
be74992e1e am abb27e66: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'abb27e66f4e696e87177f0cbecf9d3381947d3fb':
  Import translations. DO NOT MERGE
 2012-08-15 07:50:25 -07:00
Baligh Uddin
abb27e66f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-15 07:48:35 -07:00
The Android Automerger
5532aa6efd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:34:56 -07:00