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

12148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
31df7cdcb3 am b1140053: am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit 'b1140053057ab62cfe1bd766baa01a979739a407':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:42:47 +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
c7bcddaa5a am 729c83a4: am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '729c83a4f8d7bdd02de2c9c3be1243985b042d5d':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:06:36 +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
a5fbf748c1 am ef3a0be9: am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit 'ef3a0be922618334645b7f9b5e3ab719f3578b92':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:50:09 +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
8e6a5d3134 am 27543d42: am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 
* commit '27543d42ff79b92e2ec3ddcbe970633b848231e8':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
 2014-02-24 14:29:06 +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
c3e8fd2599 am e0388230: am 14136c7c: Merge "Settings: Fix the memory leak in Settings" 
* commit 'e0388230768168af31c26507b5889985daa93169':
  Settings: Fix the memory leak in Settings
 2014-02-21 17:26:29 +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
8db86bc9bc am 1bb55f55: (-s ours) am a9d878ef: (-s ours) am af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit '1bb55f555fce1e83bcdc9d154dc6ff714b2a029b':
  Import translations. DO NOT MERGE
 2014-02-20 21:09:39 +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
Amith Yamasani
8052091f46 am aea431f2: am f6971ee1: am 454df35e: 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 'aea431f24bc19cc24530cee4db01033f8503a67d':
  Remove unused DebugIntentSender
 2014-02-05 20:46:37 +00:00
Amith Yamasani
aea431f24b am f6971ee1: am 454df35e: 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 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
  Remove unused DebugIntentSender
 2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5 am 454df35e: 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 '454df35ee323ec9ca21b0c1ed982eba263df70e3':
  Remove unused DebugIntentSender
 2014-02-05 20:40:39 +00: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
Brian Carlstrom
0105c00519 am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
  packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 13:00:33 +00:00
Brian Carlstrom
f2e9be9a4b Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 21:50:53 +00:00
Brian Carlstrom
7a60db234a packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
 2014-01-30 13:17:08 -08:00
John Spurlock
af87ce0991 am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:48:12 +00:00
John Spurlock
041192855e am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit 'cb8a53541ec142ee5d57f163496583518ddb5c6e':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:44:53 +00:00
John Spurlock
cb8a53541e am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:40:45 +00:00