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

7623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jeff Brown
0a5f02a736 Merge "Use new power manager API." into jb-mr1-dev 2012-08-15 10:27:02 -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
abb27e66f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-15 07:48:35 -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
Baligh Uddin
ba60a45ae7 Import translations. DO NOT MERGE 
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
 2012-08-14 21:51:07 -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
Baligh Uddin
e62c9069f6 am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '05e16515399192130b738446a6c38374cf65e85b':
  Import translations. DO NOT MERGE
 2012-08-14 13:11:58 -07:00