Commit Graph

37812 Commits

Author SHA1 Message Date
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
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
Robert Greenwalt
19f01ebe90 Merge "Remove Obsolete enable/disableApn functions." 2014-06-17 21:43:29 +00:00
Raph Levien
580ecd4b2b Merge "Simple implementation of drawPosText" 2014-06-19 14:48:39 +00: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
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
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
Andy McFadden
45b161d24d Merge "Make two Display methods public" 2014-06-18 22:47:18 +00:00
Andy McFadden
77db7d09ff Make two Display methods public
Un-hide getAppVsyncOffsetNanos() and getPresentationDeadlineNanos().

Bug 14612039

Change-Id: I76bee166b7bda3b96db36ffcb8d946d2b713ac09
2014-06-18 10:45:27 -07:00
Robin Lee
aab72f3b0a Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs""" 2014-06-17 21:55:55 +00:00
Robin Lee
306fe08ce2 Revert "Revert "Publish DevicePolicyManager CA certificate APIs""
This reverts commit 792b270dbdc980cfe04e8d461bf00a1f45b5e936.

Change-Id: I18c7e0eca39868230cd8e4f4bbeb3c44ff9e8b78
2014-06-19 14:04:24 +00:00
George Mount
54fb7e94d0 Merge "Handle interruptions in Explode and Slide transitions." 2014-06-19 00:17:11 +00:00
George Mount
1f8c01181b Handle interruptions in Explode and Slide transitions.
Bug 15618842

Change-Id: I22431b59c6516ee330d897791b79fa9ed17ba727
2014-06-18 16:48:45 -07:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Nicolas Prevot
e7cd37e613 Merge "Introducing crossProfileIntentFilters that skip the current profile." 2014-06-17 21:55:55 +00:00
Kenny Guy
f7ecf7c805 Add badging a label to support accessibility.
To provide a way to differntiate the content description
of an icon that has been badged with a managed profile
badge.

Bug: 15106236
Change-Id: Icd5798bbd2410a105054877e3862e199eff24b88
2014-06-19 13:17:02 +01:00
Nicolas Prevot
63798c596d Introducing crossProfileIntentFilters that skip the current profile.
For these crossProfileIntentFilters, the activities in the current profile cannot
respond to the intent.
Only activities in the target profile can respond to the intent.

BUG: 14936725

Change-Id: I5e2704c2b56ff50a8339dd49284956391d7fad7e
2014-06-18 14:13:19 +01:00
Jinsuk Kim
a062a9339a Implement portSelect/sendKeyEvent for HdmiControlService
TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.

Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
2014-06-18 03:53:16 +00:00
Alan Viverette
88dc8f1e41 Merge "Fix clamped starting position, seek bar hotspot bounds" 2014-06-18 18:28:24 +00:00
Alan Viverette
304624100b Fix clamped starting position, seek bar hotspot bounds
BUG: 15720430
Change-Id: I11d40c747ea1a3665e9e2058d95dda1bc8a547ab
2014-06-18 17:54:58 -07:00
Alan Viverette
29fa90490b Merge "Fix switch & slider anim, make View drawable hotspot API public" 2014-06-18 18:28:24 +00:00
Alan Viverette
8de1494557 Fix switch & slider anim, make View drawable hotspot API public
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
2014-06-18 18:05:15 -07:00
Jeff Sharkey
65dfc83cef am b9a45aae: am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit 'b9a45aae8d07e7a92806b53cbc36f5488e3bac2d':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:17:03 +00:00
Jeff Sharkey
b9a45aae8d am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit '447b68e767943fdde297d78321378e2623985a0a':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:11:51 +00:00
Jeff Sharkey
b5e05cffcc Merge "Fixing parcel leaks to avoid virtual memory leak" 2014-06-18 22:48:04 +00:00
Maunik Shah
db1a9a3862 Fixing parcel leaks to avoid virtual memory leak
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC

Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
2014-06-19 19:44:21 +05:30
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
Christopher Tate
9c46e06478 Merge "Introduce <application> attribute android:fullBackupOnly={boolean}" 2014-06-17 21:43:29 +00:00
Christopher Tate
d1de2567c6 Introduce <application> attribute android:fullBackupOnly={boolean}
It is quite possible for an application to be happy with having the OS
save full-data archives of its data, but still need to selectively
filter the set of saved files or otherwise participate in full-data
backup and restore.  In general we assume that any app which provides
a backup agent implementation will be directly participating via the
incremental key/value backup API; this new attribute allows an app
to tell the OS "perform full-data backup/restore for me even though
I am supplying my own agent implementation to participate."

Change-Id: I810c50d44aa683b1f23604b7d1f3e96a1722103a
2014-06-17 18:02:48 -07:00