frameworks_base

Go to file

John Reck 65f2defdfc resolve merge conflicts of cabf8a7 to master.

Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf

2014-11-07 11:29:08 -08:00

api

am a56fa73c: am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev

2014-11-07 04:17:56 +00:00

cmds

am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev

2014-11-05 19:06:25 +00:00

core

resolve merge conflicts of cabf8a7 to master.

2014-11-07 11:29:08 -08:00

data

am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

2014-10-11 00:24:03 +00:00

docs

am 402a1404: am 63bafb39: am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f

2014-11-07 04:44:22 +00:00

drm

am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

2014-06-10 01:30:05 +00:00

graphics

am 9fb51ad8: am a04a5e82: am 6e85abd4: Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev

2014-11-05 00:57:24 +00:00

include

Merge "Fix issues that will be present in C++11" into lmp-mr1-dev

2014-11-03 23:38:43 +00:00

keystore

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

libs

resolve merge conflicts of cabf8a7 to master.

2014-11-07 11:29:08 -08:00

location

am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev

2014-11-07 18:43:36 +00:00

media

am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev

2014-11-07 04:12:06 +00:00

native

Sensor related changes for NDK.

2014-08-05 19:34:04 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

2014-11-07 15:50:07 +00:00

policy

Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6

2014-11-05 20:01:56 +00:00

resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

2014-08-21 23:20:32 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev

2014-11-07 04:17:02 +00:00

telecomm/java

Replace onConferenceChanged with onConnectionAdded.

2014-11-06 17:19:51 -08:00

telephony/java

am 843133cd: am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8

2014-11-06 19:30:06 +00:00

test-runner

am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

2014-10-30 23:44:09 +00:00

tests

am c220b48a: am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev

2014-11-06 21:08:12 +00:00

tools

am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev

2014-11-07 04:17:02 +00:00

wifi/java/android/net/wifi

am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev

2014-11-06 00:12:44 +00:00

Android.mk

am 2cf2406d: am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev

2014-10-23 22:31:15 +00:00

CleanSpec.mk

Renaming Telecomm to Telecom.

2014-09-12 22:16:17 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%