frameworks_base

Go to file

Wink Saville 5a84de6ee6 resolved conflicts for merge of 74af525e to master

Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d

2011-05-13 14:01:16 -07:00

api

Merge "Add initial API for stylus and mouse buttons."

2011-05-13 12:14:27 -07:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

Merge "resolved conflicts for merge of 0e59729b to master"

2011-05-12 17:15:22 -07:00

core

Merge "Add initial API for stylus and mouse buttons."

2011-05-13 12:14:27 -07:00

data

DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"

2011-05-04 10:41:20 -04:00

docs

am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board

2011-05-11 13:12:16 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

2011-04-24 12:40:16 -07:00

graphics

Cleanup mesh creation.

2011-05-12 10:49:39 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Merge "Add initial API for stylus and mouse buttons."

2011-05-13 12:14:27 -07:00

keystore

Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult

2011-04-22 15:45:22 -07:00

libs

Merge "Add initial API for stylus and mouse buttons."

2011-05-13 12:14:27 -07:00

location

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

media

update for new audio.h header location

2011-05-12 14:09:57 -07:00

native

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

nfc-extras

Implement dead service recovery in NFC extras library.

2011-04-26 16:38:00 -07:00

obex

am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

2011-04-19 16:01:36 -07:00

opengl

fix (Again) adding OES postfix when looking for gl functions

2011-05-11 20:37:47 -07:00

packages

resolved conflicts for merge of 0e59729b to master

2011-05-12 15:39:41 -07:00

policy

Merge changes I21e9629e,I535ed3ba

2011-05-11 09:31:08 -07:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

Merge "Add initial API for stylus and mouse buttons."

2011-05-13 12:14:27 -07:00

telephony

resolved conflicts for merge of 74af525e to master

2011-05-13 14:01:16 -07:00

test-runner

Rework display size access.

2011-04-21 15:17:52 -07:00

tests

even more logging

2011-05-13 10:30:17 -07:00

tools

am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

2011-04-27 13:48:45 -07:00

voip

update for new audio.h header location

2011-05-12 14:09:57 -07:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00

Android.mk

Full local backup infrastructure

2011-05-10 17:52:51 -07:00

CleanSpec.mk

The decoder wrapper is no longer needed. Also disable building old-style decoders.

2011-05-12 11:24:13 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

resolved conflicts for merge of 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -08:00

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%