frameworks_base

Go to file

Julia Reynolds fbb267d4f4 resolve merge conflicts of 407c434 to nyc-mr1-dev

am: 94ad652c7a

* commit '94ad652c7a23d8464e2ac30a9c9de33e16431308':
  Logging for QS settings launch.

Change-Id: Ic10a2f37a79211422758cd533994f1a30bb7e69e

2016-05-12 16:53:38 +00:00

api

Merge "document the return type of getImportance" into nyc-dev am: 3041d49d88

2016-05-12 13:03:18 +00:00

cmds

Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev

2016-05-06 21:42:47 +00:00

core

Merge "Remove extra logging in DatePicker" into nyc-dev am: c952b035b2

2016-05-12 15:05:02 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:24:11 +00:00

docs

docs: Wear Preview landing page updates am: 92abdc08bf

2016-05-12 08:17:56 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev

2016-05-12 00:34:16 +00:00

include

Resource shared libraries: fix theme references

2016-05-10 10:45:52 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565

2016-05-11 22:11:44 +00:00

location

Fixed the sign error in GnssClock

2016-04-08 14:10:42 -07:00

media

Merge "TIF: Remove the uniqueness check for track ID from notifyTracksChanged" into nyc-dev

2016-05-12 00:38:13 +00:00

native

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

resolve merge conflicts of 407c434 to nyc-mr1-dev

2016-05-12 16:53:38 +00:00

proto

resolve merge conflicts of 407c434 to nyc-mr1-dev

2016-05-12 12:45:29 -04:00

Merge "[RenderScript] Interrupt mMessageThread when tearing down context." am: 9f2a1979a7

2016-05-11 19:32:00 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev am: e4a3e5e8f1

2016-05-12 15:20:14 +00:00

telecomm/java

Add removeExtras(String...) prototype per API review.

2016-05-10 14:52:33 -07:00

telephony/java

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:23:26 +00:00

test-runner

Disallow disable of the system shared libs.

2016-04-13 19:31:40 -07:00

tests

Merge "Switch the default text selection handles to Material style." into nyc-dev

2016-05-12 00:56:14 +00:00

tools

Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5

2016-05-11 16:01:35 +00:00

wifi/java/android/net/wifi

Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev

2016-04-18 23:27:10 +00:00

Android.mk

Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104

2016-05-02 19:39:03 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%