Bill Yi
a3860afcb5
Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD
2014-04-29 11:34:27 -07:00
Elliott Hughes
309004706c
Track MutableBoolean's new package.
...
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Wink Saville
242184ca23
Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
2014-04-16 20:21:57 +00:00
Przemyslaw Szczepaniak
38aeec0ad8
am 6829c48c
: Merge "Fix F/C in TTS settings"
...
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
2014-03-13 23:18:44 +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
Narayan Kamath
5877242019
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-13 01:55:25 +00:00
Alan Viverette
23d01e0b4b
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-11 23:05:19 +00:00
Alan Viverette
451994bf10
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-11 23:05:13 +00:00
Narayan Kamath
ed44913789
am 7f1c81b7
: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-03-11 18:16:11 +00:00
Narayan Kamath
01723221ff
am 14b0da74
: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-03-11 18:16:09 +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
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
Matthew Xie
d71a7ffd33
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-03-11 00:38:26 +00:00
Jeff Sharkey
748d3964ec
am 14136c7c
: Merge "Settings: Fix the memory leak in Settings"
...
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
Settings: Fix the memory leak in Settings
2014-03-08 01:51:49 +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
449ac3f62f
am 04f36983
: 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-07 18:30:47 +00:00
Jeff Sharkey
26f5c10684
am 1f37bff7
: Merge "Total and available fields missing in Settings storage menu"
...
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
Total and available fields missing in Settings storage menu
2014-03-07 02:24:13 +00:00
Jeff Sharkey
a97902ef14
am 5b4350f2
: Merge "Fix memory leak in ManageApplication"
...
* commit '5b4350f22f81662436992504e711e462de7a790f':
Fix memory leak in ManageApplication
2014-03-07 02:24:12 +00:00
Brian Carlstrom
d475ff3bd3
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-03-07 00:37:32 +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
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
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
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
0223f9c5dd
Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
2014-02-24 00:49:19 +00:00
Jeff Sharkey
14136c7cdf
Merge "Settings: Fix the memory leak in Settings"
2014-02-21 17:17:22 +00: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
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
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
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
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
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
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
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
Per Allard
6251d707b1
'When to daydream' dialog does not follow the JB dialog design guide
...
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
2014-01-23 18:15:56 +09:00
Dave Daynard
a3c0a535d1
Allow tablets to send SMS if enabled in device overlays (1/2)
...
Change-Id: I51771c28415352ee0838fa1507a1461c652d56e8
2014-01-20 12:29:56 -05:00
Jun Su
f3a9578910
Fix memory leak in ManageApplication
...
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.
Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
2014-01-14 03:47:01 +00:00
Jeff Sharkey
859909fee8
am b5377a71
: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
...
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
2014-01-10 23:04:31 +00:00
Amith Yamasani
e7d8485a23
am 5be77489
: Merge "Dont show "Erase SD Card" when there is none"
...
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2
Merge "Dont show "Erase SD Card" when there is none"
2014-01-07 18:37:54 +00:00
Elliott Hughes
97886741b9
am f85d9841
: Merge "Fix elapsed time formatting."
...
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00