Amith Yamasani
8476fc08d5
am 0554ddb3: Merge "Show in Settings->About if the device is an engineering sample."
...
* commit '0554ddb39a5bdbbcf88bdf31094b37ead5d95032':
Show in Settings->About if the device is an engineering sample.
2011-09-27 19:32:41 -07:00
Amith Yamasani
2397a7391e
Show in Settings->About if the device is an engineering sample.
...
Don't show anything additional for a production device.
Bug: 5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
2011-09-27 18:06:33 -07:00
Amith Yamasani
125f4b8d67
am df5ab21d: am ae69755a: Disable USB connection type when monkeys are running.
...
* commit 'df5ab21d21fac3107fed231d4469e5bc26a089f6':
Disable USB connection type when monkeys are running.
2011-09-27 13:12:55 -07:00
Amith Yamasani
df5ab21d21
am ae69755a: Disable USB connection type when monkeys are running.
...
* commit 'ae69755aa874dbac77e9874d9716ab891a144193':
Disable USB connection type when monkeys are running.
2011-09-27 13:10:47 -07:00
Amith Yamasani
ae69755aa8
Disable USB connection type when monkeys are running.
...
Bug: 5375336
Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())
Bug: 5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
2011-09-27 11:33:17 -07:00
Danielle Millett
5e83b2faeb
am cc571cc4: Merge "Changed header to specify backup lock"
...
* commit 'cc571cc4fe626517482435a8ffd3bd461bf4bbbd':
Changed header to specify backup lock
2011-09-27 07:27:24 -07:00
Danielle Millett
cc571cc4fe
Merge "Changed header to specify backup lock"
2011-09-27 06:14:01 -07:00
satok
01c2387bae
am 44e32ab4: Merge "Tweak IME settings"
...
* commit '44e32ab40fa1421a564801d2bfba0407575d7e37':
Tweak IME settings
2011-09-27 00:12:16 -07:00
satok
44e32ab40f
Merge "Tweak IME settings"
2011-09-27 00:10:57 -07:00
satok
054fc44cae
Tweak IME settings
...
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
2011-09-27 16:08:46 +09:00
Jeff Sharkey
28a345ac84
am dc2c5ae2: Merge "Data usage strings, sweep touches, fixes."
...
* commit 'dc2c5ae2b0b123df1c2256672be9e2ec8bde248b':
Data usage strings, sweep touches, fixes.
2011-09-26 19:16:57 -07:00
Jeff Sharkey
dc2c5ae2b0
Merge "Data usage strings, sweep touches, fixes."
2011-09-26 15:31:57 -07:00
Danielle Millett
940407eb6a
Changed header to specify backup lock
...
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock
Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
2011-09-26 18:06:37 -04:00
Kenny Root
2ee896a519
am 3f1fb4f1: Merge "Make verifier device id information visible"
...
* commit '3f1fb4f1549c3ff32cd85e85bbe13765a02d6960':
Make verifier device id information visible
2011-09-26 14:39:26 -07:00
Kenny Root
3f1fb4f154
Merge "Make verifier device id information visible"
2011-09-26 14:38:10 -07:00
Amith Yamasani
a33f4dcd40
am f07e46fa: Merge "Fixes to parent fragment names and other manifest issues."
...
* commit 'f07e46fae87014fd21226428d22f5182b1f603cb':
Fixes to parent fragment names and other manifest issues.
2011-09-26 11:53:19 -07:00
Amith Yamasani
f07e46fae8
Merge "Fixes to parent fragment names and other manifest issues."
2011-09-26 11:51:39 -07:00
Kenny Root
498fbe470e
Make verifier device id information visible
...
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.
Bug: 5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
2011-09-26 09:55:03 -07:00
Jeff Sharkey
461842a8c0
Data usage strings, sweep touches, fixes.
...
Change strings around limiting background data. Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.
Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.
Bug: 5341374, 5337650, 5337385, 5319465, 5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
2011-09-25 18:41:13 -07:00
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
Amith Yamasani
990fb52ef7
Fixes to parent fragment names and other manifest issues.
...
Bug: 5324865
Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.
Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
2011-09-25 14:49:49 -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