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
The Android Automerger
e76f8e5f1e
merge in ics-release history after reset to master
2011-09-26 07:00:19 -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
The Android Automerger
b0bb0096ad
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-25 18:16:31 -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
The Android Automerger
db55d532b4
merge in ics-release history after reset to master
2011-09-25 07:00:58 -07:00
The Android Automerger
9d55f9f625
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-25 06:30:06 -07:00
Svetoslav Ganov
22348cee27
Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off."
2011-09-23 16:57:32 -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
Eric Fischer
008592e265
am 86b49eea
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '86b49eea5e7735f72ed72069439cc74dbcc9a878':
Import revised translations. DO NOT MERGE
2011-09-23 15:44:39 -07:00
Eric Fischer
86b49eea5e
Import revised translations. DO NOT MERGE
...
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
2011-09-23 15:28:41 -07:00
The Android Automerger
59dabf449e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-23 11:36:19 -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
16a9b14fa7
Merge "Don't append list of accounts every time we return to this screen."
2011-09-22 17:04:12 -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
The Android Open Source Project
2407efcf42
Reconcile with ics-factoryrom-release
...
Change-Id: I5c6e500d5a097aa638399321001fec81493cc0c4
2011-09-22 10:57:43 -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
a1b6fdf473
am 4a2aabc4
: Merge "Add strings for translation." into ics-factoryrom
...
* commit '4a2aabc4d739ded949daa721adfce55fed2be2b6':
Add strings for translation.
2011-09-22 10:41:34 -07:00
Jeff Hamilton
4a2aabc4d7
Merge "Add strings for translation." into ics-factoryrom
2011-09-22 10:40:23 -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
Jeff Hamilton
7c430090c9
Add strings for translation.
2011-09-22 12:35:54 -05: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
The Android Automerger
e3789acf5a
merge in ics-release history after reset to master
2011-09-21 07:00:57 -07:00
The Android Automerger
bdf9546b53
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-21 06:30:24 -07:00
The Android Open Source Project
d6dd555c77
Reconcile with ics-factoryrom-release
...
Change-Id: If2f6db678efa1560ab1fa3349be18a03d69624f5
2011-09-21 06:19:34 -07:00
The Android Automerger
12308cc8d1
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 20:43:07 -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
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
bce7b69a27
Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
2011-09-20 16:57:32 -07:00
Eric Fischer
7d858a4544
am f85b8b1a
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit 'f85b8b1a17d9c91d5fff5a55c1546544e682c4b1':
Import revised translations. DO NOT MERGE
2011-09-20 15:38:38 -07:00
Eric Fischer
f85b8b1a17
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-20 15:37:04 -07:00
Freeman Ng
d6b8856bc1
am 01b20096
: Merge "adjust char limit for translations" into ics-factoryrom
...
* commit '01b2009608a1ce58711efac4541f4acad62e038c':
adjust char limit for translations
2011-09-20 15:36:33 -07:00
Freeman Ng
01b2009608
Merge "adjust char limit for translations" into ics-factoryrom
2011-09-20 15:34:30 -07:00
Eric Fischer
513fd05c38
Import revised translations. DO NOT MERGE
...
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
2011-09-20 15:24:00 -07:00
Freeman Ng
f471c4ece8
adjust char limit for translations
...
bug: 5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
2011-09-20 15:18:05 -07:00
Amith Yamasani
5faffefa63
Merge "Allow shortcuts to Tethering and Data usage screens."
2011-09-20 15:13:35 -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
Eric Fischer
367bb497be
Merge "Import revised translations."
2011-09-20 11:02:16 -07:00
Eric Fischer
24c4fb1567
Import revised translations.
...
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
2011-09-20 10:37:57 -07:00
Luca Zanolin
c8caf47c7a
Merge "Change title in the setting for "Speech" category"
2011-09-20 10:03:42 -07:00
Luca Zanolin
8cb280ddff
Change title in the setting for "Speech" category
...
Bug: 5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
2011-09-20 17:58:45 +01:00
The Android Open Source Project
dea226fec7
Reconcile with ics-factoryrom-release
...
Change-Id: Id11b3b3373d00ebc6afce94f21ca1b6edfcfca42
2011-09-20 07:43:27 -07:00