Kenny Guy
6f919cd930
am 6bb0818d: am b4900242: Load package information from correct user.
...
* commit '6bb0818d811dc0d210b90671cef6315166263150':
Load package information from correct user.
2014-07-24 23:31:32 +00:00
Adrian Roos
0051842510
am e626b700: am 29c97b8d: Update KeyguardUserSwitcher to use UserSwitcherController
...
* commit 'e626b700da9762e0fd11a401fa724fa4b2de12d3':
Update KeyguardUserSwitcher to use UserSwitcherController
2014-07-24 23:31:26 +00:00
Selim Cinek
d06a41d71b
am 48f16d6d: am 13476f4d: Implemented new camera affordance
...
* commit '48f16d6d49c4446fefaa3b628006c849508e9ea8':
Implemented new camera affordance
2014-07-24 23:31:22 +00:00
Justin Morey
9c1bfa980c
am c206b06e: am 1d1c13f0: Expose setActiveProfileOwner() using @SystemApi
...
* commit 'c206b06eef19f68cc9435d5de0566721aef92a2b':
Expose setActiveProfileOwner() using @SystemApi
2014-07-24 23:31:17 +00:00
Adrian Roos
6c964e74b7
am 1787ea77: am 0f53ad6f: Disable trust agents after wrong credential is entered
...
* commit '1787ea77745b381c6a1971759f7c62397d90e69f':
Disable trust agents after wrong credential is entered
2014-07-24 23:31:04 +00:00
Derek Sollenberger
aadcb5b25a
am 1d418b63: am 85c1806b: Refactor text drawing to move minikin interactions outside of the canvas interface.
...
* commit '1d418b639b06d591bed4f19d1a75effe225d0ce0':
Refactor text drawing to move minikin interactions outside of the canvas interface.
2014-07-24 23:31:00 +00:00
Leon Scroggins III
3eaf9fb221
am e32af264: am 3b88245f: Make updateLocalMatrix replace the current Matrix.
...
* commit 'e32af2641687a5a270b5621aaf1717504cb9b61b':
Make updateLocalMatrix replace the current Matrix.
2014-07-24 23:30:53 +00:00
Tim Murray
7d8be89420
am 638a2b2d: am 8224edb9: Merge "Update makefile for clang host build."
...
* commit '638a2b2dac2e5a020693836d910789aee3c14795':
Update makefile for clang host build.
2014-07-24 21:08:21 +00:00
Tim Murray
638a2b2dac
am 8224edb9: Merge "Update makefile for clang host build."
...
* commit '8224edb94f6421a2d910362c56940dcf991847e6':
Update makefile for clang host build.
2014-07-24 21:04:20 +00:00
Nicolas Prevot
f2e791fcdd
am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev
...
* commit '1b4a211dc241c8d7275da97980dd6ea843f42933':
Making the clipboard work across users.
2014-07-24 19:49:30 +00:00
Neil Fuller
894ec83b96
am a8938aa0: am e678391e: Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev
...
* commit 'a8938aa049f7de5b4a0b0896ca4dd3100974e66e':
Rewriting android.text.format.Time without the native _tz functions
2014-07-24 19:49:27 +00:00
Robin Lee
1dd78a0952
am 697bec20: am 93c947f9: Show disclosure when an intent switches profiles
...
* commit '697bec204d61703fa2871a224dd92cdf3440e167':
Show disclosure when an intent switches profiles
2014-07-24 19:49:23 +00:00
Ji-Hwan Lee
a2ccc146ba
am e24b1ccc: am fe199929: Merge "TIF: Handle null main session" into lmp-dev
...
* commit 'e24b1ccc00a79dec8de5d8b7e27477251b2aca02':
TIF: Handle null main session
2014-07-24 19:49:15 +00:00
Sungsoo Lim
9458982408
am 6be4d137: am 26ab8328: Fix typo
...
* commit '6be4d1373afaf3be5c3cdeaa3f4c48825e821343':
Fix typo
2014-07-24 19:49:11 +00:00
Ji-Hwan Lee
24445f62f8
am 8207fa19: am f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev
...
* commit '8207fa194b9f0e2c126b7ee3978d34ba6ca15192':
TIF: Fix crash on setMainSession
2014-07-24 19:49:07 +00:00
Sandeep Siddhartha
240caabfc1
am 2eafe5a1: am e99f48c3: Merge "searchKeyphrase* should not be in the SDK" into lmp-dev
...
* commit '2eafe5a18a8bb7cc08bd3a76a807b6c287ec4827':
searchKeyphrase* should not be in the SDK
2014-07-24 19:49:03 +00:00
Ji-Hwan Lee
b398259496
am 1bcb91c1: am 22185ce0: TIF: Support HDMI-CEC active source management
...
* commit '1bcb91c19bfdc166ff4cacc1dc1569da5416b3fa':
TIF: Support HDMI-CEC active source management
2014-07-24 19:48:59 +00:00
Terry Heo
b4862fa742
am 6933e350: am f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev
...
* commit '6933e350e6eb1f866578e1f588284706b3401894':
TIF: Enable capturing TV input of TvInputPassthroughWrapperService
2014-07-24 19:48:55 +00:00
Antoine Labour
6e753f8087
am f6ec140a: am 4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev
...
* commit 'f6ec140ad67263061c6c9236e1c117c75c1a6dc0':
WindowManager: fix clipping
2014-07-24 19:48:50 +00:00
Nick Kralevich
fae1f5fba7
am c98d973c: am c91b2735: OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
...
* commit 'c98d973c18ed1ee504af9a842b6249a157eaceeb':
OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
2014-07-24 19:48:27 +00:00
Svetoslav
272e1469ba
am 8edeea8a: am f214b4ce: Merge "Handle wrong file format when printing." into lmp-dev
...
* commit '8edeea8a2d2b9f2172778fb2e981a574cbd8ca74':
Handle wrong file format when printing.
2014-07-24 19:48:23 +00:00
Alan Viverette
9f5e76977b
am 9343df3d: am 5e9d2bfb: Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev
...
* commit '9343df3d6e9a91a0147d7ac35116291ba51e6297':
Allow medium-long-press to initiate drag-to-open menus
2014-07-24 19:48:19 +00:00
Yorke Lee
1a529e4487
am 59942b1b: am 6faad8cb: Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev
...
* commit '59942b1be5ca62e83bcb09121203dca89971fd54':
Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL
2014-07-24 19:48:08 +00:00
Jungshik Jang
a81ca12dc3
am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record.
...
* commit '13dcf17a859bb88569dc93287d69054d213a3e89':
Implement OneTouchRecordAction and stop one touch record.
2014-07-24 19:48:03 +00:00
Alan Viverette
dc3a80a158
am 0531babd: am 380b9a5e: Merge "Revert "Make lighting style and attribute public"" into lmp-dev
...
* commit '0531babd83311b35abeff2300b81c79847c74e6f':
Revert "Make lighting style and attribute public"
2014-07-24 19:47:54 +00:00
Jungshik Jang
b53fa20a5d
am b32da7b5: am 5dfe8261: Merge "Add @hide and @SystemApi to HdmiTimerRecordSources" into lmp-dev
...
* commit 'b32da7b59497b1b569b8fe71c32747e8a45a6997':
Add @hide and @SystemApi to HdmiTimerRecordSources
2014-07-24 19:47:46 +00:00
vandwalle
d3919f6f29
am 5aba9e83: am ca497830: Merge "autojoin fixes:" into lmp-dev
...
* commit '5aba9e83b71e7fcd11f22d0b70da1ee35496e1da':
autojoin fixes:
2014-07-24 19:47:42 +00:00
Terry Heo
8934fd5d64
am 5d41a6b0: am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev
...
* commit '5d41a6b0ca5f44d7eeca9d853a468a3a899f0c49':
Add a frame capture API of TV input
2014-07-24 19:47:35 +00:00
Winson Chung
f1f705c60a
am fbbf6686: am a6335dad: Merge "Adding fallback transition for animating in/out of affiliate groups." into lmp-dev
...
* commit 'fbbf66865f8bd2b7f4f21413b6d3b2b527d0422d':
Adding fallback transition for animating in/out of affiliate groups.
2014-07-24 19:47:29 +00:00
Svetoslav
2abf55a015
am 54d27760: am 51bc2b53: Updating the save to PDF button icon.
...
* commit '54d27760ca3ad8c8aee6b92a479b76196e26d44f':
Updating the save to PDF button icon.
2014-07-24 19:47:25 +00:00
Joe Onorato
1048f608fe
am cb3e87ea: am 3392ede6: Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
...
* commit 'cb3e87eafad318ff97f3fa012df8a31191b334b7':
Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
2014-07-24 19:47:15 +00:00
Joe Onorato
ab6afd1f23
am f6fb64fd: am fc3576bf: s/MediaBrowseService/MediaBrowserService/
...
* commit 'f6fb64fd393df5fb3ff0eb57ee727891fda59eff':
s/MediaBrowseService/MediaBrowserService/
2014-07-24 19:47:07 +00:00
ram
00a74e521d
am 77df30af: am 78609909: IMS: getPCSCF() API enhanced to support multiple APN types.
...
* commit '77df30af77746b231d9d6828dfb0897f36e31773':
IMS: getPCSCF() API enhanced to support multiple APN types.
2014-07-24 19:47:03 +00:00
Alan Viverette
dc9d752453
am c83d49bb: am 69c11987: Merge "Make lighting style and attribute public" into lmp-dev
...
* commit 'c83d49bbc0cadf5e838324ffe8ffb803e5e76a0b':
Make lighting style and attribute public
2014-07-24 19:46:58 +00:00
Geoffrey Borggaard
832f82f9eb
am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev
...
* commit '1b09c716096ccada799c6fde6cb397b3e307b709':
Fixes setting password through DevicePolicyManager
2014-07-24 19:46:46 +00:00
Nancy Chen
5eaf3505eb
am 26218798: am ef60a1ff: Merge "Hide multiple-account information if there is only a single account" into lmp-dev
...
* commit '26218798fbe609d21df0096a17a68cdcf2664ec6':
Hide multiple-account information if there is only a single account
2014-07-24 19:46:38 +00:00
Matthew Williams
7d1081531d
am 083e4b24: am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev
...
* commit '083e4b24c978e380e6a7c864a00257f585eb51c7':
Fix JobScheduler race condition
2014-07-24 19:46:20 +00:00
Shishir Agrawal
e624dda14c
am 4130f9db: am 27656cae: Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
...
* commit '4130f9db4a6b846b703bf634eb3f05c2b080381d':
Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
2014-07-24 19:46:02 +00:00
John Reck
a728570a9a
am dc7f7045: am ca66e06b: Dump RenderThread stack on unresponsive
...
* commit 'dc7f7045f66733dbd3bf46934ddd6dec5b12a64a':
Dump RenderThread stack on unresponsive
2014-07-24 19:45:56 +00:00
Kenny Guy
79db5b8742
am b4900242: Load package information from correct user.
...
* commit 'b490024232143ebde9bc14f33c775cbcfaba03af':
Load package information from correct user.
2014-07-24 15:54:55 +00:00
Kenny Guy
4dcb0dc453
Load package information from correct user.
...
Handle case where a package is only installed
for secondary user.
Bug: 15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79
2014-07-24 15:49:18 +00:00
Adrian Roos
28aca0a170
am 29c97b8d: Update KeyguardUserSwitcher to use UserSwitcherController
...
* commit '29c97b8d23cd1b8174e19c13484f9f355d6356d8':
Update KeyguardUserSwitcher to use UserSwitcherController
2014-07-24 15:37:25 +00:00
Adrian Roos
723632ea1a
Update KeyguardUserSwitcher to use UserSwitcherController
...
Also wires up the button to expand the keyguard user switcher.
Also respects the EDU simple switcher setting.
Bug: 16043126
Change-Id: I58871ec3323b2cafcacbc747fec5f20c56172969
2014-07-24 15:32:32 +00:00
Selim Cinek
e587677d42
am 13476f4d: Implemented new camera affordance
...
* commit '13476f4d7832a2075c99d14217a3f5f47d14bd65':
Implemented new camera affordance
2014-07-24 15:31:05 +00:00
Selim Cinek
baa2327459
Implemented new camera affordance
...
Also fixed a bug in the touch logic where you could close the shade / hint
after going to the camera / phone.
Bug: 15126905
Change-Id: Iadfde56cb68f4048868eedec6bd3456f55823cd9
2014-07-24 15:28:10 +00:00
Justin Morey
085951fd70
am 1d1c13f0: Expose setActiveProfileOwner() using @SystemApi
...
* commit '1d1c13f04c57abd8074b2d41550a42f1a916b8e1':
Expose setActiveProfileOwner() using @SystemApi
2014-07-24 15:26:46 +00:00
Justin Morey
80440cc853
Expose setActiveProfileOwner() using @SystemApi
...
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)
2014-07-24 15:23:09 +00:00
Adrian Roos
f82e52c98a
am 0f53ad6f: Disable trust agents after wrong credential is entered
...
* commit '0f53ad6f88ac2a4eefc4b5037876ced2412c2b16':
Disable trust agents after wrong credential is entered
2014-07-24 14:35:16 +00:00
Derek Sollenberger
30095a0b91
am 85c1806b: Refactor text drawing to move minikin interactions outside of the canvas interface.
...
* commit '85c1806b5dbafdf74d52fa995dd6901c65f39a08':
Refactor text drawing to move minikin interactions outside of the canvas interface.
2014-07-24 14:35:12 +00:00
Adrian Roos
4f994eb2dd
Disable trust agents after wrong credential is entered
...
Bug: 16498202
Change-Id: I36f2e80aec8c04bcb6e6d9f1b0e2ebb8fc49998e
2014-07-24 14:32:26 +00:00