Commit Graph

13185 Commits

Author SHA1 Message Date
Geoff Mendal
27259b53e6 am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
  Import translations. DO NOT MERGE
2014-03-17 20:46:32 +00:00
Geoff Mendal
c8131cb90e am e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit 'e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
  Import translations. DO NOT MERGE
2014-03-17 20:34:20 +00:00
Geoff Mendal
1c71b8e308 Import translations. DO NOT MERGE
Change-Id: I31c08213e25b11114c2ec5d4689815f83ce26270
Auto-generated-cl: translation import
2014-03-17 12:48:05 -07:00
Geoff Mendal
e8de72e53a Import translations. DO NOT MERGE
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
2014-03-17 12:42:54 -07:00
Felipe Leme
bc64d5030e Merge "Displays frequency on connected WiFi network info. Bug: 12767819" 2014-03-14 22:42:05 +00:00
David Braun
99fb0e9e59 am 177c876f: am ca95017f: am c0737638: am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '177c876fed5511dadc02544040dcdfa24435d1b6':
  Add string parameter order to default SMS dialog text
2014-03-14 17:54:13 +00:00
Baligh Uddin
04400ea211 am c48923ed: (-s ours) am c5ff40fe: (-s ours) am 1badeea1: (-s ours) am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit 'c48923edb575e99f5d0d853939d6680a03221ce9':
  Import translations. DO NOT MERGE
2014-03-14 17:54:13 +00:00
David Braun
177c876fed am ca95017f: am c0737638: am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit 'ca95017fa315f6ed9ad2c41adc38145a4f4f88b8':
  Add string parameter order to default SMS dialog text
2014-03-14 16:36:28 +00:00
Baligh Uddin
c48923edb5 am c5ff40fe: (-s ours) am 1badeea1: (-s ours) am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit 'c5ff40fea65cb2618ef7449136a14e291f2a6ee7':
  Import translations. DO NOT MERGE
2014-03-14 16:36:28 +00:00
David Braun
ca95017fa3 am c0737638: am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit 'c07376380f566e241dd4ba85a23ff791bdea1524':
  Add string parameter order to default SMS dialog text
2014-03-14 16:32:41 +00:00
Baligh Uddin
c5ff40fea6 am 1badeea1: (-s ours) am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '1badeea19584849f4e324d658a0ce160e6707388':
  Import translations. DO NOT MERGE
2014-03-14 16:32:40 +00:00
David Braun
c07376380f am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
  Add string parameter order to default SMS dialog text
2014-03-14 16:28:00 +00:00
Baligh Uddin
1badeea195 am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
  Import translations. DO NOT MERGE
2014-03-14 16:27:48 +00:00
Paul Lawrence
2daf2641d3 Handle pattern cooldown correctly
We need to disable pattern control when in cooldown. We also need
to hide the back button completely in pattern mode.

Bug: 13329798
Change-Id: Idefea60d95db1810d340c69cc730a286011363db
2014-03-14 09:20:24 -07:00
Paul Lawrence
9cb1e968da Merge "Don't show IME on pattern" 2014-03-14 14:38:53 +00:00
Baligh Uddin
ecc47ce16f am 4323f74a: (-s ours) am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4323f74aa197701b7b1ea8c45993f57563208810':
  Import translations. DO NOT MERGE
2014-03-14 10:02:46 +00:00
Alan Viverette
c4fa3a727b am 0fa90474: (-s ours) am 3782a3a6: am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '0fa90474e0ee085051d9ba155705b7f5d3bc7bfa':
  DO NOT MERGE Add preference for caption text opacity
2014-03-14 10:02:45 +00:00
Alan Viverette
7e71c1ea12 am 305013b1: (-s ours) am b4a50745: am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '305013b1638e72712464f122435ff350aef5a6be':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-14 10:02:44 +00:00
Przemyslaw Szczepaniak
cc91f6ff66 am 7a5911a9: am 375545e2: am 6829c48c: Merge "Fix F/C in TTS settings"
* commit '7a5911a96d158567bac1e892aee813af1b563a46':
  Fix F/C in TTS settings
2014-03-13 23:12:10 +00:00
Fabrice Di Meglio
7e74b409aa Merge "Fix bug #13440372 More option is displayed with Email/Gmail icon after... scrolling through settings options" 2014-03-13 21:17:21 +00:00
Fabrice Di Meglio
8dcea48d71 Fix bug #13440372 More option is displayed with Email/Gmail icon after...
scrolling through settings options

- force the image and background to null when needed in the Adapter

Change-Id: If4c1769dcd1651b683a34001dcd922c6554252c0
2014-03-13 21:17:07 +00:00
Paul Lawrence
e54e9323ed Don't show IME on pattern
Bug: 13327729
Change-Id: Ie83dda98558b66c824c15975310a8fb1835e900f
2014-03-13 14:05:48 -07:00
David Braun
63ac6a06ef am edcb923d: Add string parameter order to default SMS dialog text
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text
2014-03-13 18:30:11 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Baligh Uddin
4323f74aa1 am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5969801cc119ce58c7f18b1a9cbcc46c8b7ad232':
  Import translations. DO NOT MERGE
2014-03-13 18:08:56 +00:00
Alan Viverette
0fa90474e0 am 3782a3a6: am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '3782a3a6a1a1d22e553cf04231d76103aaf36a7b':
  DO NOT MERGE Add preference for caption text opacity
2014-03-13 18:08:55 +00:00
Alan Viverette
305013b163 am b4a50745: am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'b4a50745f2833cfb73c05586fa9f9b63c0dc1629':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-13 18:08:54 +00:00
Baligh Uddin
5969801cc1 am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a60df014e27d9cd57396655b98922394ff7d73bb':
  Import translations. DO NOT MERGE
2014-03-13 18:02:47 +00:00
Alan Viverette
3782a3a6a1 am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '429720754d85e1b13bc9001adaa23a0b0db04b61':
  DO NOT MERGE Add preference for caption text opacity
2014-03-13 18:02:19 +00:00
Alan Viverette
b4a50745f2 am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-13 18:02:18 +00:00
Baligh Uddin
a60df014e2 am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE
2014-03-13 17:19:21 +00:00
Dianne Hackborn
fa066b9c1a Merge "Bat stats: misc, percents are of battery drain." 2014-03-13 17:04:59 +00:00
Dianne Hackborn
17452d5238 Bat stats: misc, percents are of battery drain.
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
2014-03-13 09:51:19 -07:00
Baligh Uddin
255034803c am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE
2014-03-13 16:40:31 +00:00
Baligh Uddin
a28c64dd6c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:37:47 +00:00
Przemyslaw Szczepaniak
7a5911a96d am 375545e2: am 6829c48c: Merge "Fix F/C in TTS settings"
* commit '375545e2fe6da2c2ccae7239f444a92004213018':
  Fix F/C in TTS settings
2014-03-13 15:35:41 +00:00
Przemyslaw Szczepaniak
375545e2fe am 6829c48c: Merge "Fix F/C in TTS settings"
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
2014-03-13 15:32:48 +00:00
Przemyslaw Szczepaniak
6829c48c36 Merge "Fix F/C in TTS settings" 2014-03-13 15:26:49 +00:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
2014-03-13 10:01:45 +00:00
Alan Viverette
c736f794ac am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-13 10:01:42 +00:00
Shuhrat Dehkanov
f365216391 Fix F/C in TTS settings
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.

Please see https://code.google.com/p/android/issues/detail?id=63122

Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2014-03-13 12:06:17 +09:00
Fabrice Di Meglio
6c9e03fd6d More code cleaning
- use var for context.getResources()
- rename var

Change-Id: I8b8b7ffdd2c83bdbec7a4f162757597032aa9fb0
2014-03-12 17:19:39 -07:00
RoboErik
acfcf69b34 am 64beb278: (-s ours) am 0b71937d: am 5791cecc: b/12068020 Update calls to InputManager. Do not merge
* commit '64beb278983aaa1dbd4115c50cc123be1b0ebc1a':
  b/12068020 Update calls to InputManager. Do not merge
2014-03-12 23:04:48 +00:00
RoboErik
64beb27898 am 0b71937d: am 5791cecc: b/12068020 Update calls to InputManager. Do not merge
* commit '0b71937d304d701fb0edc1cd3720bcadb264d9f9':
  b/12068020 Update calls to InputManager. Do not merge
2014-03-12 21:15:48 +00:00
RoboErik
0b71937d30 am 5791cecc: b/12068020 Update calls to InputManager. Do not merge
* commit '5791cecc9e0a4169c71b87696973441071e295c8':
  b/12068020 Update calls to InputManager. Do not merge
2014-03-12 21:12:27 +00:00
Fabrice Di Meglio
7cacc12009 Code cleaning - class names
- use class names instead of their static string representation

Change-Id: I82ebfc087bc2bbadb9076c5750265bf400ff4224
2014-03-12 13:19:34 -07:00
Fabrice Di Meglio
757450247d Merge "Add dynamic Preferences indexing" 2014-03-12 19:58:06 +00:00
RoboErik
5791cecc9e b/12068020 Update calls to InputManager. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/

This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
2014-03-12 12:53:46 -07:00
Svetoslav
92915638d4 Merge "Remove unused fields and imports." 2014-03-12 19:49:18 +00:00
Svetoslav
177618fac5 Remove unused fields and imports.
Change-Id: If95879a506a9657b3dd370a35c1060712dcb9e93
2014-03-12 12:48:16 -07:00