Shimeng (Simon) Wang 1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale. ...

If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164

2011-07-08 14:38:38 -07:00

api

Merge "Add charCount heuristic to TextView textDirection"

2011-07-01 14:15:08 -07:00

build

Change max heap size to 48MB

2011-06-22 16:12:41 -07:00

cmds

Revert "Add keychain user with special keystore access permissions"

2011-06-30 22:59:13 -07:00

core

Prevent set mInitialScale being overridden by mDefaultScale.

2011-07-08 14:38:38 -07:00

data

Merge "Permissions to protect bandwidth statistics."

2011-06-30 00:49:12 -07:00

docs

am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

2011-06-28 21:02:05 -07:00

drm

- Add two sanity checks.

2011-06-22 16:36:24 -07:00

graphics

Merge "Bug 4571308 Provide correct video frame timestamps"

2011-07-01 15:02:33 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Merge "Charge network traffic to the uid of the process using the MediaPlayer."

2011-07-01 14:28:10 -07:00

keystore

Build cert chain in KeyChain.getCertificateChain

2011-07-01 14:41:56 -07:00

libs

Merge "Minor fix in SurfaceTexture"

2011-06-30 18:38:18 -07:00

location

am e0009bb0: am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

2011-07-01 07:56:15 -07:00

media

Merge "Bug 4571308 Provide correct video frame timestamps"

2011-07-01 15:02:33 -07:00

native

Hover and stylus API cleanup.

2011-06-27 21:35:59 -07:00

nfc-extras

Add intent actions for new firmware events.

2011-06-27 18:46:31 -07:00

obex

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

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

opengl

Properly refcount SurfaceTexture in the JNI layer.

2011-06-15 16:14:26 -07:00

packages

Merge "When removing a task, also kill its processes."

2011-07-01 17:13:40 -07:00

policy

Merge "Binding Pwr+VolDown to take screenshot."

2011-07-01 10:48:07 -07:00

sax

…

services

Merge "When removing a task, also kill its processes."

2011-07-01 17:13:40 -07:00

telephony

Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code."

2011-07-01 13:19:37 -07:00

test-runner

Test runner cleanup: delete unused old classes.

2011-06-01 20:03:39 -07:00

tests

Merge "Support for maximum values in layout GridLayout."

2011-07-01 11:31:46 -07:00

tools

am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."

2011-06-23 14:30:25 -07:00

voip

Synchronize SipWakeupTimer.onReceive()

2011-06-30 18:17:27 +08:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

Merge "Fix IP address cleanup on network disconnect"

2011-06-17 10:09:36 -07:00

Android.mk

Merge "Implement APIs for Bluetooth Health profile."

2011-06-24 11:34:35 -07:00

CleanSpec.mk

KeyChain API refinements

2011-06-09 21:11:06 -07:00

MODULE_LICENSE_APACHE2

…

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%