Wink Saville
1ec34bfedd
am bde64e3d: am 426fc66a: Add persist.radio.ramdump.
...
* commit 'bde64e3d93b0144cd8b7c0ff65103ffb63fddba7':
Add persist.radio.ramdump.
2011-09-25 15:27:11 -07:00
Wink Saville
bde64e3d93
am 426fc66a: Add persist.radio.ramdump.
...
* commit '426fc66a8a9371e34d936d18d5b254fd002b4c11':
Add persist.radio.ramdump.
2011-09-25 15:25:39 -07:00
Wink Saville
426fc66a8a
Add persist.radio.ramdump.
...
A little refactoring to keep most everything for these "temporary"
flags in one place.
Bug: 5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
2011-09-25 14:39:02 -07:00
Svetoslav Ganov
98e473e8c3
am 22348cee: Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off."
...
* commit '22348cee27890e7e9a70ab6afe247cd966198761':
Settings may show enabled accessiiblity services after restore even if accessibility is off.
2011-09-23 16:59:38 -07:00
Svetoslav Ganov
cb0a7a82a6
Settings may show enabled accessiiblity services after restore even if accessibility is off.
...
Now the state of accessibility is determined from the number of running, i.e. enabled and
installed, accessibility services - more than zero access is on else it is off. After a
restore the device may have some enabled and installed services but disabled accessibility
setting. In such case settings should respect the restored values and the services should
be displayed as disabled initially and then enabling one of them will enable accessibility.
bug:5367404
Change-Id: If3756aba3f59e282000247e99f87ebff2b64c9fd
2011-09-23 16:47:41 -07:00
Wink Saville
310b39fffa
am 9fe945b8: am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
...
* commit '9fe945b854f92314ad387705ad20a129e46c317a':
Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:42:46 -07:00
Wink Saville
9fe945b854
am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
...
* commit 'fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:39:35 -07:00
Amith Yamasani
2e56b15ae7
am 16a9b14f: Merge "Don\'t append list of accounts every time we return to this screen."
...
* commit '16a9b14fa748c742c62f621586244303da4f4d8e':
Don't append list of accounts every time we return to this screen.
2011-09-22 17:05:41 -07:00
Wink Saville
fbea38fd2b
Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
2011-09-22 15:29:19 -07:00
Wink Saville
382a75b105
Add a button to enable/disable Mobile Terminated SMS over IMS
...
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.
Change-Id: I4581bca76899445e825260e8af6a39903d029c44
2011-09-22 15:17:00 -07:00
Amith Yamasani
3f45de559f
Don't append list of accounts every time we return to this screen.
...
Bug: 5355920
Remove the contents of the layout before adding the accounts.
Change-Id: Ic9256140f892968b2388f47d982eaada720df892
2011-09-22 14:34:17 -07:00
Jeff Hamilton
041a34075c
am 4cfe1055: am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
...
* commit '4cfe105506035f151242080e0ac7bd205542a2d9':
Bring back the Android Beam settings panel.
2011-09-22 10:49:53 -07:00
Jeff Hamilton
4cfe105506
am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
...
* commit '0d299625ebadae3d8b0881979633680e16b07daa':
Bring back the Android Beam settings panel.
2011-09-22 10:48:20 -07:00
Jeff Hamilton
0d299625eb
Merge "Bring back the Android Beam settings panel." into ics-factoryrom
2011-09-22 10:47:03 -07:00
Jeff Hamilton
3d670de5ce
Bring back the Android Beam settings panel.
...
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
2011-09-22 12:35:55 -05:00
Ben Komalo
80aa812f86
am dd3302ef: am 9ee164f4: Properly initialize wakelock for cryptkeeper.
...
* commit 'dd3302efbed7ea3c596e6ef99a9c8b578e76f14c':
Properly initialize wakelock for cryptkeeper.
2011-09-22 10:04:16 -07:00
Ben Komalo
dd3302efbe
am 9ee164f4: Properly initialize wakelock for cryptkeeper.
...
* commit '9ee164f44ea1ad66fa16ed702eb885e36ade0d8b':
Properly initialize wakelock for cryptkeeper.
2011-09-22 10:02:22 -07:00
Ben Komalo
9ee164f44e
Properly initialize wakelock for cryptkeeper.
...
Bug: 3385856
Change-Id: I6dc39b02b81e290af0b47f6a6c9ba2da3e7c65c3
2011-09-21 10:40:50 -07:00
Svetoslav Ganov
76bf49e28e
am fdff3e70: am 89cd48cd: Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom
...
* commit 'fdff3e705a7624baf8c344361d2f61eeacb96521':
Accessibility settings get into state not allowing to enable accessibility.
2011-09-20 18:06:29 -07:00
Svetoslav Ganov
fdff3e705a
am 89cd48cd: Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom
...
* commit '89cd48cd8e01081f470ea299dbf841a0099226ae':
Accessibility settings get into state not allowing to enable accessibility.
2011-09-20 18:04:06 -07:00
Svetoslav Ganov
89cd48cd8e
Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom
2011-09-20 18:02:20 -07:00
Amith Yamasani
8a73ef8434
am 7e911169: am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
...
* commit '7e9111695d42b6d794a5a9beb422b6727c6f6559':
Move "Pulse notification light" to Display settings.
2011-09-20 17:01:51 -07:00
Amith Yamasani
7e9111695d
am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
...
* commit 'bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
Move "Pulse notification light" to Display settings.
2011-09-20 16:58:52 -07:00
Amith Yamasani
883d850ede
Move "Pulse notification light" to Display settings.
...
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
2011-09-20 14:41:03 -07:00
Svetoslav Ganov
232d031a13
Accessibility settings get into state not allowing to enable accessibility.
...
If the setting for enabled accessibility serivces contains a service that
is not installed on the device the system gets into a state that does not
allow enabling accessibility. This state is not recoverable.
bug:5343351
Change-Id: I6127ae00f7a16b190cfe43b68b8e71d49b10911e
2011-09-20 12:16:13 -07:00
Wink Saville
82650a18a6
am 37dceac5: am 1e596f30: Add Button to *#*#INFO#*#* for ims registration.
...
* commit '37dceac57199c4ce135b8eb060ad22d9d697a2c5':
Add Button to *#*#INFO#*#* for ims registration.
2011-09-19 15:06:31 -07:00
Wink Saville
37dceac571
am 1e596f30: Add Button to *#*#INFO#*#* for ims registration.
...
* commit '1e596f303520d211aebc87dfc0c08108efe80921':
Add Button to *#*#INFO#*#* for ims registration.
2011-09-19 15:02:02 -07:00
Wink Saville
1e596f3035
Add Button to *#*#INFO#*#* for ims registration.
...
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired
Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
2011-09-19 14:24:39 -07:00
Jeff Sharkey
c8657d38fc
am 3361663e: am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom
...
* commit '3361663e37154b19316179e05955f05887d9ddc4':
Surface tethering stats in data usage.
2011-09-18 16:19:39 -07:00
Jeff Sharkey
3361663e37
am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom
...
* commit '2ae885210ef04d2533a2fc121a7f2b8770efa7e4':
Surface tethering stats in data usage.
2011-09-18 16:17:37 -07:00
Mike Lockwood
239c225994
am ed9d4618: Fix race condition in MTP/PTP checkbox updating
...
* commit 'ed9d461818780a6c38a081030a55983ea0883fa6':
Fix race condition in MTP/PTP checkbox updating
2011-09-18 15:30:52 -07:00
Mike Lockwood
ed9d461818
Fix race condition in MTP/PTP checkbox updating
...
UsbManager.getDefaultFunction() might not return the updated state immediately
after changing the USB configuration, so do not rely on it for updating
after a checkbox has been clicked.
Change-Id: I5ae8d46854f24403cda2c62e006c742dcd257d1d
Bug: 5334777
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-09-18 17:52:54 -04:00
Jeff Sharkey
a83a24f48a
Surface tethering stats in data usage.
...
Bug: 5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
2011-09-16 18:28:39 -07:00
Danielle Millett
375909a823
am c57b135d: Merge "Adding info explaining facelock\'s backup lock"
...
* commit 'c57b135d560c2b23631083dde86b74463c036085':
Adding info explaining facelock's backup lock
2011-09-16 17:51:40 -07:00
Danielle Millett
c57b135d56
Merge "Adding info explaining facelock's backup lock"
2011-09-16 17:48:35 -07:00
Irfan Sheriff
20ddc7e0f9
am 735f312b: Merge "Update p2p settings UI"
...
* commit '735f312beb39fd45b8cce0544042487968a30e18':
Update p2p settings UI
2011-09-16 16:08:39 -07:00
Irfan Sheriff
735f312beb
Merge "Update p2p settings UI"
2011-09-16 16:06:53 -07:00
Dianne Hackborn
62f1b9f99a
am 6967c04f: Merge "Fix issue #5320747 : Disabling an app that is an active device administrator..."
...
* commit '6967c04fd77023368514329c1213fba60f5a9b5a':
Fix issue #5320747 : Disabling an app that is an active device administrator...
2011-09-16 13:54:11 -07:00
Dianne Hackborn
5c2b48d4d5
Fix issue #5320747 : Disabling an app that is an active device administrator...
...
...can lead to an unsecure device
Now you can't disable device admins.
Or clear their data.
Or force stop them.
Or uninstall them (though the package manager also prevents uninstalling, might
as well disable this button along with everything else).
Change-Id: I69eefc2342e6f932908e9f5b87d3a601752810a4
2011-09-16 13:36:20 -07:00
Danielle Millett
5bae8739ea
Adding info explaining facelock's backup lock
...
This changes the security picker when selecting a backup lock for facelock
such that it says back up lock and gives a brief description of why it's needed.
This is currently a temporary way to display the info and will need to be changed
for the final release.
Change-Id: I6373f97caec088482d36c65bd210c79238c623cf
2011-09-16 16:01:14 -04:00
Irfan Sheriff
2592083c1f
Update p2p settings UI
...
- Add self device information on settings
- Add remove group option
Bug: 5332330
Change-Id: I5de4fa1e92a5182e10269fe5c2b78f1f6313fb63
2011-09-16 10:46:58 -07:00
Irfan Sheriff
8213f3736a
am ae226fff: Merge "Fix settings handling of wifi events"
...
* commit 'ae226fffadc5029e8de73248cb58ea8baf3a228e':
Fix settings handling of wifi events
2011-09-15 19:51:29 -07:00
Irfan Sheriff
ae226fffad
Merge "Fix settings handling of wifi events"
2011-09-15 19:49:17 -07:00
Irfan Sheriff
b1c0e0b1c9
Fix settings handling of wifi events
...
When wifi events come out, settings has to change the switch state.
Changing switch state causes settings to also enable/disable wifi which
gets into a loop when there is a driver hung event.
Fix to only send framework calls when a user has changed the switch
settings
Bug: 5271322
Change-Id: I0a7d03a3fe0f28622de05981e5f72a9a8814b2d2
2011-09-15 19:11:29 -07:00
Svetoslav Ganov
892c6f8fee
am f506cb95: Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom
...
* commit 'f506cb958d924527607eb766979ab5af752b41ca':
Enabled accessibility services settings may end with a separator.
2011-09-15 18:54:59 -07:00
Svetoslav Ganov
f506cb958d
Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom
2011-09-15 18:48:55 -07:00
Robert Greenwalt
4baf0ba106
am bf118ffb: Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom
...
* commit 'bf118ffba7986dd3df41b68418edaf55f9432464':
Modify ApnEditor app for new APN schema.
2011-09-15 16:23:51 -07:00
Martijn Coenen
d52b7a74a5
am 943af0bc: Remove NFC sharing from Settings.
...
* commit '943af0bc69048d827c3dd1b92daeaa2cf1b77145':
Remove NFC sharing from Settings.
2011-09-15 16:23:49 -07:00
Svetoslav Ganov
efe27bfcdb
Enabled accessibility services settings may end with a separator.
...
SetupWizard was adding a separator after the last service name while
building the enabled accessibility services string. This case was not
handled by the settings. Added code to handle that case since it is
possible to have not well-formed settings backed up.
bug:5098493
Change-Id: I8381872037611a7456ca31526c85effdb9949885
2011-09-15 15:26:58 -07:00
Robert Greenwalt
bf118ffba7
Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom
2011-09-15 15:00:29 -07:00