Eric Fischer
e5bfb640fb
Fix capitalization of Face Unlock.
...
Bug 5447766
Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
2011-10-17 11:28:34 -07:00
satok
7ea58d3164
Update enabled subtypes in the input method subtype enabler in "onResume"
...
Bug: 5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4
2011-10-18 00:21:04 +09:00
John Huang
d0de427f9a
Add "Roaming protocol" to APN editor.
...
Field already exists in the APN database. Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes). Will revisit enabling
for all in a future release.
Bug: 5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
2011-10-16 14:35:00 -07:00
Dianne Hackborn
140f6c6cf7
Fix issue #5460725 : Crespo does not fully boot after a wipe
...
Add a hack to relaunch whatever was supposed to be launched
(presumably home) when CryptKeeper discovers it shouldn't be
running.
Change-Id: I1406b8d6e8d484ed1c169fa4908a9e05e8c7c2ad
2011-10-16 11:55:33 -07:00
The Android Automerger
af053f9df0
merge in ics-release history after reset to master
2011-10-16 07:00:49 -07:00
Jeff Sharkey
f9eca2e0e0
Data usage chart fixes.
...
Always draw first data point at 0. Each point should include full
value of current bucket, instead of lagging behind by one.
Bug: 5404917, 5404861, 5178305
Change-Id: I5fa63bc84cc1f9c0403fb03effd5affd2f01ad4c
2011-10-14 15:12:53 -07:00
Jeff Sharkey
d881ffcf45
am 68da8364
: Merge "Toast when finished pattern or password setup." into ics-mr0
...
* commit '68da83649e8f8488275677d3b0e0995a230513b4':
Toast when finished pattern or password setup.
2011-10-13 14:08:38 -07:00
Daniel Sandler
1bb9da7b6c
am ee168a43
: Merge "Use new status bar disable flags." into ics-mr0
...
* commit 'ee168a4304de5c9fce575802a9418b136eabb17d':
Use new status bar disable flags.
2011-10-13 14:08:37 -07:00
Jeff Sharkey
68da83649e
Merge "Toast when finished pattern or password setup." into ics-mr0
2011-10-13 12:37:47 -07:00
Daniel Sandler
ee168a4304
Merge "Use new status bar disable flags." into ics-mr0
2011-10-13 12:34:51 -07:00
Jeff Sharkey
e4599058dd
Toast when finished pattern or password setup.
...
Bug: 5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
2011-10-13 11:33:43 -07:00
The Android Automerger
e7ee2aeaa7
merge in ics-release history after reset to master
2011-10-13 07:00:44 -07:00
Jim Miller
d11aed5925
am dccda985
: Fix 5444675: Don\'t show "Vibrate on touch" in password lock options
...
* commit 'dccda985675dc8b116f43fc18cea3b6e40c8aa6c':
Fix 5444675: Don't show "Vibrate on touch" in password lock options
2011-10-12 21:11:45 -07:00
Jim Miller
dccda98567
Fix 5444675: Don't show "Vibrate on touch" in password lock options
...
Don't show "Vibrate on touch" for password lock screen options because
vibrate is controlled by the IME setting in this case.
Change-Id: Idc8c73048a0c396037457638faed02331ed104f3
2011-10-12 17:46:17 -07:00
Daniel Sandler
4d2bfd1491
Use new status bar disable flags.
...
Requires frameworks/base change I04eb2245.
Bug: 5380495
Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344
2011-10-12 15:40:41 -04:00
The Android Automerger
8a7ac3d1b0
merge in ics-release history after reset to master
2011-10-11 05:34:26 -07:00
Jeff Sharkey
6be91d3811
am 1247d192
: Merge "Add disclaimer string."
...
* commit '1247d19204f6eb1e8d3c560c8ba8e1ef900a897c':
Add disclaimer string.
2011-10-10 17:22:48 -07:00
Jeff Sharkey
1247d19204
Merge "Add disclaimer string."
2011-10-10 17:20:53 -07:00
Jeff Sharkey
cad3b87067
Add disclaimer string.
...
Bug: 5337015
Change-Id: Iabeb8490ed51f77e98f3c5317e31d30e4e780178
2011-10-10 17:04:12 -07:00
Eric Fischer
c44ae7a14f
am b6acb953
: Merge "Import revised translations."
...
* commit 'b6acb95370f62d1cc1a3b78428b70b123b638032':
Import revised translations.
2011-10-10 11:51:37 -07:00
Eric Fischer
b6acb95370
Merge "Import revised translations."
2011-10-10 11:48:47 -07:00
Eric Fischer
8963a6493d
Import revised translations.
...
Change-Id: I064a55b4923fcc09ae2172e1b21cb81eee0db653
2011-10-10 11:25:09 -07:00
The Android Automerger
7b16a14f28
merge in ics-release history after reset to master
2011-10-10 07:00:49 -07:00
Jeff Sharkey
83e8d4d7bc
am 3d4c9a7a
: Bring back network counters in battery stats.
...
* commit '3d4c9a7a3297204ef5c60189f84c3ecf0d861495':
Bring back network counters in battery stats.
2011-10-09 17:10:14 -07:00
Jeff Sharkey
3d4c9a7a32
Bring back network counters in battery stats.
...
Bug: 4902271
Change-Id: I0900c030407a86efb14a9d528ab355c56f54679e
2011-10-09 13:21:10 -07:00
The Android Automerger
2cb47c3378
merge in ics-release history after reset to master
2011-10-09 07:01:19 -07:00
Amith Yamasani
d00830da92
am a41dc63a
: Merge "Remove pending message when fragment is paused."
...
* commit 'a41dc63ada8745286818eedabe75123166bf3f9f':
Remove pending message when fragment is paused.
2011-10-07 14:45:26 -07:00
Amith Yamasani
a41dc63ada
Merge "Remove pending message when fragment is paused."
2011-10-07 14:43:24 -07:00
Amith Yamasani
552bc61ae2
Remove pending message when fragment is paused.
...
Bug: 5422788
Converted the runnable to a message and removed any pending messages in onPause.
Change-Id: I048413ae2abd69a359b1fa2c648d98df3c3ae343
2011-10-07 14:02:44 -07:00
Peter Ng
7691a6c502
am f1cd9a00
: Merge "Data usage grid asset updates"
...
* commit 'f1cd9a00452267601797a51913a64770ed1a40c2':
Data usage grid asset updates
2011-10-07 13:28:24 -07:00
Peter Ng
f1cd9a0045
Merge "Data usage grid asset updates"
2011-10-07 12:32:13 -07:00
Peter Ng
fad1bf3ce7
Data usage grid asset updates
...
Change-Id: I232e784c8552f4f185814f4d5b8082894438c500
2011-10-06 18:35:13 -07:00
Romain Guy
b1f0cad4fe
am 3d32d00e
: Fix string for hdpi devices
...
* commit '3d32d00edd41aaedd426f2ab1a2309a8cd8a03b6':
Fix string for hdpi devices
2011-10-06 15:18:41 -07:00
Irfan Sheriff
d341bf8519
am 8dcb0252
: Merge "Add mobile hotspot provisioning support"
...
* commit '8dcb0252ea6badf3610c5741f044467bc5ee36d3':
Add mobile hotspot provisioning support
2011-10-06 15:18:04 -07:00
Romain Guy
3d32d00edd
Fix string for hdpi devices
...
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
2011-10-06 14:37:34 -07:00
Irfan Sheriff
8dcb0252ea
Merge "Add mobile hotspot provisioning support"
2011-10-06 12:43:01 -07:00
Irfan Sheriff
aa3d2c406e
Add mobile hotspot provisioning support
...
Bug: 5346812
Change-Id: I3e117fb62039c1d8370440ab4109705894011928
2011-10-06 11:45:45 -07:00
The Android Automerger
519ce2a38d
merge in ics-release history after reset to master
2011-10-06 07:01:28 -07:00
Jeff Sharkey
38914c9ad9
am 051cda2e
: Merge "Third time is the charm."
...
* commit '051cda2e46d7b41d6216fe44ce7e0af35e34e925':
Third time is the charm.
2011-10-05 22:58:36 -07:00
Jeff Sharkey
051cda2e46
Merge "Third time is the charm."
2011-10-05 22:57:19 -07:00
Jeff Sharkey
3a546ebacb
Third time is the charm.
...
Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba
2011-10-05 22:54:52 -07:00
Jeff Sharkey
49a2d9bfc9
am 3a5a82c7
: Merge "Fix string breakage."
...
* commit '3a5a82c756f8001fabe1ddd158825565354425a6':
Fix string breakage.
2011-10-05 22:16:17 -07:00
Jeff Sharkey
3a5a82c756
Merge "Fix string breakage."
2011-10-05 22:14:24 -07:00
Jeff Sharkey
82bf63496b
Fix string breakage.
...
Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22
2011-10-05 22:13:02 -07:00
Jeff Sharkey
da5bc13f8c
am 0c927302
: Merge "Adjust data usage strings."
...
* commit '0c927302d7b05c4c9bc6a5d28669ed57e7804388':
Adjust data usage strings.
2011-10-05 22:01:50 -07:00
Jeff Sharkey
0c927302d7
Merge "Adjust data usage strings."
2011-10-05 21:59:42 -07:00
Danielle Millett
5d962052ba
am c7a15ec8
: Merge "Update string to match wireframe"
...
* commit 'c7a15ec8e8fb30fe2b613b98c61d66e4ecc3960c':
Update string to match wireframe
2011-10-05 19:06:08 -07:00
Danielle Millett
c7a15ec8e8
Merge "Update string to match wireframe"
2011-10-05 19:04:05 -07:00
Danielle Millett
76d9af0a87
Update string to match wireframe
...
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
2011-10-05 21:49:03 -04:00
Jeff Sharkey
d86e9b207a
Adjust data usage strings.
...
Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
2011-10-05 17:44:12 -07:00