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

12199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
a2ea9ac68f am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5f4696f8e00731d2825ec6fc7d24c020f3e75f73':
  Import translations. DO NOT MERGE
 2014-03-25 19:06:01 +00:00
Baligh Uddin
5f4696f8e0 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 19:01:04 +00:00
Baligh Uddin
bbcd64cb8b am 7bad0786: (-s ours) am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit '7bad0786ec63fc513a195579417901722c8689db':
  Import translations. DO NOT MERGE
 2014-03-25 17:07:48 +00:00
Baligh Uddin
7bad0786ec am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
  Import translations. DO NOT MERGE
 2014-03-25 17:02:02 +00:00
Baligh Uddin
b86dff8480 am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
  Import translations. DO NOT MERGE
 2014-03-25 16:54:48 +00:00
Baligh Uddin
7eab908944 Import translations. DO NOT MERGE 
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
 2014-03-24 13:01:09 -07:00
Baligh Uddin
da4a6a53d4 Import translations. DO NOT MERGE 
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
 2014-03-24 12:59:14 -07:00
Baligh Uddin
31a72b0769 am e3a0b402: (-s ours) am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit 'e3a0b402c3d9163b5dff884c44d3a5f2a86e80aa':
  Import translations. DO NOT MERGE
 2014-03-20 19:09:05 +00:00
Baligh Uddin
e3a0b402c3 am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE
 2014-03-20 19:02:30 +00:00
Baligh Uddin
2e71c1df7c am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE
 2014-03-20 18:41:54 +00:00
Wei Wang
a95228ff5b am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit '41f5437def4b97581d67b5636ca2dba10f8eb385':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 16:24:12 +00:00
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
 2014-03-19 22:37:27 -07:00
Baligh Uddin
947e899585 Import translations. DO NOT MERGE 
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
 2014-03-19 13:10:41 -07: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
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
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
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
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
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
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