52986 Commits

Author SHA1 Message Date
Alan Viverette
e93c90126b Merge "Add support for tint attribute in VectorDrawable" 2014-06-20 00:06:01 +00:00
Alan Viverette
9a77cb92da Add support for tint attribute in VectorDrawable
Also fixes docs reference in TypedArray.

BUG: 15375203
Change-Id: I8cd2f43bd73f50084e21e5b986af9dc1c1447ad6
2014-06-19 17:16:17 -07:00
Craig Mautner
bb27b1c3a6 Merge "Allow a root activity to relinquish task identity" 2014-06-19 20:37:59 +00:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
2014-06-19 16:40:01 -07:00
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
2014-06-19 15:46:02 -07:00
Paul Soulos
5781fec20a Merge "Adds usage stat columns to Entity" 2014-06-19 22:33:55 +00:00
Paul Soulos
42cdda831d Adds usage stat columns to Entity
Change-Id: I273675ee85aba49440a494e4ae27e9104ffb2fe0
2014-06-19 16:13:38 -07:00
Jeff Sharkey
0270cfb71d Merge "Explicitly collect manifest digests." 2014-06-19 22:08:21 +00:00
Jeff Sharkey
032f2b246b Explicitly collect manifest digests.
Previously it was a side effect of collectCertificates().

Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
2014-06-19 15:49:05 -07:00
Brian Attwell
0d8acb2ceb Merge "setSelectedHeader() when switching to fragment" 2014-06-18 19:24:54 +00:00
George Mount
1798208443 Merge "Fix blinking animation during Visibility transitions." 2014-06-18 19:24:54 +00:00
Jeff Sharkey
7a2d46f39b Merge "Stronger PackageParser contract, more split work." 2014-06-18 18:28:24 +00:00
Jeff Sharkey
275e085d5a Stronger PackageParser contract, more split work.
Require that method callers always provide relevant paths, instead of
relying on constructor.  Move DisplayMetrics to be an overall parser
parameter, and move PARSE_TRUSTED_OVERLAY to flags.

Parse split APKs and apply deterministic ordering based on split
names.  Assert consistent package name and version code across all
split APKs in a package, and enforce unique split names and required
base APK.

Collect certificates for split APKs, enforcing they're all signed
consistently.  Better flow control and resource cleanup when
collecting certs.  Refactor validation code so it's easier to reason
about.  Cleaner maintenance of read buffer when draining stream
contents.

Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8
2014-06-18 16:04:13 -07:00
George Mount
52cd83e6cf Merge "Don't make translucent window opaque during activity transition." 2014-06-18 22:47:18 +00:00
Jason Monk
b593539faf Fix docs breakage from refactor
Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8
2014-06-18 18:28:46 -04:00
George Mount
3cc716c445 Don't make translucent window opaque during activity transition.
Bug 15535332

Returning transitions will continue to not work until
Bug 14869070 is fixed.

Change-Id: If0128b58eb852b037924ae6dea8e975fedbe5be7
2014-06-18 20:21:47 +00:00
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions.
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
2014-06-18 11:13:06 -07:00
Ruben Brunk
8bf102b1d2 Merge "camera2: Add shim frame duration and stall characteristics." 2014-06-17 21:43:29 +00:00
Ruben Brunk
3e4fed203f camera2: Add shim frame duration and stall characteristics.
Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
2014-06-19 14:50:45 -07:00
Alan Viverette
e3c433aa45 Persist selector on ListView and GridView layout
BUG: 15472031
Change-Id: I0d10be3e0cf8a4d7580bd834e432c1c15fc481f5
2014-06-19 14:36:59 -07:00
Yuncheol Heo
13045dd21c Add a config resource to support platform specific keysystems in WebView.
Bug: 11759895
Change-Id: I19cc044817706d5ec2f5a236218249c0e30f98d4
2014-06-20 06:21:13 +09:00
Yorke Lee
2e58ab7660 Merge "Add UNDEMOTE_METHOD to ContactsContract" 2014-06-19 14:48:39 +00:00
Yorke Lee
0e040b0ea1 Add UNDEMOTE_METHOD to ContactsContract
Bug: 15593967
Change-Id: I9404107d65a0e6ac5f58dd5dd4b6b5df519ec20f
2014-06-18 15:02:44 -07:00
Igor Murashkin
4961bc88d7 camera2: Map camera characteristics in the managed layer
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
2014-06-17 22:55:16 +00:00
fafaisland
5834ee7503 Merge "Add READ_ALL_VOICEMAIL permission in the core" 2014-06-17 21:46:58 +00:00
fafaisland
88fb96505c Add READ_ALL_VOICEMAIL permission in the core
Bug:15695227

Change-Id: I96bebcd949293679d938b2ec290820d4ed9035fa
2014-06-17 15:51:58 -07:00
John Reck
ca48160138 Merge "Throw ISE on too-big-views-with-layers" 2014-06-17 21:43:29 +00:00
John Reck
c25e506f7f Throw ISE on too-big-views-with-layers
Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
2014-06-18 14:31:52 -07:00
Mark Renouf
d1e01b7631 am 7deaf7c5: am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
* commit '7deaf7c5304aed9ca2ed6dc0e6c5e853127e6020':
  Limit swipe dismiss progress to positive values
2014-06-18 21:09:39 +00:00
Mark Renouf
7deaf7c530 am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
* commit 'f2dcb390444ffb42cf8637c99f53d821917554e6':
  Limit swipe dismiss progress to positive values
2014-06-18 19:37:02 +00:00
Griff Hazen
a2d30107c4 am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
  DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:18:24 +00:00
Colin Cross
0ead2a00f4 am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:53:09 +00:00
Colin Cross
88b37edaea Merge "Fix reading memory usage for 64-bit processes" 2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e Fix reading memory usage for 64-bit processes
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable.  Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping.  Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
2014-06-17 15:25:45 -07:00
Robert Greenwalt
19f01ebe90 Merge "Remove Obsolete enable/disableApn functions." 2014-06-17 21:43:29 +00:00
Raph Levien
17e64ffd85 Merge "Use Minikin grapheme cluster breaking" 2014-06-17 21:43:29 +00:00
Raph Levien
e368b6bcfd Use Minikin grapheme cluster breaking
This patch uses the Minikin implementation of grapheme cluster breaking,
which improves the behavior of left and right arrow keys for moving the
cursor. Among other things, it fixes the behavior of jumping over the
"fi" ligature in Roboto.

Part of a fix for b/15653110 Improve behavior of arrow keys in EditText

Change-Id: I80ca54c973d85c49f23b81d51a0fe07a7a853d81
2014-06-19 11:51:54 -07:00
Raph Levien
3f0d616722 Simple implementation of drawPosText
The existing implementation of drawPosText is broken in various subtle
ways, in any case doesn't work with Minikin. This patch just implements
it by drawing a separate run for each Unicode character, which should
have the least surprising results for complex scripts such as Khmer.

Part of b/11750374 Resolve TODO items for Minikin

Change-Id: I874ae3c163f0cbe3cdf0160564fab04305aed5aa
2014-06-19 11:22:45 -07:00
Andy McFadden
45b161d24d Merge "Make two Display methods public" 2014-06-18 22:47:18 +00:00
Baligh Uddin
09b75f9aba Merge "Import translations. DO NOT MERGE" 2014-06-19 00:17:11 +00:00
Raph Levien
580ecd4b2b Merge "Simple implementation of drawPosText" 2014-06-19 14:48:39 +00:00
ztenghui
65eb8e844e Merge "Add path support into xml files for PathInterpolator and ObjectAnimator." 2014-06-19 14:48:39 +00:00
ztenghui
cf4832f69c Add path support into xml files for PathInterpolator and ObjectAnimator.
The test case is showing that AnimatedVectorDrawable is able to use path to
define time interpolator and object movement now.

Change-Id: If3c0418265d0fd762c8f5f0bb8c39cce3ad34ef3
2014-06-19 10:56:28 -07:00
Adam Powell
adb11e0732 Merge "Fix ActionBar#isShowing when called before first layout" 2014-06-19 14:48:39 +00:00
Adam Powell
f65bfb700b Fix ActionBar#isShowing when called before first layout
Fix a regression introduced by the new hide offset API addition where
an action bar height of 0 (not yet measured) would cause the bar to be
considered hidden.

Bug 14574446

Change-Id: Ic8e22923ab59df6078136daa336e074c4b7adaf5
2014-06-19 10:55:28 -07:00
John Reck
af0b9c83a3 Merge "Revert changes to invalidateChild" 2014-06-19 17:43:18 +00:00
John Reck
96bb8adf4c Revert changes to invalidateChild
Bug: 15682142

 Apparently it's still necessary to invalidate the parent if a child
 is a hardware layer

Change-Id: Iaf4c1b49debd1b78b1fc8a095f685ddfcf752373
2014-06-19 10:54:40 -07:00
Eric Laurent
abd7b81b88 Merge "AudioTrack: Add support for compressed audio" 2014-06-19 14:48:39 +00:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
2014-06-19 10:13:33 -07:00