Selim Cinek
99c20ca4e5
am ac96f1fb: am fb1e2378: am d59b0aaf: Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev
...
* commit 'ac96f1fb8c0cc12d3654ca7864fa194685a95876':
Not enforcing a timeout anymore for talkback users
2014-09-02 17:36:14 +00:00
Marcin Kosiba
cdb3fd20b8
am af4a8941: am b1ad72c4: (-s ours) am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP."
...
* commit 'af4a89415a50e01891a7886ae69a56a8611ac7ae':
Update WebViewFactory.java to compile in AOSP.
2014-09-02 17:35:59 +00:00
Marcin Kosiba
9a44012418
am f1655e07: am 0b0c8c0a: (-s ours) am 5ddbe722: Merge "Load the WebView Java code via createPackageContext."
...
* commit 'f1655e07c2346b5dbe251a32d5e198d502cc26b6':
Load the WebView Java code via createPackageContext.
2014-09-02 17:35:54 +00:00
Marcin Kosiba
6248f5a13f
am 7777de58: am f5249619: (-s ours) am 2453f611: Merge "Remove WebView library preloading mechanism."
...
* commit '7777de58db3ec58c4ab01a1f21979cbd340719a6':
Remove WebView library preloading mechanism.
2014-09-02 17:35:43 +00:00
Wonsik Kim
879bef0b7a
am 06958e2b: am 64351f10: am 6f0f566d: Merge "Bind hardware TIS at startup" into lmp-dev
...
* commit '06958e2b7126e180605e0de075cc814c7000fd9f':
Bind hardware TIS at startup
2014-09-02 17:35:17 +00:00
Ji-Hwan Lee
49078c88a0
am 007ac9cd: am 669ad493: am 3b5096be: Merge "Add missing checks for the current session callback" into lmp-dev
...
* commit '007ac9cd0053e2696cd65679389600f68a090626':
Add missing checks for the current session callback
2014-09-02 17:35:11 +00:00
Yohei Yukawa
3e1d87f5f0
am b803cfc4: am 69e65540: am 5a46d984: Merge "Fix illegal cast in a logging code" into lmp-dev
...
* commit 'b803cfc4f984c77a7e2d6e4d459220e542a8d9d5':
Fix illegal cast in a logging code
2014-09-02 17:34:54 +00:00
George Mount
6c07bacd64
am 571f1373: am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev
...
* commit '571f1373244f2ca21345744a5029154ec536fc9d':
Fix NPE in EnterTransitionCoordinator.
2014-09-02 17:34:47 +00:00
George Mount
fe6acd9606
am 00b92bc9: am f055be2d: am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev
...
* commit '00b92bc94c1319a0e2e7ee484fb64d68dbfab3fa':
Use optimized Keyframes for Path animations.
2014-09-02 17:34:42 +00:00
Tyler Gunn
320c2af96b
am 18c6fe95: am 1cfc6db2: am 1207f7a7: Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev
...
* commit '18c6fe953fb24414bb2b327a4d36f8e6bfebe2b4':
Hiding videoState values in telecomm APIs. (1/3)
2014-09-02 17:34:21 +00:00
Rachad
a588d175cd
am f38342e8: am ff09c60d: am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev
...
* commit 'f38342e8af1533009fb5011b7c551989ba332f27':
Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
2014-09-02 17:34:11 +00:00
Jae Seo
0c2d782a76
am 2277a066: am 4525b6f7: am 8a8afdfa: Merge "TIF: Fix comment on TvContentRating" into lmp-dev
...
* commit '2277a0661e0b600621a86c9cfa2a09d19cbceb63':
TIF: Fix comment on TvContentRating
2014-09-02 17:33:46 +00:00
Jeff Sharkey
9d13c490b3
am fe1e985a: am c232d730: am 1722913f: Merge "More API lint checks." into lmp-dev
...
* commit 'fe1e985a32f6dc1254f7ddb6c94789789e0af53c':
More API lint checks.
2014-09-02 17:33:41 +00:00
Ruben Brunk
fd3c235720
am 67b7f03c: am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
...
* commit '67b7f03ca315ef4666c7db5ef9bb72031b7ffac8':
camera2: Add HDR vendor tag for legacy mode.
2014-09-02 17:33:28 +00:00
Alan Viverette
c9e71d0d69
am 0904338f: am 14fa6b6d: am 1ebb78f5: Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev
...
* commit '0904338fcdba4751bbf93d07f5e193d36c5fe88e':
Fix disappearing ripple background, treat active ripple separately
2014-09-02 17:33:23 +00:00
Jeff Sharkey
071cc86642
am 4064e694: am fdc139eb: am cd3fa42d: Ships passing in the night!
...
* commit '4064e694bca0de1bf3b8d89c469dcd9f148acf13':
Ships passing in the night!
2014-09-02 17:33:12 +00:00
Alan Viverette
45fd2ef8bc
am 0ba40ce9: am ecba5c53: am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev
...
* commit '0ba40ce90e3424f395a66680cf4251d8b514eb92':
Variety of small UI tweaks
2014-09-02 07:11:32 +00:00
dcashman
a3fc37688e
am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev
...
* commit '81e038162935b00ccb2f6c76be4c3f633a8a1cb5':
Address KeySet API Review
2014-09-02 07:11:27 +00:00
Robin Lee
4121ec6aa1
am 714e80be: am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev
...
* commit '714e80be6a51c0156cd63ef6abd347f33b6cc161':
Keep managed profile keystores in sync with owner
2014-09-02 07:11:22 +00:00
Jeff Sharkey
08a3d71789
am f085228b: am 1af8d591: am 57d0790a: Merge "Final pass at Material DocumentsUI." into lmp-dev
...
* commit 'f085228b60b4773344ce0ac5717691851568119a':
Final pass at Material DocumentsUI.
2014-09-02 07:11:17 +00:00
Dianne Hackborn
984e0eeedb
am dc7b28f8: am dfd93f1f: am 372c1ee8: Merge "More debug for issue #17310019 : pause when launching settings" into lmp-dev
...
* commit 'dc7b28f8a8ff2517374a7e828c7793ece93cf549':
More debug for issue #17310019 : pause when launching settings
2014-09-02 07:11:12 +00:00
Andrew Lee
d158dc9baa
am 52a6548c: am 5cfc3188: am 08c79caf: Merge "Add functions for setting/getting phone accounts." into lmp-dev
...
* commit '52a6548c621063b4d9217b31d3ca6a9b0b881e02':
Add functions for setting/getting phone accounts.
2014-09-02 07:11:07 +00:00
George Mount
c191226323
am 76a1df69: am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev
...
* commit '76a1df698b0005f8b85e81bdae159e1647e9c8c5':
Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
2014-09-02 07:11:02 +00:00
RoboErik
5bd23653e0
am 85a4839e: am e9fbaa4e: am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev
...
* commit '85a4839e995fcf0aabce973c18d984badd9509d2':
Document MediaSession.Callback.onMediaButtonEvent and add returns
2014-09-02 07:10:57 +00:00
Dianne Hackborn
9ab7f26183
am abb2e104: am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev
...
* commit 'abb2e104319552d2fd98d94fbd089f9ebdbbfe2d':
Oh sticky broadcasts, I'd like to do even worse to you.
2014-09-02 07:10:51 +00:00
John Spurlock
4494da981b
am 22c0f356: am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev
...
* commit '22c0f356f8793d44f9613cd5224d771e0c419442':
Add a hidden system method to check call filter.
2014-09-02 07:10:46 +00:00
Andrew Jeon
52e7495055
am 3fe37375: am d06311db: am 75d95d4c: Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev
...
* commit '3fe373759deaa57b902ee4fa4f0a9e2f8ef0d450':
Replace "Comment" to "Description" since description makes more sense in the context of the java doc.
2014-09-02 07:10:41 +00:00
Amith Yamasani
af039dfa78
am 4c1054a8: am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev
...
* commit '4c1054a81b22843dcd36497347dd4ce637b24022':
Clean up apks installed for a removed user
2014-09-02 07:10:36 +00:00
Christopher Tate
9f3bd78933
am 18e98a5d: am 6fc30ac1: am fc6eda1b: Merge "Expand job scheduler dumpsys a bit" into lmp-dev
...
* commit '18e98a5d27c53e8635744c330bc91c3b5da7e956':
Expand job scheduler dumpsys a bit
2014-09-02 07:10:31 +00:00
Michael Wright
e4717e4378
am 467e25f1: am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev
...
* commit '467e25f1ae0164012793bde9475e7b2be1a0472f':
Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 07:10:26 +00:00
Dianne Hackborn
46d4c56dd9
am bf1783b9: am 59a6a8a5: am aa631d9a: Merge "Fix issue #17329066 : Crash in ActivityManager" into lmp-dev
...
* commit 'bf1783b9af830d8d94a606c899cb5057d2e7f0b9':
Fix issue #17329066 : Crash in ActivityManager
2014-09-02 07:10:21 +00:00
Adam Lesinski
c5af80b462
am 834e328a: am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev
...
* commit '834e328a0facf1537d275e1d5c286a2d9df35161':
Add test to ensure themes get copied from separate resource tables
2014-09-02 07:10:16 +00:00
ztenghui
bbefc1e076
am 01dca3f6: am 04834f4d: am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev
...
* commit '01dca3f6ed92137bce9cd981bc7283520eccd64d':
Ambient shadow tessellation improvement.
2014-09-02 07:10:11 +00:00
Dianne Hackborn
781dbd1808
am 84b72203: am 2cbafc27: am 8eec555a: Merge "Fix issue #17329290 : NPE during ContentProviderRecord.dump()" into lmp-dev
...
* commit '84b7220357f915f6ee140ae095f68b41ef9d7ba7':
Fix issue #17329290 : NPE during ContentProviderRecord.dump()
2014-09-02 07:10:06 +00:00
Scott Rowe
4d819704b5
am 741be77f: am eac8cbbb: am 526b7932: am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
...
* commit '741be77f308463aa726183057478d4ff534755f7':
docs: remove references to resource browser; point to SDK instead
2014-09-02 07:10:01 +00:00
Chris Wren
d6c6cd80f0
am 7c528397: am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
...
* commit '7c528397b54ca5b6cb865e7ba37754f3a831830c':
Disable lockscreen notifications for secure users on upgrade.
2014-09-02 07:09:56 +00:00
Winson Chung
b5ec00fa32
am 80bc0c48: am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev
...
* commit '80bc0c48cdd472b8abd57b7cab143125b6d0f0a5':
Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
2014-09-02 07:09:51 +00:00
Craig Mautner
596f20ad82
am 503be2cb: am bf22a48e: am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev
...
* commit '503be2cb530d31ccdd950930bd91bc9006b19637':
Don't use anim background for translucent windows
2014-09-02 07:09:45 +00:00
Baligh Uddin
b525c6c1a9
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:26:05 +00:00
Baligh Uddin
6319c2727f
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:25:53 +00:00
Baligh Uddin
5dcc0e6f35
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:25:53 +00:00
Baligh Uddin
de21d8384a
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:25:40 +00:00
Baligh Uddin
1bca358550
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:25:34 +00:00
Selim Cinek
1a2753876e
am fb1e2378: am d59b0aaf: Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev
...
* commit 'fb1e2378bc112227a91bfe7dc66ad76a97731c2e':
Not enforcing a timeout anymore for talkback users
2014-09-01 11:29:46 +00:00
Christoph Studer
3ccf29ebf0
am 31942966: am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev
...
* commit '31942966028cbf9b669e27a8e720350b0af1268a':
NoMan: Allow listeners to specify notification trim
2014-09-01 11:25:43 +00:00
Sailesh Nepal
be7bc2233c
am b71c4db7: am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev
...
* commit 'b71c4db73f4e5b90c0dd4664d5178a0602cc0557':
Make PhoneAccount.Builder constructor public
2014-09-01 11:25:28 +00:00
George Mount
6ee1c7c5d5
am e5e085e4: am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev
...
* commit 'e5e085e4c097fc6546aa39ed3d62f439211a5b1b':
Add IDs for status and nav-bar backgrounds.
2014-09-01 11:25:22 +00:00
Adam Lesinski
a5b221254e
am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev
...
* commit '0d7dd79b8acb2ad37c004d73de4a8c8455b38427':
Make UsageStats API comply with API Council
2014-09-01 11:25:17 +00:00
Adam Lesinski
1e5c761591
am 21813c19: am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev
...
* commit '21813c197f044e7a569bd430d38e710d110c9a8f':
Clean up test allocations so real memory leaks are more visible
2014-09-01 11:25:08 +00:00
Adam Lesinski
4c38b8a7e7
am e4dce761: am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
...
* commit 'e4dce761a149113d6ecfa4cb2cee299926c54eac':
Revert "Make UsageStats API comply with API Council"
2014-09-01 11:25:03 +00:00