139905 Commits

Author SHA1 Message Date
John Reck
7aab5a1f9f Add negative guard
Bug: 15631600

Change-Id: Idd7740f58876e73694fafb8ef55ebaff511f6dca
2014-06-20 09:59:56 -07:00
George Mount
9285d1bf9c Exclude views that aren't on screen from Activity Transitions.
Bug 15704207

Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
2014-06-20 14:09:57 +00:00
Nicolas Prevot
1e2f374e71 Merge "Making more ContentProviders work across users." 2014-06-20 04:43:13 +00:00
Andreas Gampe
b325ce8203 Add a null check to UserAvatarView.setBitmap
Adds a null check for the bitmap to set. Resets the paint's shader
in case of a null bitmap to release any previous image.

Change-Id: I1adf3c8ef44522a593fe3f25726b6c83120d7556
2014-06-19 23:51:12 -07:00
Dianne Hackborn
5ff885cd3b Revert "Add support for tint attribute in VectorDrawable"
This reverts commit ab41ea17e6b0407fa76bc9f9183190a9bbc7f560.

Was causing system UI to crash.
2014-06-19 23:02:37 -07:00
Jinsuk Kim
2a07054632 Merge "Do not have HdmiControlService report deviceEvent for TV itself" 2014-06-19 23:04:31 +00:00
Jinsuk Kim
13c030e828 Do not have HdmiControlService report deviceEvent for TV itself
DeviceEvent should be used only for the other logical device,
not the TV device itself.

Also fixed a but not updating the logical address after the allocation.

Change-Id: I80cec9d5bb4b95d003c9d1c7ea13f02d7e76b322
2014-06-20 13:28:29 +09:00
Dianne Hackborn
19bb5705e1 Merge "Fix build." 2014-06-20 00:06:01 +00:00
Dianne Hackborn
9226fc9bf5 Fix build.
Change-Id: I8b05b1dc4fdd0460c2dc92359b85d88b9f0f4f80
2014-06-19 18:32:08 -07:00
Selim Cinek
f99d000764 Improve unlock motion further.
Bug: 15244051
Change-Id: I6f567ff327695ec6ece56748cd300b8103715811
2014-06-20 01:19:40 +00:00
Jorim Jaggi
a800167e57 Merge "Hide status bar in bouncer" 2014-06-20 00:06:01 +00:00
Jorim Jaggi
44cf91960d Hide status bar in bouncer
Also, it gets faded in synchronously with the other unlock
animations.

Bug: 15407838
Change-Id: Ie161dfe970a2b4035a2d4cc7bb847285160cf691
2014-06-20 00:47:56 +00:00
Selim Cinek
89faff1dac Closing the QS when tapping on the notifications now.
Bug: 15394230
Change-Id: Ib9f750db69529afc0d56685fb88a13d183b0d3d5
2014-06-20 00:27:37 +00:00
Selim Cinek
00a78899af Merge "Scrimming the notifications when QS is open." 2014-06-20 00:11:43 +00:00
Selim Cinek
f54090e9bb Scrimming the notifications when QS is open.
Bug: 15394230
Change-Id: I4234bde0259ef296db73a43f69a765dbde5ddacd
2014-06-19 17:20:44 -07:00
Alan Viverette
a97f80562e Merge "Don't show text in Material-styled switch" 2014-06-20 00:11:43 +00:00
Alan Viverette
2a37cf8d76 Don't show text in Material-styled switch
BUG: 15754341
Change-Id: Iae43b31c6e445207a0c95b48d0f0befac0f5cc78
2014-06-19 17:09:10 -07:00
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
Alan Viverette
83415838cf Merge "Put dither in GradientDrawable constant state" 2014-06-20 00:06:01 +00:00
vandwalle
7610fa66cd add home network boost
Change-Id: I4b508b3f54304c0b3fea126c3905ed3322c2feee
2014-06-19 16:54:53 -07:00
Alan Viverette
07c661e677 Put dither in GradientDrawable constant state
Previously the dither attribute would be dropped when cloning a
gradient drawable from constant state. Also fixes ShapeDrawable
theme extraction.

BUG: 15754194
Change-Id: I3071f5b8236cfa6acb549627a3dfac0618518dbf
2014-06-19 16:15:53 -07:00
Jungshik Jang
7eca94c145 Merge "Use SystemAudioStatusAction in SystemAudioAction." 2014-06-19 23:04:31 +00: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
Sungsoo Lim
b0586c9228 Merge "Make getAvailability() always return true" 2014-06-19 23:04:31 +00:00
Adrian Roos
cdf74c2881 Merge "Implement keyguard user switcher" 2014-06-19 20:37:59 +00:00
Adrian Roos
8ddb2da875 Implement keyguard user switcher
Bug: 15545213
Change-Id: I2d18cc3c83d76991fe11fc4bff7e8eecc25df4b5
2014-06-19 15:47:46 -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
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
Jungshik Jang
16321b8007 Use SystemAudioStatusAction in SystemAudioAction.
SystemAudioAction includes SystemAudioStatusAction which
is required for SystemAudioAutoInitiationAction.

Change-Id: I9f2ae1ddea305e1c1e18410060842288c271cd4b
2014-06-19 20:00:52 +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