frameworks_base

Go to file

Jean-Baptiste Queru 4a967dabc3 merge-ignore changes that were already in or that are not relevant

Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD

2009-07-16 13:47:28 -07:00

api

am 6ce4236d: Merge change 7401 into donut

2009-07-15 18:14:38 -07:00

awt

Removed system/framework/android.awt.jar.

2009-07-02 14:11:33 -05:00

build

auto import from //depot/cupcake/@135843

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

camera/libcameraservice

resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

cmds

Squashed commit of the following:

2009-07-16 09:49:14 -07:00

core

Merge change 7534

2009-07-16 12:33:32 -07:00

data

am 37b939a6: Merge change 7395 into donut

2009-07-15 14:39:48 -07:00

docs

Example for displaying alerts was missing an "@" for theme attribute

2009-07-07 12:43:56 -07:00

graphics/java

am 6b532800: Merge change 6478 into donut

2009-07-08 10:45:52 -07:00

im/java/android/im

auto import from //depot/cupcake/@135843

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

include

New test player stub to load mock native players.

2009-07-16 11:22:31 -07:00

keystore

Add password field for WiFi configuration.

2009-07-05 11:06:01 +08:00

libs

Merge change 7491

2009-07-16 12:58:54 -07:00

location/java

am b82759a0: Merge change 6906 into donut

2009-07-14 12:54:41 -07:00

media

Merge change 7399

2009-07-16 11:55:45 -07:00

obex

Fix a bug introduced in obex cleanup

2009-07-15 18:08:10 -07:00

opengl

remove libagl's dependency on gralloc_priv.h

2009-07-15 18:53:32 -07:00

packages

am 83fa3565: Merge change 7356 into donut

2009-07-15 13:41:54 -07:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

Send all battery broadcasts with REGISTERED_ONLY_BEFORE_BOOT

2009-07-16 13:28:23 -07:00

telephony/java

Merge change 7526

2009-07-16 10:12:13 -07:00

test-runner

Merge change 6223

2009-07-09 15:35:41 -07:00

tests

am 5a76ae46: Merge change 7406 into donut

2009-07-15 18:14:12 -07:00

tools

Format aapt warnings the same way as other compiler warnings

2009-07-13 14:14:01 -07:00

vpn/java/android/net/vpn

Make VPN connect even when DNS is not present and other fixes.

2009-07-14 16:29:22 +08:00

wifi/java/android/net/wifi

resolved conflicts for merge of f7703519 to master

2009-07-14 21:44:30 -04:00

Android.mk

resolved conflicts for merge of b06ea706 to master

2009-07-14 12:51:00 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

Start using CLDR for some date-and-time strings and formats.

2009-05-15 10:15:50 -07:00

preloaded-classes

Rename the TextDialog to WebTextView.

2009-06-02 10:57:54 -04:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%