Adrian Roos
1bd5a220e7
am 04935e46: am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
...
* commit '04935e46cbbc298e930e5c10450a4118861a1b77':
Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:21:02 +00:00
Adrian Roos
48986869c3
am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
...
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:14:52 +00:00
Adrian Roos
38f88e756d
am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
...
* commit 'a31e2348e929c76572e634bc67df10581e6684fa':
Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:07:43 +00:00
Adrian Roos
49e057d7ee
Play "device trusted" sound when onTrustInitiatedByUser fires
...
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
John Reck
931d0d073c
am 41f5d936: am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
...
* commit '41f5d93635d91e309eb49dbd8973ff8593e66529':
Don't mangle layer paint's alpha
2014-08-18 16:28:47 +00:00
John Reck
30bb86629a
am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
...
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
Don't mangle layer paint's alpha
2014-08-18 16:21:34 +00:00
John Reck
79c22cd004
am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
...
* commit '976189a1b563121b442ec242c5653acb5df835d9':
Don't mangle layer paint's alpha
2014-08-18 16:13:30 +00:00
Adrian Roos
e6d05cbcf6
am f329b6a3: am 90ff15e8: am cd91eaf9: Fix bars jumping to black on activity launch
...
* commit 'f329b6a358dd35fdcaed23f4c9ea9caefba7ef0f':
Fix bars jumping to black on activity launch
2014-08-18 15:31:25 +00:00
Jason Monk
45c3597975
resolved conflicts for merge of 8e6b5343 to master
...
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
Adrian Roos
0e9ed4295e
am 90ff15e8: am cd91eaf9: Fix bars jumping to black on activity launch
...
* commit '90ff15e8d1347319db0f08848160eb85b9bcea37':
Fix bars jumping to black on activity launch
2014-08-18 14:52:41 +00:00
Adrian Roos
b5b3e7ab82
am cd91eaf9: Fix bars jumping to black on activity launch
...
* commit 'cd91eaf966a51df6dc0605a95f80b6e09289bd67':
Fix bars jumping to black on activity launch
2014-08-18 14:45:01 +00:00
Adrian Roos
d47ad033c3
Fix bars jumping to black on activity launch
...
During animations, the wallpaper crop is the
union of the start and end crop. This prevents
the system bars from jumping to black when an
activity with opaque bars is launched.
Bug: 16441036
Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
2014-08-18 14:37:18 +00:00
Jason Monk
d6ea61cd15
am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
...
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
Fixes to lock task API from API review
2014-08-18 13:51:09 +00:00
Jason Monk
e127b56463
am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
...
* commit '71793e71d67472a7d42f072cbd6266d4302fefde':
Fixes to lock task API from API review
2014-08-18 13:43:33 +00:00
John Spurlock
5625c0c023
am 3be3919c: am c1975a18: am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev
...
* commit '3be3919c17c048fd9aa3e4baad534215cba4b2eb':
QS: Add scanning progress state indication.
2014-08-18 13:21:26 +00:00
John Spurlock
24a1fd5c04
am c1975a18: am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev
...
* commit 'c1975a18f5fc9b8b0b383fd1d223d9eda711a9a0':
QS: Add scanning progress state indication.
2014-08-18 13:13:10 +00:00
John Spurlock
fb20636811
am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev
...
* commit '4fd20a99733856ab3ec9920a48e2860187ad4473':
QS: Add scanning progress state indication.
2014-08-18 13:06:07 +00:00
Piotr Jastrzebski
61050ea3e0
am 081ec177: am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API."
...
* commit '081ec17718af607667c96d178d572e77f81900cc':
Update ziparchive usage to the new API.
2014-08-18 09:19:20 +00:00
Piotr Jastrzebski
fc1b26fc68
am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API."
...
* commit '626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e':
Update ziparchive usage to the new API.
2014-08-18 09:12:39 +00:00
Piotr Jastrzebski
626e1c65ef
am 8a28e16c: Merge "Update ziparchive usage to the new API."
...
* commit '8a28e16cd346bf28d00d8d5935ed092ffb59e5c9':
Update ziparchive usage to the new API.
2014-08-18 09:04:08 +00:00
Terry Heo
f26968dd9e
am 68f5e8f0: am 0190fd8a: am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev
...
* commit '68f5e8f07360b24d1088976379b2becba6d4c5d3':
CEC: Handle Remote Control command
2014-08-18 07:44:57 +00:00
Terry Heo
b47e183ca9
am 0190fd8a: am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev
...
* commit '0190fd8a6f9389f9eab0a908bcc1b78ecce5fb4b':
CEC: Handle Remote Control command
2014-08-18 07:37:58 +00:00
Terry Heo
dbbbb8d401
am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev
...
* commit 'f9ed92a3bd38aad3106ca31cb368e3d52fcb5400':
CEC: Handle Remote Control command
2014-08-18 07:30:04 +00:00
Chulwoo Lee
85a97094b2
am b796293d: am ee5c44e3: am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev
...
* commit 'b796293d8268b21c68707e580a9d6941f22eae4e':
Fix ConcurrentModificationException in PersistentDataStore
2014-08-18 06:04:52 +00:00
Chulwoo Lee
26c2c1731c
am ee5c44e3: am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev
...
* commit 'ee5c44e3581945f9eb739e1ef21e58e60b84302d':
Fix ConcurrentModificationException in PersistentDataStore
2014-08-18 05:57:18 +00:00
Chulwoo Lee
e33564ab9c
am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev
...
* commit '6cc201929764089c49d777ed983ee776b38054e6':
Fix ConcurrentModificationException in PersistentDataStore
2014-08-18 05:49:26 +00:00
Jungshik Jang
16b5d49825
am 1d155df9: am ce7221ac: am 94a31604: Implement MHL send key action.
...
* commit '1d155df93c6c113c8a18c17af661330b8a7d3173':
Implement MHL send key action.
2014-08-18 05:49:12 +00:00
Jungshik Jang
95b1589671
am ce7221ac: am 94a31604: Implement MHL send key action.
...
* commit 'ce7221ac51b892468d848e6f3384ca4a1993ba13':
Implement MHL send key action.
2014-08-18 05:42:19 +00:00
Jungshik Jang
730095c1d8
am 94a31604: Implement MHL send key action.
...
* commit '94a31604833f069f1b059aa803299f19543fb5d5':
Implement MHL send key action.
2014-08-18 05:35:12 +00:00
Jinsuk Kim
ac33c6cb56
am 28920008: am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
...
* commit '28920008ff3835c8febcad58f638530ec6253112':
CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 04:06:25 +00:00
Michael Wright
16e6811deb
am 0ad986bf: am a08b5883: am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev
...
* commit '0ad986bf9d89b15334fa53bcd8bc91dfc835f460':
Remove MediaProjection#createAudioRecord API
2014-08-18 04:06:20 +00:00
Michael Wright
f3cb197028
am 9ded8208: am 1a63d067: am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev
...
* commit '9ded8208c438eca14d3ed8ad16b819f6688f1267':
Change 'disable hardware keyboard' to 'show input method'
2014-08-18 03:40:37 +00:00
Jinsuk Kim
b347ed75cd
am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
...
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 02:37:42 +00:00
Michael Wright
fb9570f5d0
am a08b5883: am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev
...
* commit 'a08b58839fa7e4c9fb05eedfc06a437883a5a026':
Remove MediaProjection#createAudioRecord API
2014-08-18 02:37:37 +00:00
Jungshik Jang
4612a6e111
Implement MHL send key action.
...
This class introduces two classes, MhlSendKeyAction and
HdmiMhlKeycode.
- MhlSendKeyAction is a feature action that manages MHL message
for RCP, Remote Control Pass Through.
- HdmiMhlKeycode is a collection of MHL keycode including keycode
mapping between MHL and Android keycode.
Bug: 16966459
Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
2014-08-18 11:16:47 +09:00
Michael Wright
9c64c18b10
am 1a63d067: am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev
...
* commit '1a63d067582aa909b48832faefac7f97ab4825f1':
Change 'disable hardware keyboard' to 'show input method'
2014-08-18 02:10:24 +00:00
Jinsuk Kim
20961652cf
am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
...
* commit '47a912291f57766dd0e924eee50bee8d653d297a':
CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 01:32:08 +00:00
Michael Wright
90db970c5c
am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev
...
* commit '4d568b1c24a171b6de988133bb892d1f4ca56d1a':
Remove MediaProjection#createAudioRecord API
2014-08-18 01:32:02 +00:00
Michael Wright
2b82365000
am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev
...
* commit 'ab1b372cfcb5b0607fdf7acf84d2400e4837dff7':
Change 'disable hardware keyboard' to 'show input method'
2014-08-18 01:08:54 +00:00
Brian Carlstrom
9e0aec052b
am e997f4c2: am 18a7b459: am 7c8318c0: Merge "PackageInfo is a class, not a struct"
...
* commit 'e997f4c2889d29a9880ab34c01d9e940640734a8':
PackageInfo is a class, not a struct
2014-08-18 00:10:59 +00:00
Brian Carlstrom
d8ff5dde2e
am 18a7b459: am 7c8318c0: Merge "PackageInfo is a class, not a struct"
...
* commit '18a7b459f10f477a83f8d8356a62eff39065dd13':
PackageInfo is a class, not a struct
2014-08-18 00:04:01 +00:00
Brian Carlstrom
18a7b459f1
am 7c8318c0: Merge "PackageInfo is a class, not a struct"
...
* commit '7c8318c0e85540739afba3e8c0f922176bc299cd':
PackageInfo is a class, not a struct
2014-08-17 23:55:44 +00:00
Brian Carlstrom
fac7ade02e
am f71a2835: Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp
...
* commit 'f71a28354cf3339a744b4abb9571fe98f7bad4ee':
PackageInfo is a class, not a struct
2014-08-17 23:52:36 +00:00
Robert Greenwalt
2c8a41fba5
am f8f559f5: am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
...
* commit 'f8f559f5234a8ae0596ecce7814e66a1948d3c2e':
Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:30:35 +00:00
Robert Greenwalt
bbca13351a
am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
...
* commit '316c9421eda732bd510631acd9384b593f37f027':
Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:22:32 +00:00
Robert Greenwalt
06bd97650d
am c993be52: Add tcp buffer size conduit to NetworkAgent.
...
* commit 'c993be52b3e9a45a882ddc305a133c1859f9d50d':
Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:14:42 +00:00
Robert Greenwalt
3f05bf4d78
Add tcp buffer size conduit to NetworkAgent.
...
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Robert Greenwalt
d9da4f6fc1
am 8df154b1: am 8623d854: am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev
...
* commit '8df154b134e0a04fa93cacbbfd3811cde34d8803':
Fix a logic error so mtu works.
2014-08-17 19:14:31 +00:00
Robert Greenwalt
cd3a2e578d
am 8623d854: am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev
...
* commit '8623d854f1c9cd1ce4c4f1b706b79627c84f374d':
Fix a logic error so mtu works.
2014-08-17 19:07:32 +00:00
Robert Greenwalt
f086299c0d
am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev
...
* commit '75258ebbaa15c999b7a9832a3a90b3bf4acb944b':
Fix a logic error so mtu works.
2014-08-17 18:55:37 +00:00