157366 Commits

Author SHA1 Message Date
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
2014-11-19 15:29:47 -08:00
Andres Morales
5aadd5b6fa Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 2014-11-17 21:53:58 +00:00
Winson Chung
fe79d62db3 Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 2014-11-17 21:43:51 +00:00
Geoff Mendal
6e523a077f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 21:33:38 +00:00
Craig Stout
36fbc43787 Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 2014-11-17 21:28:25 +00:00
Geoff Mendal
44e4ff746a Import translations. DO NOT MERGE
Change-Id: I67abea60870f468d3ad9a6be7ee600de99b8ff54
Auto-generated-cl: translation import
2014-11-17 13:07:17 -08:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent.
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
2014-11-17 21:03:10 +00:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Craig Stout
9eef7bce56 Use dark theme for usb dialogs on television.
b/16488215

Change-Id: I8ea2a184b2df36e3f55ba5bd0e8fb121ef0ed48e
2014-11-17 12:36:15 -08:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00
Geoff Mendal
9d8c759879 am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '27b8033175a748438891dc9da498ff354cce82a0':
  Import translations. DO NOT MERGE
2014-11-17 19:51:34 +00:00
Winson Chung
fe03b40da4 Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)
Change-Id: I46a324b3b6acba6b6519506ff2431d285e3b57f9
2014-11-17 11:47:09 -08:00
Geoff Mendal
27b8033175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-17 19:45:13 +00:00
Geoff Mendal
c81a3e16e7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 19:43:10 +00:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Jim Miller
cd75f59f8c Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 2014-11-17 19:29:01 +00:00
Wale Ogunwale
465e996776 Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 2014-11-17 19:27:08 +00:00
Ricardo Cervera-Navarro
b04c3d6208 am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs
* commit 'bb987493d6d858948b294b7b2f15b6ba67e39fd0':
  docs:eclipse-migrate update
2014-11-17 19:24:30 +00:00
Jorim Jaggi
6a388ef85e Merge "Don't play hint animation when touching to wake up" into lmp-mr1-dev 2014-11-17 19:22:39 +00:00
Ricardo Cervera-Navarro
bb987493d6 am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs
* commit '96424f4a43dfe52cb156a19194984ece3eab6699':
  docs:eclipse-migrate update
2014-11-17 19:20:19 +00:00
Jorim Jaggi
da5a28635a Merge "Always set correct policy visibility" into lmp-mr1-dev 2014-11-17 19:20:13 +00:00
Stuart Scott
b19acb9993 Merge "Updating Subscription Info Icon" into lmp-mr1-dev 2014-11-17 19:16:51 +00:00
Ricardo Cervera-Navarro
96424f4a43 am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs
* commit '5b11c51d87ad99d0ccad6bf8b3d1bd4f626e5f48':
  docs:eclipse-migrate update
2014-11-17 19:14:40 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
2014-11-17 19:11:40 +00:00
Ricardo Cervera-Navarro
5b11c51d87 Merge "docs:eclipse-migrate update" into lmp-docs 2014-11-17 19:07:04 +00:00
Geoff Mendal
db7fca54b9 Import translations. DO NOT MERGE
Change-Id: Idd82327920b27757f3d124092f9d5cf1c36cc938
Auto-generated-cl: translation import
2014-11-17 10:55:47 -08:00
Geoff Mendal
adaa819bb7 Import translations. DO NOT MERGE
Change-Id: I31a7c6bc19264abd28b4c6d85e2fd94e6fd8f8ff
Auto-generated-cl: translation import
2014-11-17 10:41:15 -08:00
Dianne Hackborn
76919595f4 Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 2014-11-17 18:33:10 +00:00
Eino-Ville Talvala
bad677f3c2 Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev 2014-11-17 18:27:37 +00:00
Jorim Jaggi
abcb0590cd Don't play hint animation when touching to wake up
Bug: 18146441
Change-Id: Ie7e17a26c70d4fb0dd94787cce9e5baa0d775bde
2014-11-17 19:15:22 +01:00
Jorim Jaggi
235607589c Always set correct policy visibility
Windows without a surface didn't get the correct policy visibility
applied after dismissing lockscreen. Thus, when launching something
from lockscreen, home activity was hidden but never set to visible
again. Before executing the transition to home, we didn't consider
home as a wallpaper target because it was still invisible, and thus
we picked the wrong transition.

Always applying policy visibility when lockscreen changes fixes this
outdated state.

Bug: 18369599
Change-Id: I2933eaf0ab55fe31cb382c46c411033e33a756e0
2014-11-17 19:15:22 +01:00
Ying Wang
7f5fbe9e11 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 2014-11-17 18:14:25 +00:00
Ying Wang
867a0de0b4 Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev 2014-11-17 18:14:06 +00:00
Eino-Ville Talvala
126a7468c2 Camera2: Add BURST_CAPTURE capability flag
This capability (a subset of FULL) indicates that a camera device
can capture high-rate (>= 20fps) bursts of images at full device
resolution, in at least the YUV_420_888 format.

It also guarantees that the synchronization latency for a device is
relatively small, so that fixed-setting bursts can be captured quickly.

Bug: 18281970
Change-Id: Ifc8fc43252a77097d804429d1c9f6fa71a95aa4f
2014-11-17 17:50:05 +00:00
Adrian Roos
8c8d8b1012 Merge "Only keep user switcher bitmaps if needed" into lmp-mr1-dev 2014-11-17 17:33:50 +00:00
Jeff Sharkey
9c76a7b3e8 Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
* changes:
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
2014-11-17 17:28:54 +00:00
Adrian Roos
cba0faadbe Only keep user switcher bitmaps if needed
Only keeps icons if the user switcher is accessible. On phones, this
is any time quick settings is expanded. On tablets, this would be whenever
the keyguard shows. Reloading them on each screen off transition seems too
wasteful however, so we keep them in-memory all the time on tablets.

Bug: 18350670
Change-Id: I416beb82156787e61ee1f59b6726fd702f135f68
2014-11-17 18:08:16 +01:00
Adrian Roos
a1b32c47f5 Merge "Reduce user icon RAM usage" into lmp-mr1-dev 2014-11-17 16:43:51 +00:00
Adrian Roos
2b154a9ec3 Reduce user icon RAM usage
Reduces the size of the icon in UserInfoController. Also
prevents UserSwitcherController from being instantiated if user
switching is not available.

Bug: 18350670
Change-Id: I38fbf28fad87e5c0d999ab6e3764f93269a95e05
2014-11-17 15:58:25 +00:00
John Reck
b3ec64e100 Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 2014-11-17 15:19:23 +00:00
John Spurlock
99cc4d2ed1 Merge "Sysui: Align projection permission dialog checkbox." into lmp-mr1-dev 2014-11-17 15:10:55 +00:00
John Spurlock
9ac580f0f3 Merge "QS: Update detail item keyline." into lmp-mr1-dev 2014-11-17 15:10:24 +00:00
Adrian Roos
61a848dd2e Merge "Fix Bitmap leaks in ImageWallpaper" into lmp-mr1-dev 2014-11-17 13:50:59 +00:00
Selim Cinek
a7651b8705 Merge "Increases the falsing threshold when for the keyguard affordances" into lmp-mr1-dev 2014-11-17 12:54:56 +00:00
Ying Wang
0de36e51c5 Move preloaded-classes out of framework.jar.
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
2014-11-17 10:15:39 +00:00
John Spurlock
37e68bdb9c Sysui: Align projection permission dialog checkbox.
Bug: 18392920
Change-Id: Ic74ce8c79c99d91b5493a0b0607cda356f727407
2014-11-16 13:05:59 -05:00
Prashant Malani
4d269ba320 am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
* commit 'fb26a2c80b988118983251caf36492f2ae39559c':
  Don't animate screen brightness if there is a pending off transition
2014-11-15 09:56:57 +00:00
Prashant Malani
fb26a2c80b Merge "Don't animate screen brightness if there is a pending off transition" into lmp-sprout-dev 2014-11-15 09:46:33 +00:00
Tom Turney
2a46722f96 Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes." into lmp-mr1-dev 2014-11-15 03:00:07 +00:00
Christopher Tate
824392bdbd Don't crash just because invalid datasets were offered for restore
In practice, recognize that the current transport state may not yet
incorporate a valid restore data stream object, so don't go making
assumptions that it's usable / closeable / etc.

Bug 18379004

Change-Id: I221e04b5b83438e37455e025d67f412d3abb8c50
2014-11-14 18:27:36 -08:00