Christopher Lane 111db01a26 resolved conflicts for merge of 381ac080 to master ...

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

2014-04-14 15:14:01 -07:00

..

AccessoryDisplay

Add "throws IOException" to MediaCodec factory methods

2014-01-16 12:35:15 -08:00

ActivityTests

Fix issue #10115327: MapCollections need to implement equals

2013-07-31 17:52:07 -07:00

AppLaunch

use min app launch time in AppLaunch perf test

2014-03-04 18:35:05 +00:00

appwidgets

…

Assistant

…

backup

…

BandwidthTests

…

BatteryWaster

…

BiDiTests

Replace wildcard imports with explicit imports

2013-09-13 14:22:36 -07:00

BrowserPowerTest

Better detecting if current threasd is main thread

2013-01-18 14:50:07 -08:00

Camera2Tests

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

CanvasCompare

Refactor HardwareLayer

2014-02-10 20:55:39 -08:00

Compatibility

Make sure the app is still app after launching.

2013-05-01 07:54:48 -07:00

CoreTests

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07:00

DataIdleTest

…

DozeTest

Plumb display power state through display manager.

2014-04-10 20:46:14 -07:00

DpiTest

…

FixVibrateSetting

…

FrameworkPerf

New ArrayMap class.

2013-05-24 16:36:14 -07:00

GridLayoutTest

Replace wildcard imports with explicit imports

2013-09-13 14:22:36 -07:00

HugeBackup

…

HwAccelerationTest

Remove isolated z volume test

2014-04-11 14:20:08 -07:00

IdleServiceTest

Introduce "IdleService" API to expose idle-time maintenance to apps

2014-01-31 15:41:40 -08:00

ImfTest

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

LargeAssetTest

…

LegacyRestoreTest

Adapt to underlying changes in the PBKDF2 implementation

2014-03-03 17:49:30 -08:00

LocationTracker

…

LotsOfApps

…

LowStorageTest

…

MemoryUsage

App ops: vibration, neighboring cells, dialing, etc.

2013-02-01 15:14:29 -08:00

OneMedia

Adds a TransportController and TransportPerformer to session

2014-03-12 15:09:42 -07:00

permission

Expand install observer semantics

2014-03-27 12:37:47 -07:00

RemoteDisplayProvider

Finalize assets for screen casting.

2013-11-13 02:17:53 -08:00

RenderScriptTests

Switch Fountain(Fbo) to use RSSurfaceView instead of RSTextureView.

2013-05-06 18:18:57 -07:00

RenderThreadTest

Rename DisplayList->RenderNode

2014-03-17 10:30:32 -07:00

SerialChat

…

SharedLibrary

Use new build var to depend on an APKs resources

2014-03-25 17:04:56 -07:00

SmokeTest

Don't attempt to launch disabled activities in smoke test.

2014-02-20 16:41:52 -08:00

SmokeTestApps

…

SslLoad

…

StatusBar

Fix [-] buttons in the notification builder test.

2013-04-09 13:34:04 +00:00

SystemUIDemoModeController

Example controller app for system ui demo mode.

2014-02-07 14:47:47 -05:00

TileBenchmark

libcore_to_document and junit_to_document are no longer functions.

2013-12-04 16:58:59 -08:00

touchlag

…

TransformTest

…

TransitionTests

Make fading transitions work better

2013-09-26 13:38:12 -07:00

TtsTests

Fix TTS tests.

2013-07-29 16:30:04 +00:00

VectorDrawableTest

Fix build breakage

2014-04-10 14:28:30 -07:00

WebViewTests

…