Commit Graph

6319 Commits

Author SHA1 Message Date
Justin Ho
ba24671c2c am 6ab0c12c: Updated bandwidth assets
* commit '6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
  Updated bandwidth assets
2011-10-18 09:33:09 -07:00
The Android Automerger
931d94e84b merge in ics-release history after reset to master 2011-10-18 07:00:51 -07:00
Justin Ho
6ab0c12ca4 Updated bandwidth assets
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
2011-10-17 18:09:43 -07:00
Danielle Millett
80412e70db Fix 5466557: Removed secondary screenlock settings labels
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
2011-10-17 20:57:17 -04:00
Peter Ng
0c0e41b17f data usage color standardization
Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20
2011-10-17 17:39:16 -07:00
Amith Yamasani
6822b749bb Show IP address of current active link instead of just the WiFi IP address.
Bug: 5359194

Show "Unavailable" only if there's no active link.

Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
2011-10-17 16:55:54 -07:00
Justin Ho
1035de60eb am 4a451ba8: am 7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '4a451ba8f1a098e516e9dc77f6cf8166990c88a2':
  Update wifi icons
2011-10-17 16:36:53 -07:00
Justin Ho
4a451ba8f1 am 7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
  Update wifi icons
2011-10-17 16:34:41 -07:00
Justin Ho
7a33de4c00 Merge "Update wifi icons" into ics-mr0 2011-10-17 16:33:07 -07:00
Justin Ho
e8fb5b8aa1 Update wifi icons
Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4
2011-10-17 16:04:31 -07:00
John Huang
fe342db0b0 am f9389c7e: am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit 'f9389c7ef011010658b854c4040456cf9ca3f03c':
  Add "Roaming protocol" to APN editor.
2011-10-17 15:24:02 -07:00
John Huang
f9389c7ef0 am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.
2011-10-17 15:22:28 -07:00
John Huang
7b21e97c2a Merge "Add "Roaming protocol" to APN editor." into ics-mr0 2011-10-17 15:20:28 -07:00
Claudia de Veaux
7056c28475 am 1aa9c677: Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232"
* commit '1aa9c677832464604fea45ecd100d8f604f150ec':
  Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232
2011-10-17 14:22:45 -07:00
Claudia de Veaux
1aa9c67783 Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232" 2011-10-17 14:20:29 -07:00
Eric Fischer
6342580fb7 am e5bfb640: Fix capitalization of Face Unlock.
* commit 'e5bfb640fbf543494e45c4db139477b262879d26':
  Fix capitalization of Face Unlock.
2011-10-17 13:23:12 -07:00
Claudia de Veaux
7dc36b90ce Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs: 5467607, 5163232

Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
2011-10-17 12:54:20 -07:00
satok
495bc81b5f am 7ea58d31: Update enabled subtypes in the input method subtype enabler in "onResume"
* commit '7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8':
  Update enabled subtypes in the input method subtype enabler in "onResume"
2011-10-17 11:38:57 -07:00
Dianne Hackborn
400f48ab8a am 140f6c6c: Fix issue #5460725: Crespo does not fully boot after a wipe
* commit '140f6c6cf705f020c0ee6a2843cf1691cc68e729':
  Fix issue #5460725: Crespo does not fully boot after a wipe
2011-10-17 11:38:56 -07:00
Jeff Sharkey
e4c7ae7403 am f9eca2e0: Data usage chart fixes.
* commit 'f9eca2e0e0dc31fde40cc731c50c3f522f578c69':
  Data usage chart fixes.
2011-10-17 11:38:55 -07:00
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