frameworks_base

Go to file

Simon Wilson 62388cfc1f resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp

Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416

2011-05-26 12:53:15 -07:00

api

am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)

2011-05-25 14:46:25 -07:00

build

Fix the naming of the heap growth limit property.

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

cmds

resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp

2011-05-19 12:48:14 -07:00

core

am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2

2011-05-26 11:02:52 -07:00

data

am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)

2011-05-25 14:46:25 -07:00

docs

Swap Mifare for MIFARE.

2011-05-25 17:37:51 -05:00

drm

Fix for bug 4126624.

2011-03-24 13:14:02 -07:00

graphics

am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2

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

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:46:53 -07:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:46:53 -07:00

location

Fix the javadoc for LocationManager.requestSingleUpdate()

2011-03-29 11:26:08 -07:00

media

am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

2011-05-25 14:57:45 -07:00

native

Add "television" mode.

2011-05-23 15:11:08 -07:00

nfc-extras

Implement dead service recovery in NFC extras library.

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

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

fix [4107131] nvidia driver call takes a very long time

2011-03-16 14:19:03 -07:00

packages

am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2

2011-05-26 11:02:52 -07:00

policy

am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)

2011-05-25 14:46:25 -07:00

sax

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

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

services

am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2

2011-05-26 11:02:52 -07:00

telephony

resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp

2011-05-26 12:53:15 -07:00

test-runner

DO NOT MERGE. Integrate from master: Rework display size access.

2011-05-16 11:58:27 -07:00

tests

am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2

2011-05-09 17:10:34 -07:00

tools

am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2

2011-05-25 14:42:06 -07:00

voip

am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

2011-05-05 18:02:47 -07:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

Clear network id when invalid

2011-05-23 17:02:11 -07:00

Android.mk

am 1c71fffe: update platform version number for docs

2011-05-05 15:18:19 -07:00

CleanSpec.mk

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -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 adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -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%