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

12169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
99fa73361f am 8ce54bd6: am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '8ce54bd640ddab13416d7a105df63bf29df2ae45':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 22:51:57 +00:00
Rob Fletcher
8ce54bd640 am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '04f3698345f804848ea7f03c6022dbdb0d8ac28d':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 22:41:29 +00:00
Rob Fletcher
04f3698345 am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '549a39b49510dad27da588714f848dc891913239':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 21:59:31 +00:00
Rob Fletcher
549a39b495 DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
 2014-03-06 11:51:15 -08:00
Wei Wang
1a188f4075 DO NOT MERGE Change bluetooth off display message. 
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
 2014-03-06 18:45:35 +00:00
Matthew Xie
b114005305 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:39:34 +00:00
Matthew Xie
85fb88ee10 Merge "HTML injection fix for bluetooth pairing, issue 65946" 2014-02-27 21:32:52 +00:00
Rob Fletcher
7b0686af2f HTML injection fix for bluetooth pairing, issue 65946 
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
 2014-02-27 19:46:12 +00:00
Narayan Kamath
729c83a4f8 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:05:07 +00:00
Narayan Kamath
7f1c81b7b5 Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 2014-02-27 12:00:22 +00:00
Narayan Kamath
9ebc27c73e Revert "Set 24 hour pref. with ACTION_TIME_CHANGED." 
This reverts commit d5d9d37361.

Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
 2014-02-27 12:00:08 +00:00
Narayan Kamath
ef3a0be922 am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:46:48 +00:00
Narayan Kamath
14b0da749c Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 2014-02-27 11:42:11 +00:00
Narayan Kamath
d5d9d37361 Set 24 hour pref. with ACTION_TIME_CHANGED. 
Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.

Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
 2014-02-26 13:43:32 +00:00
Matthew Xie
27543d42ff am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 
* commit '0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
 2014-02-24 14:25:28 +00:00
Matthew Xie
0223f9c5dd Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 2014-02-24 00:49:19 +00:00
Jeff Sharkey
e038823076 am 14136c7c: Merge "Settings: Fix the memory leak in Settings" 
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
  Settings: Fix the memory leak in Settings
 2014-02-21 17:21:48 +00:00
Jeff Sharkey
14136c7cdf Merge "Settings: Fix the memory leak in Settings" 2014-02-21 17:17:22 +00:00
Baligh Uddin
1bb55f555f am a9d878ef: (-s ours) am af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit 'a9d878ef67f54c878cef0868767ed8e9a5b8c063':
  Import translations. DO NOT MERGE
 2014-02-20 21:06:07 +00:00
Baligh Uddin
a9d878ef67 am af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit 'af03def380ca594838ef6caff4f8c23dc78e821c':
  Import translations. DO NOT MERGE
 2014-02-20 21:02:54 +00:00
Baligh Uddin
af03def380 am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit '63a354ee094f3e71773cbdd29359b5c28df2b9f0':
  Import translations. DO NOT MERGE
 2014-02-20 20:59:28 +00:00
Baligh Uddin
63a354ee09 am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit 'd83484dba0749e01cf80a85cd0d2648a79f9fdf4':
  Import translations. DO NOT MERGE
 2014-02-20 20:56:19 +00:00
Baligh Uddin
d83484dba0 Import translations. DO NOT MERGE 
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
 2014-02-20 07:23:08 -08:00
Srinu Jella
6892691421 Bluetooth: GAP: Cancel the pairing notification on bond state change 
Cancel the pairing notification on bond state change happens from
BOND_BONDING to BOND_NONE.  Otherwise it will present in the
notification area until it gets cancelled by opening it and press
cancel on pairing dialog.

Change-Id: I96f673e29e612cd748165a1323a5b4a4276a843c
 2014-02-19 15:04:08 +05:30
Jeff Sharkey
abe6b83559 am 1f37bff7: Merge "Total and available fields missing in Settings storage menu" 
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
  Total and available fields missing in Settings storage menu
 2014-02-06 22:36:40 +00:00
Jeff Sharkey
a5b5bfbbef am 5b4350f2: Merge "Fix memory leak in ManageApplication" 
* commit '5b4350f22f81662436992504e711e462de7a790f':
  Fix memory leak in ManageApplication
 2014-02-06 22:31:26 +00:00
Jeff Sharkey
1f37bff7d2 Merge "Total and available fields missing in Settings storage menu" 2014-02-06 22:29:11 +00:00
Jeff Sharkey
5b4350f22f Merge "Fix memory leak in ManageApplication" 2014-02-06 22:25:30 +00:00