summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* am 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into ↵ztenghui2014-11-212-1/+35
|\ | | | | | | | | | | | | lmp-mr1-dev * commit '21bc2e3e1e30e34d661e3c3cf961eb058ca3834e': Supporrt tapas build for vector tests
| * Supporrt tapas build for vector testsztenghui2014-11-212-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Such that UX team has less pain on building the VD / AVD assets. This also requires removing internal API dependence in the test. To build the VectorDrawableTest with prebuilt SDK. <root dir>/tapas VectorDrawableTest <root dir>/make -j64 showcommand Then later for incremental build. <root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20 b/18260896 Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
* | am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the ↵ztenghui2014-11-219-12/+166
|\ \ | |/ | | | | | | | | | | | | | | reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5 * commit 'e9dbfe5afd5cd350f06f078775a40e8df4e69ce6': ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
| * Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior ↵ztenghui2014-11-209-12/+166
| |\ | | | | | | | | | now." into lmp-mr1-dev
| | * ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.ztenghui2014-11-209-12/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the android:reversible flag behaves like a suggestion. Now it is used to enforce no reverse when set to false. In this way, user can safely setup one direction animation only. When set to true, but AVD can't reverse , then it will show a warning. At the same time, update the tests to show different cases, including AnimationDrawable. b/18413484 Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
* | | am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into ↵Dianne Hackborn2014-11-213-0/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-mr1-dev * commit '42d9bf665598ae316bfae3fd28cbb5c8f2c95824': Add new empty app test entry points.
| * | Add new empty app test entry points.Dianne Hackborn2014-11-193-0/+74
| | | | | | | | | | | | Change-Id: Ib899c95de6b7bb936d2114e86bec4c5aef5f7eda
* | | am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a ↵ztenghui2014-11-142-0/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | path close." into lmp-mr1-dev * commit '9f67155332e49686ef622b096b715ee62845d401': Fix the starting pen's position when a path close.
| * | Fix the starting pen's position when a path close.ztenghui2014-11-132-0/+29
| |/ | | | | | | | | | | | | | | | | We have to cache the starting point for the latest "move", then apply it after we close the path. b/18214929 Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
* | am 525da301: am 85d558cd: Add Activity API to get referrer information.Dianne Hackborn2014-11-111-0/+2
|\ \ | |/ | | | | | | * commit '525da301930e554dc331828adee35613f945c250': Add Activity API to get referrer information.
| * Add Activity API to get referrer information.Dianne Hackborn2014-11-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This expands the use of EXTRA_REFERRER to be relevant anywhere, allowing apps to supply referrer information if they want. However, if they don't explicitly supply it, then the platform now keeps track of package names that go with Intents when delivering them to apps, which it can be returned as the default value. The new method Activity.getReferrer() is used to retrieve this referrer information. It knows about EXTRA_REFERRER, it can return the default package name tracked internally, and it also can return a new EXTRA_REFERRER_NAME if that exists. The latter is needed because we can't use EXTRA_REFERRER in some cases since it is a Uri, and things like #Intent; URI extras can only generate primitive type extras. We really need to support this syntax for referrers, so we need to have this additional extra field as an option. When a referrer is to a native app, we are adopting the android-app scheme. Since we are doing this, Intent's URI creation and parsing now supports this scheme, and we improve its syntax to be able to build intents with custom actions and stuff, instead of being all hung up on custom schemes. While doing this, fixed a problem when parsing both intent: and new android-app: schemes with a selector portion, where we were not respecting any scheme that was specified. Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
* | am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into ↵ztenghui2014-11-0622-551/+0
|\ \ | |/ | | | | | | | | | | lmp-mr1-dev * commit '9b14422a5045d908ae8a3ba78b4c4972f652b29f': VD:test:Remove open animation AVD
| * Merge "VD:test:Remove open animation AVD" into lmp-mr1-devztenghui2014-11-0622-551/+0
| |\
| | * VD:test:Remove open animation AVDztenghui2014-11-0422-551/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is for unbundle apps, so it is not a good idea to put in open source. b/18171696 Change-Id: I4272a9cd12904b90b4421e88304795a292ceec58
* | | am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it ↵Wale Ogunwale2014-11-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | still has tasks. * commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895': Fix issue #17305377: Don't kill process if it still has tasks.
| * | Fix issue #17305377: Don't kill process if it still has tasks.Wale Ogunwale2014-11-041-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously killed a process when one of its task was swiped away in the recents UI. This had negative performance implications for apps with multiple tasks in recents. Now we will only kill the process if there are no more tasks associated with it. Changed also removes the need for the ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager will now only kill a task process if it process has no out standing tasks. Bug: 17305377 Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
* | am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
|\ \ | | | | | | | | | | | | * commit 'd00ced983ee235f72a9261fd967309a2638dde05': Track change to Conscrypt
| * \ am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1': Track change to Conscrypt
| | * \ Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
| | |\ \
| | | * | Track change to ConscryptKenny Root2014-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change way in which an outside caller can get the preferred SSLContext. Bug: 17136008 Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
* | | | | am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache ↵Narayan Kamath2014-11-031-93/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | related API.""" * commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3': Revert "Revert "Remove unused apache related API.""
| * | | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-93/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735': Revert "Revert "Remove unused apache related API.""
| | * | | Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-93/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea. Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
* | | | | am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+93
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f': Revert "Remove unused apache related API."
| * | | | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+93
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e87d36f8925a34f85ba80c886757d07ad03fed42': Revert "Remove unused apache related API."
| | * | | Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-271-0/+93
| | |\ \ \ | | | |/ /
| | | * | Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14. Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
* | | | | resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aospElliott Hughes2014-10-291-93/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
| * | | | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-93/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
| | * | | Merge "Remove unused apache related API."Narayan Kamath2014-10-271-93/+0
| | |\ \ \ | | | |/ /
| | | * | Remove unused apache related API.Narayan Kamath2014-10-241-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hidden and used only in unit tests. Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
* | | | | am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad."Narayan Kamath2014-10-293-146/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a': Remove tests/SslLoad.
| * | | | am 00fd3639: Merge "Remove tests/SslLoad."Narayan Kamath2014-10-293-146/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '00fd36399fd8dd9566b582c24817d130982bc270': Remove tests/SslLoad.
| | * | | Remove tests/SslLoad.Narayan Kamath2014-10-243-146/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crufty code that hasn't been touched in the past five years. The test seems generally useless and there are dozens of richer tests and benchmarks in conscrypt and libcore. Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
| * | | am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-devSandeep Siddhartha2014-10-095-4/+369
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135': Add tests for model management [SDK Only]
| * \ \ \ am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into ↵Adam Lesinski2014-10-075-0/+79
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc': Load shared library dependencies for AppWidgets
| * \ \ \ \ am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS ↵Dianne Hackborn2014-10-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission change" into lmp-dev * commit '7f7d240b13b96b617e298c6178af0425308f5ef9': Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
| * \ \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-3/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
* | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-213-0/+266
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | * commit 'e73a54f33c029552469fcf1cda46eed2f360a38e': Surface:lockHardwareCanvas
| * | | | | | Surface:lockHardwareCanvasJohn Reck2014-10-213-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17440886 Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
* | | | | | | am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data ↵ztenghui2014-10-1022-0/+551
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the pathData." into lmp-mr1-dev * commit '3406be853d21af58d551adbde805706f43ef51e2': Support negative value in exponential data in the pathData.
| * | | | | | Merge "Support negative value in exponential data in the pathData." into ↵ztenghui2014-10-1022-0/+551
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | Support negative value in exponential data in the pathData.ztenghui2014-10-1022-0/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now "1e-5" will not be separated as "1e" and "-5". Add one test for this use case. Make sure we print out the pathData when path parsing has error. b/17919923 Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
* | | | | | | | am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for ↵Sandeep Siddhartha2014-10-105-4/+369
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | model management [SDK Only]" into lmp-dev * commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82': Add tests for model management [SDK Only]
| * | | | | | | am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" ↵Sandeep Siddhartha2014-10-105-4/+369
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d': Add tests for model management [SDK Only]
| | * | | | | | Merge "Add tests for model management [SDK Only]" into lmp-devSandeep Siddhartha2014-10-095-4/+369
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Add tests for model management [SDK Only]Sandeep Siddhartha2014-10-075-4/+369
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't change any functionality/APIs etc. It allows us to launch the activity and manually test the enrollment methods. Bug: 17885286 Change-Id: I506d9bb98a592131c04a50c9d6224164ffe07183
* | | | | | | am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data ↵ztenghui2014-10-103-1/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | did." into lmp-mr1-dev * commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da': Support dot separation as the svg path data did.
| * | | | | | Merge "Support dot separation as the svg path data did." into lmp-mr1-devztenghui2014-10-093-1/+30
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |