Commit Graph

999 Commits

Author SHA1 Message Date
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
Eric Fischer
e5bfb640fb Fix capitalization of Face Unlock.
Bug 5447766

Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
2011-10-17 11:28:34 -07: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
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
Jeff Sharkey
e4599058dd Toast when finished pattern or password setup.
Bug: 5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
2011-10-13 11:33:43 -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
Romain Guy
3d32d00edd Fix string for hdpi devices
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
2011-10-06 14:37:34 -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
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
satok
a50721e543 am a43dd396: Show a security warning dialog when switching a spell checker
* commit 'a43dd3962eaf9df8cbd7c8fcf8dab96fcb428b91':
  Show a security warning dialog when switching a spell checker
2011-10-05 06:37:42 -07:00
satok
a43dd3962e Show a security warning dialog when switching a spell checker
Bug: 5402295

Change-Id: I021e6e923fa137248d23c8fa39e68afdf73fead9
2011-10-05 19:11:28 +09:00
Eric Fischer
f21ca26174 am dfb894c1: Fix mismatched markup in Settings strings.
* commit 'dfb894c1361545a574dc45bcd956c7830238553c':
  Fix mismatched markup in Settings strings.
2011-10-04 15:14:45 -07:00
Eric Fischer
dfb894c136 Fix mismatched markup in Settings strings.
Revert "Revert "Settings strings cleanup per standards.""

Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design.
Will file separate bug to have the titles removed properly;
for now I just made the string empty.

This reverts commit e2db5875f6.

Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14
2011-10-04 15:07:16 -07:00
Claudia de Veaux
649b34b0cf am bbb7097a: Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug t
* commit 'bbb7097a6871ae463fb865c7fe47c5500f5a6c6a':
  Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
2011-10-04 12:54:01 -07:00
Claudia de Veaux
bbb7097a68 Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"" 2011-10-04 12:52:16 -07:00
Claudia de Veaux
e2db5875f6 Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
This reverts commit c9c29d90f7
2011-10-04 12:51:23 -07:00
Claudia de Veaux
496be57ef6 am 2e0143b4: Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have t
* commit '2e0143b415b07f126100c6ceb89698e1e7e5e06d':
  Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty.
2011-10-04 11:31:56 -07:00
Claudia de Veaux
2e0143b415 Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty." 2011-10-04 11:30:03 -07:00
Claudia de Veaux
c9c29d90f7 Settings strings cleanup per standards.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design. Will
file separate bug to have the titles removed properly; for now I
just made the string empty.

Change-Id: I56b251a0d639f8d25f0908c636226e0d6e7da6a5

More changes to add <xliff:g/> around raw HTML per Eric Fischer.

Fixed redundant <string> tag caught in review.
2011-10-03 18:07:06 -07:00
Jeff Hamilton
887d9d64f8 am 326f96c5: Update settings strings.
* commit '326f96c5dca3ad59f9a96326e882eaa55cc7d560':
  Update settings strings.
2011-10-03 08:40:34 -07:00
Jeff Hamilton
326f96c5dc Update settings strings.
Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
2011-10-03 10:38:14 -05:00
Bjorn Bringert
3e66bcfc4d am 4da63255: Merge "Fix ISO3 code for spanish in demo strings array."
* commit '4da63255ed394b8cd2eb88c02a6c0b9235797866':
  Fix ISO3 code for spanish in demo strings array.
2011-10-03 08:29:27 -07:00
Narayan Kamath
59ab1ec3e7 Fix ISO3 code for spanish in demo strings array.
bug:5399728
Change-Id: Ib001425c0ea0298720d9c65f5ece22ecd70ce471
2011-10-03 14:46:44 +01:00
Romain Guy
2623d685f3 am c00a9d9f: Merge "Add developer setting to force hardware acceleration"
* commit 'c00a9d9f5e0719601f670207f57d50225365f2cb':
  Add developer setting to force hardware acceleration
2011-09-29 16:43:01 -07:00
Romain Guy
0c9c14b786 Add developer setting to force hardware acceleration
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
2011-09-29 16:39:31 -07:00
Daisuke Miyakawa
4528867997 am 8fc853b1: Merge "Set longer char limit for sync setting strings"
* commit '8fc853b19a369f56f20c4dfa109e618af7796eff':
  Set longer char limit for sync setting strings
2011-09-29 12:23:13 -07:00
Daisuke Miyakawa
558b23a2d3 Set longer char limit for sync setting strings
Translated strings cannot be accomodated while we can have
longer ones there.

Bug: 5376058
Change-Id: I83ec28964c3aa19cb16fa8fc648ef392e67d4f49
2011-09-28 18:52:19 -07:00
Mike Sipe
8dc669d037 am ce73fc83: Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings"
* commit 'ce73fc83e7a208a1149aec3085b6e9b55efc8e52':
  Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings
2011-09-27 19:32:33 -07:00
Jeff Sharkey
1094795864 am 1ef9c541: am 76ac6a9b: Merge "About." into ics-factoryrom
* commit '1ef9c5416df9c72a543dbed454b4c282ec6f1fed':
  About.
2011-09-27 19:32:17 -07:00
Mike Sipe
ce73fc83e7 Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 2011-09-27 17:01:12 -07:00
Jim Miller
a277b56425 Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
2011-09-27 16:39:20 -07:00
Jeff Sharkey
1ef9c5416d am 76ac6a9b: Merge "About." into ics-factoryrom
* commit '76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
  About.
2011-09-27 16:27:56 -07:00
Jeff Sharkey
246120e5ff About.
Bug: 5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
2011-09-27 15:13:10 -07:00
Svetoslav Ganov
834a90f47a am 522b074b: Merge "Clarify install accessibility scripts wording."
* commit '522b074bdae89737ee4ac8580a8c939f257f3f3a':
  Clarify install accessibility scripts wording.
2011-09-27 11:23:36 -07:00
Svetoslav Ganov
522b074bda Merge "Clarify install accessibility scripts wording." 2011-09-27 11:22:06 -07:00