Commit Graph

139873 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
Sungsoo Lim
b0586c9228 Merge "Make getAvailability() always return true" 2014-06-19 23:04:31 +00: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
Jinsuk Kim
d1fdf0238a Merge "Report device status event in HdmiControlService" 2014-06-19 22:55:19 +00:00
Jinsuk Kim
4893c7efde Report device status event in HdmiControlService
This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.

Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
2014-06-20 07:26:17 +09: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
Sungsoo Lim
ab981c5653 Make getAvailability() always return true
Bug: 15745402
Change-Id: If40ecef74e5bd7124e0020fcdbcd4637b2d82d97
2014-06-19 23:58:27 +09:00
Stephen Hines
7f22d01545 am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:26:15 +00:00
Stephen Hines
c5b11fcc1f am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'ff83ed2dc34f0595bcff2cb7b5d71bb39191963e':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:18:17 +00:00
Quddus Chong
6f2b8e55ee am 99a25dd3: am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
* commit '99a25dd3912a67498966728dcf7834450fbba3f6':
  docs: Updates to L Preview Highlights.
2014-06-19 03:16:28 +00:00
Stephen Hines
ff83ed2dc3 am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'b02dadd47c20b65569413cb4575c6050fe7b609f':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:13:37 +00:00
Quddus Chong
99a25dd391 am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
* commit '84611a1fe13299e3279d9bc5b0a2ec33d54c7e92':
  docs: Updates to L Preview Highlights.
2014-06-19 03:12:34 +00:00
Brian Carlstrom
7f047f02ad am 80f1fe5f: am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8':
  Switch from core to core-libart
2014-06-19 02:16:34 +00:00
Brian Carlstrom
80f1fe5f7c am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
  Switch from core to core-libart
2014-06-19 02:08:10 +00:00
Brian Carlstrom
f8077cf2d7 am 8e21e215: Merge "Switch from core to core-libart"
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart
2014-06-19 02:03:35 +00:00
Quddus Chong
84611a1fe1 Merge "docs: Updates to L Preview Highlights." into klp-modular-dev 2014-06-19 00:17:11 +00:00
Quddus Chong
17305644a8 docs: Updates to L Preview Highlights.
Change-Id: Ie64c90eebab7fc740c30f6881e6408d634e0c919
2014-06-18 20:02:24 -07:00
Jason Sams
3aa4de11b0 am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b
2014-06-18 23:08:35 +00:00
Jason Sams
802aaf3b9d am 47de3060: Merge "Fix element size on 64b"
* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b
2014-06-18 22:54:08 +00:00
Stephen Hines
b02dadd47c Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 2014-06-18 22:48:04 +00:00
Brian Carlstrom
8e21e21550 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom
dbcae5ceb7 Switch from core to core-libart
Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
2014-06-18 17:43:27 -07: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
Brian Attwell
0d8acb2ceb Merge "setSelectedHeader() when switching to fragment" 2014-06-18 19:24:54 +00:00
Ye Wen
5376c00db3 Merge "Move IMms.aidl to frameworks/base (2/3)" 2014-06-18 19:24:54 +00:00
Ye Wen
369a107fd6 Move IMms.aidl to frameworks/base (2/3)
Change-Id: Ia771496f92a841c72d950212b2f525aa0c733d7f
2014-06-18 18:25:20 -07:00
Winson Chung
47d1206fb8 Merge "Toggling Recents from home should actually toggle Recents instead of launching the first task." 2014-06-19 00:17:11 +00:00
Winson Chung
1f76132d4d Toggling Recents from home should actually toggle Recents instead of launching the first task.
Change-Id: Id60c54839c9f13299ec8d514e73e37c10735f30c
2014-06-18 18:21:42 -07:00
Winson Chung
7ab650cb43 Adding start delay to the task view transforms.
- Adding slight delay to task bar buttons to allow touch feedback to show

Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13
2014-06-18 14:30:32 -07:00
George Mount
1798208443 Merge "Fix blinking animation during Visibility transitions." 2014-06-18 19:24:54 +00:00
Robert Ly
8312bfd618 am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
* commit '5cfea84264911b93057a667cbcaf90e10740d658':
  docs: add allowembedded
2014-06-18 18:33:31 +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
Chris Craik
e48df00575 Merge "Clean up tessellation cache in prep for other tesselation types" 2014-06-18 19:24:54 +00:00
Chris Craik
6ac174b972 Clean up tessellation cache in prep for other tesselation types
bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
2014-06-18 15:31:55 -07: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
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions.
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
2014-06-18 11:13:06 -07:00
Quddus Chong
82ea0eb213 am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
* commit 'ef655f26fceba274b75e41f0b085434aa12914c8':
  docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
2014-06-18 16:07:41 +00:00
Quddus Chong
ef655f26fc docs: Added "games" metadata tag for Play Games landing page in d.a.c.
Bug: 15709471

Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
2014-06-18 08:57:24 -07:00
Stephen Hines
fa1275a6e7 Create FieldPacker.getPos() to get the actual amount of data used for FP.
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.

We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.

Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
2014-06-18 00:24:44 -07:00