PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,730 Commits 1 Branch 0 Tags
0100a310d8184baf9576925d160f8af09aa93b10
Commit Graph

11730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Amith Yamasani
454df35ee3 am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '3c4603ef1c19510bd4a58aee19935e084603c69b':
  Remove unused DebugIntentSender
 2014-02-05 20:37:21 +00:00
Amith Yamasani
3c4603ef1c am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '8f9482170835059c11cffa9c554191306db49fbd':
  Remove unused DebugIntentSender
 2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708 am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
  Remove unused DebugIntentSender
 2014-02-05 12:33:48 -08:00
Amith Yamasani
c68a6bde44 am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
  Remove unused DebugIntentSender
 2014-02-05 12:30:42 -08:00
Amith Yamasani
0ad774458a am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
  Remove unused DebugIntentSender
 2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554 am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
  Remove unused DebugIntentSender
 2014-02-05 11:27:30 -08:00
Amith Yamasani
3f72207985 am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
  Remove unused DebugIntentSender
 2014-02-05 11:22:46 -08:00
Amith Yamasani
1ba09366cc am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
  Remove unused DebugIntentSender
 2014-02-05 11:19:03 -08:00
Amith Yamasani
0fce6123bd am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
  Remove unused DebugIntentSender
 2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0 am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
  Remove unused DebugIntentSender
 2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d am c7843db0: Remove unused DebugIntentSender 
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
  Remove unused DebugIntentSender
 2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c Remove unused DebugIntentSender 
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4)
 2014-02-04 23:48:05 +00:00
Baligh Uddin
3f42665331 am 6b8a7116: (-s ours) Import translations. DO NOT MERGE 
* commit '6b8a7116a2203b32cff432fd1602cc3e186b2608':
  Import translations. DO NOT MERGE
 2014-01-06 21:04:29 -08:00
Baligh Uddin
6b8a7116a2 Import translations. DO NOT MERGE 
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
 2014-01-06 18:46:29 -08:00
Baligh Uddin
c9d1e6f49c am 0ae418b2: (-s ours) Import translations. DO NOT MERGE 
* commit '0ae418b207f37bbc9ed4b0be267054f8244dc70a':
  Import translations. DO NOT MERGE
 2013-12-30 16:41:18 -08:00
Baligh Uddin
0ae418b207 Import translations. DO NOT MERGE 
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
 2013-12-30 15:09:59 -08:00
Baligh Uddin
d0c1b8cbee am 0f952752: (-s ours) Import translations. DO NOT MERGE 
* commit '0f952752e387cd4035193015ff3fa793164c980c':
  Import translations. DO NOT MERGE
 2013-12-26 19:51:27 -08:00
Baligh Uddin
0f952752e3 Import translations. DO NOT MERGE 
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
 2013-12-26 16:26:39 -08:00
Baligh Uddin
8c810a4e5d am 7ba72721: (-s ours) Import translations. DO NOT MERGE 
* commit '7ba72721134adeda10972f68fbcf74a491c6b11e':
  Import translations. DO NOT MERGE
 2013-12-19 07:28:03 -08:00
Baligh Uddin
7ba7272113 Import translations. DO NOT MERGE 
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
 2013-12-18 22:12:01 -08:00
Baligh Uddin
ee9a2cbcf3 am 1177cdec: (-s ours) Import translations. DO NOT MERGE 
* commit '1177cdec4eeeacc787059a7843ade6571f54ac5f':
  Import translations. DO NOT MERGE
 2013-12-17 09:33:32 -08:00
Baligh Uddin
1177cdec4e Import translations. DO NOT MERGE 
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
 2013-12-16 12:44:01 -08:00
Baligh Uddin
5fcebc78b9 am 879cc42f: (-s ours) Import translations. DO NOT MERGE 
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE
 2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3 Import translations. DO NOT MERGE 
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
 2013-12-11 20:01:51 -08:00
Baligh Uddin
c5e0893521 am 233d666a: (-s ours) Import translations. DO NOT MERGE 
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE
 2013-12-09 12:10:52 -08:00
Baligh Uddin
233d666aee Import translations. DO NOT MERGE 
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
 2013-12-09 11:47:45 -08:00
Lance Jin-woong Chang
1f5e66392e am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 
* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
 2013-12-04 17:29:27 -08:00
Lance Jin-woong Chang
5d65a47c39 Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909 Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" 
This reverts commit 5796dad9a4.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
 2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 
* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3 Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 2013-12-05 00:47:16 +00:00
Geoff Mendal
65c2a28505 am 3c29831e: (-s ours) Import translations. DO NOT MERGE 
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
  Import translations. DO NOT MERGE
 2013-12-04 13:42:04 -08:00
Geoff Mendal
3c29831e87 Import translations. DO NOT MERGE 
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
 2013-12-04 13:28:51 -08:00
Amith Yamasani
3d6ca11349 am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev 
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist
 2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change 
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-03 19:16:12 +09:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
 2013-12-02 12:45:29 -08:00