Commit Graph

5020 Commits

Author SHA1 Message Date
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
Eric Fischer
3a1958cd54 am 4adcb1d2: (-s ours) am 0e5fd21b: (-s ours) Import revised translations. DO NOT MERGE
* commit '4adcb1d2e87fc47796a42539fedc10a1e2b7dbbf':
  Import revised translations. DO NOT MERGE
2011-09-26 19:47:33 -07:00
Eric Fischer
4adcb1d2e8 am 0e5fd21b: (-s ours) Import revised translations. DO NOT MERGE
* commit '0e5fd21beb33a39b4254d4c8dd6b60c0939dbee0':
  Import revised translations. DO NOT MERGE
2011-09-26 19:44:31 -07: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
Eric Fischer
0e5fd21beb Import revised translations. DO NOT MERGE
Change-Id: I287527c2b071e0babd191b47fc1b80c160232d74
2011-09-26 14:51:07 -07: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
The Android Open Source Project
ab171b2ea2 am 4bce4dc1: Reconcile with ics-factoryrom-release
* commit '4bce4dc1c3266cf2738a9e7bf106f2211fe146e3':
2011-09-26 12:15:38 -07:00
The Android Open Source Project
4bce4dc1c3 Reconcile with ics-factoryrom-release
Change-Id: Ic66f78817e5ae10c997cf34a35e0d8b3abade1ba
2011-09-26 12:11:47 -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
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
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
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
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
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
1e57f9e781 am 008592e2: (-s ours) am 86b49eea: (-s ours) Import revised translations. DO NOT MERGE
* commit '008592e265abff0df836354b25b7ff49a9659b67':
  Import revised translations.  DO NOT MERGE
2011-09-23 15:46:53 -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
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
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
11f7d40e68 am 2407efcf: Reconcile with ics-factoryrom-release
* commit '2407efcf42baf1646094d80035997ff169d3eff4':
2011-09-22 11:00:53 -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
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
8ccddfd8d4 am a1b6fdf4: am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom
* commit 'a1b6fdf4738e0d0aec4eb389316a7c354fe37c00':
  Add strings for translation.
2011-09-22 10:43: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
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
The Android Automerger
bdf9546b53 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-21 06:30:24 -07:00