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

7591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeevaka Badrappan
cf6d99aac1 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-25 21:50:26 -07:00
Amith Yamasani
5e61ba5576 am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band" 
* commit '41446512cfa6e009187b7cc67fa34a29f82ddccc':
  Settings: Fix crash seen when setting the radio band
 2012-08-25 12:58:18 -07:00
Amith Yamasani
41446512cf am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band" 
* commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2':
  Settings: Fix crash seen when setting the radio band
 2012-08-25 12:56:23 -07:00
Amith Yamasani
52d996edeb Merge "Settings: Fix crash seen when setting the radio band" 2012-08-25 11:55:42 -07:00
Amith Yamasani
92e2b4f4af Avoid re-creating a user when activity is resumed 
onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.

Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
 2012-08-25 07:47:43 -07:00
Baligh Uddin
cf03309273 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-24 15:03:15 -07:00
Baligh Uddin
7b139fa097 Import translations. DO NOT MERGE 
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
 2012-08-24 13:29:14 -07:00
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
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