PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,203 Commits 1 Branch 0 Tags
97bce9d08711dc30857dc63c8cf2269c13e17bb8
Commit Graph

12203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
97bce9d087 am 26fa5188: (-s ours) am 27259b53: (-s ours) am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit '26fa5188c79836a328b28bdeac65cd7fa8894bd4':
  Import translations. DO NOT MERGE
 2014-03-17 20:55:49 +00:00
Geoff Mendal
26fa5188c7 am 27259b53: (-s ours) am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit '27259b53e6db8781ef7aea614298d50bf26d30e4':
  Import translations. DO NOT MERGE
 2014-03-17 20:52:13 +00:00
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
e8de72e53a Import translations. DO NOT MERGE 
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
 2014-03-17 12:42:54 -07: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
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
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
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
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
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
Baligh Uddin
7c35c10ebc Import translations. DO NOT MERGE 
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
 2014-03-12 12:02:29 -07:00
Baligh Uddin
846f036ef1 am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
  Import translations. DO NOT MERGE
 2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:37:53 +00:00
Narayan Kamath
677f32b1bb am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'd4cf5c5578844ce9915aba178094313a9eeb8022':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:17:28 +00:00
Narayan Kamath
d4cf5c5578 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:14:15 +00:00
Narayan Kamath
c776bbb156 Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76 Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
 2014-03-11 13:05:37 +00:00
Alan Viverette
0100a310d8 am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-11 02:15:27 +00:00
Alan Viverette
8840aa4c40 Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3 Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 2014-03-11 02:11:41 +00:00
Baligh Uddin
f1b94b2f67 Import translations. DO NOT MERGE 
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
 2014-03-10 15:28:38 -07:00
Wei Wang
9075a6e21c am c8962d07: am 6663b245: am a8e634ca: (-s ours) am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 
* commit 'c8962d077033ad78bba70b4ed7cb2fcc065f0e54':
  DO NOT MERGE Change bluetooth off display message.
 2014-03-08 02:15:01 +00:00
Wei Wang
c8962d0770 am 6663b245: am a8e634ca: (-s ours) am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 
* commit '6663b24574c8a3b1e8bde7737a28299bef743f2f':
  DO NOT MERGE Change bluetooth off display message.
 2014-03-08 02:11:25 +00:00
Wei Wang
6663b24574 am a8e634ca: (-s ours) am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 
* commit 'a8e634ca5367dde80873a0b7643e27284db56336':
  DO NOT MERGE Change bluetooth off display message.
 2014-03-08 02:07:30 +00:00
Wei Wang
a8e634ca53 am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 
* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
  DO NOT MERGE Change bluetooth off display message.
 2014-03-08 02:02:19 +00:00
Wei Wang
104eea0b97 Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 2014-03-08 02:00:37 +00:00
Alan Viverette
00f221dc9e DO NOT MERGE Add preference for caption text opacity 
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
 2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f DO NOT MERGE Remove extra fragment in captioning preferences 
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
 2014-03-07 14:06:07 -08:00
Rob Fletcher
d58459cbb9 am 99fa7336: am 8ce54bd6: am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '99fa73361fd7a562b7ea193cd047604e902d6b2f':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 22:56:39 +00:00