Commit Graph

4739 Commits

Author SHA1 Message Date
Eric Fischer
2c701570eb Import revised translations.
Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87
2011-04-15 14:41:32 -07:00
Bjorn Bringert
c776297594 Use new TTS engine API in TTS settings
Requires TTS engine API added in
change I7614ff788e11f897e87052f684f1b4938d539fb7

Bug: 4148725
Change-Id: I5f3fa3bbcbf4e62af23bb701bcb6e8e5d8511341
2011-04-15 10:04:32 +01:00
Eric Fischer
65a9006a8a am 0d3a7592: (-s ours) am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '0d3a75923ea78119d58d5c2cbc1fb1ecdf73c5fb':
  Import revised translations.  DO NOT MERGE
2011-04-14 15:04:38 -07:00
Eric Fischer
0d3a75923e am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '20a44118ddce65bcb1a86a38ab17d82083528930':
  Import revised translations.  DO NOT MERGE
2011-04-14 14:27:34 -07:00
Eric Fischer
20a44118dd am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '76aa8fe0663004a7b481a830cca87492bd9c7987':
  Import revised translations.  DO NOT MERGE
2011-04-14 14:24:48 -07:00
Eric Fischer
76aa8fe066 am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '4ba98d5381d89f5afd83f9ce4a5f1e666e7579e7':
  Import revised translations.  DO NOT MERGE
2011-04-14 14:20:01 -07:00
Eric Fischer
4ba98d5381 Import revised translations. DO NOT MERGE
Change-Id: I64e7baff852f629d0281352be24fc54eadb48367
2011-04-14 14:04:03 -07:00
Dianne Hackborn
b28c0c95c2 A few tweaks to the battery history chart.
Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41
2011-04-13 18:22:37 -07:00
Glenn Kasten
dd02c5ba9d am 386185a3: am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
* commit '386185a3754535cd75c35091135b2933e39872bd':
  Bug 4167061 remove debug code
2011-04-13 11:56:38 -07:00
Glenn Kasten
386185a375 am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
* commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7':
  Bug 4167061 remove debug code
2011-04-13 11:51:59 -07:00
Glenn Kasten
315b452c32 am 4f4ddaa8: Bug 4167061 remove debug code
* commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
  Bug 4167061 remove debug code
2011-04-13 11:47:46 -07:00
Glenn Kasten
4f4ddaa823 Bug 4167061 remove debug code
Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0
2011-04-13 11:19:58 -07:00
Simon Wilson
8e5d3c4308 am a5babbb0: (-s ours) am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit 'a5babbb092f7b65ccd78f0b7590a34b22412f2bd':
  DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 17:39:03 -07:00
Simon Wilson
a5babbb092 am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit 'f927cccd795c75247bf6bfba881059d5e9c43fb5':
  DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 17:33:20 -07:00
Eric Fischer
b4730b8a9e am 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '2439b7c00d86fb490b48e2bc0927fd581bf59e0e':
  Reimport Settings translations.  DO NOT MERGE
2011-04-11 14:28:21 -07:00
Simon Wilson
184f8f085e am 719e1e43: (-s ours) am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '719e1e43173155cbe0d77298c3d1ca05f143048b':
  DO NOT MERGE Put additional update package names in config.xml
2011-04-11 14:28:20 -07:00
Eric Fischer
8b73905e6a am 1985e381: (-s ours) am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit '1985e381cbcb817adc26f4f612f96583b692e397':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-11 14:28:18 -07:00
Eric Fischer
2439b7c00d am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
  Reimport Settings translations.  DO NOT MERGE
2011-04-11 14:24:30 -07:00
Simon Wilson
719e1e4317 am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
  DO NOT MERGE Put additional update package names in config.xml
2011-04-11 14:24:28 -07:00
Eric Fischer
1985e381cb am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit '6735ae141fee012409a2eaa0310538f3b0173263':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-11 14:24:25 -07:00
Simon Wilson
f927cccd79 am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 14:12:43 -07:00
Glenn Kasten
6a523c0816 am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:49:00 -07:00
Glenn Kasten
fc52971f7e am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:46:36 -07:00
Glenn Kasten
b72f1b0f45 am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit '858fd9a0302c6d34781133137a048a9bf668632a':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:43:22 -07:00
Simon Wilson
37063d6adf DO NOT MERGE Clarify additional system update string length/usage
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
2011-04-11 12:38:54 -07:00
Glenn Kasten
858fd9a030 HDCP debugging in setting app part 2 of 2
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
2011-04-11 11:11:56 -07:00
Brian Carlstrom
5298d488b7 Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:37 -07:00
Joe Onorato
cedfdd9d17 Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c
2011-04-07 18:41:13 -07:00
Eric Fischer
89882974d6 Merge "Import revised translations." 2011-04-07 14:08:01 -07:00
Eric Fischer
c821f6d8f8 Import revised translations.
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
2011-04-07 13:59:28 -07:00
Brian Carlstrom
d26321eecb Tolerate missing AccountManager resource, not just missing resource name
Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae
2011-04-07 11:58:39 -07:00
Joe Onorato
74562a13a3 Merge "advanced settings" 2011-04-06 18:45:33 -07:00
Joe Onorato
4c0c2bea9e advanced settings
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
2011-04-06 18:26:20 -07:00
Eric Fischer
cdef44c985 am 94cdd67d: (-s ours) am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE
* commit '94cdd67dcf67b5c25bc063d887bdb1e5864cd35d':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:21:43 -07:00
Eric Fischer
94cdd67dcf am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE
* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:19:10 -07:00
Eric Fischer
84edd9d528 am 8214c76e: Import revised translations. DO NOT MERGE
* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:16:10 -07:00
Eric Fischer
8214c76e27 Import revised translations. DO NOT MERGE
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
2011-04-06 13:51:27 -07:00
Eric Fischer
0aa34b70d0 Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-06 13:47:49 -07:00
Simon Wilson
bcb8ec76e8 DO NOT MERGE Put additional update package names in config.xml
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
2011-04-06 13:47:27 -07:00
Eric Fischer
5efe251f40 Revert "Import revised translations. DO NOT MERGE"
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-06 13:46:58 -07:00
Eric Fischer
7c79299672 am b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE
* commit 'b7185a549ca04c098ce050fa1da172a06ecdf230':
  Import revised translations.  DO NOT MERGE
2011-04-05 10:26:27 -07:00
Eric Fischer
b7185a549c am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE
* commit 'dfb78827767e14c8db205d8a7200f3f4025a0831':
  Import revised translations.  DO NOT MERGE
2011-04-04 17:42:55 -07:00
Eric Fischer
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
2011-04-04 12:21:25 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE"
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-01 16:13:11 -07:00