Chad Brubaker
c67f201607
Merge \\\"Use NoPreloadHolder for certificate sources\\\" into nyc-dev am: c738e48ed6 am: 66bd9229dd
...
am: 8ae604b6f1
2016-06-14 01:01:32 +00:00
Chad Brubaker
8ae604b6f1
Merge \\"Use NoPreloadHolder for certificate sources\\" into nyc-dev am: c738e48ed6
...
am: 66bd9229dd
2016-06-14 00:57:03 +00:00
Yohei Yukawa
e3d3740f1c
Merge \\"Add InputConnection#insertContent().\\" into nyc-mr1-dev am: 03f759e87e
...
am: 176642ec2c
2016-06-14 00:52:36 +00:00
Chad Brubaker
66bd9229dd
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
...
am: c738e48ed6
2016-06-14 00:49:25 +00:00
Yohei Yukawa
176642ec2c
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
...
am: 03f759e87e
2016-06-14 00:38:47 +00:00
TreeHugger Robot
c738e48ed6
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev
2016-06-14 00:35:49 +00:00
Yohei Yukawa
03f759e87e
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
2016-06-14 00:26:39 +00:00
Roozbeh Pournader
547b74394a
Merge "Switch to standard SI prefixes for kilobyte etc"
2016-06-13 23:09:00 +00:00
Adrian Roos
5adaba4b21
Merge \"Merge \\\"Add MessagingStyle transitions\\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf\" into nyc-mr1-dev-plus-aosp
...
am: 70cfa1625b
2016-06-13 22:52:58 +00:00
Makoto Onuki
eacbc45469
Merge \"Merge \\\"Push DO/PO package names from DPMS to PM\\\" into nyc-dev am: f419bd9e03 am: 93322e6818\" into nyc-mr1-dev-plus-aosp
...
am: 1dc43402e9
2016-06-13 22:52:46 +00:00
Chad Brubaker
319f9fe102
Use NoPreloadHolder for certificate sources
...
The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.
Bug: 29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3
2016-06-13 15:51:40 -07:00
Daniel Nishi
b382bb2c2f
Merge \"Merge \\"Add a flag to toggle how much the storage manager should retain.\\" into nyc-mr1-dev am: 7374971c28\" into nyc-mr1-dev-plus-aosp
...
am: 5fdb94ce1e
2016-06-13 22:48:42 +00:00
Doris Liu
c88ded5a50
Merge \"Merge \\\"Fix setCurrentPlayTime for started but not yet pulsed animations\\\" into nyc-dev am: 42d39300cf am: a28f0003eb\" into nyc-mr1-dev-plus-aosp
...
am: 18b9573517
2016-06-13 22:39:07 +00:00
Yorke Lee
c516cde56d
Merge \\\"Check for detached view in drag-related APIs\\\" into nyc-dev am: cdc9d7bed9 am: 71ab239765
...
am: 23b3de425a
2016-06-13 22:36:04 +00:00
Android Build Merger (Role)
70cfa1625b
Merge "Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf" into nyc-mr1-dev-plus-aosp
2016-06-13 22:34:23 +00:00
Adrian Roos
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
2016-06-13 22:33:38 +00:00
Android Build Merger (Role)
1dc43402e9
Merge "Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03 am: 93322e6818" into nyc-mr1-dev-plus-aosp
2016-06-13 22:32:05 +00:00
Makoto Onuki
31a5d3affa
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03
...
am: 93322e6818
2016-06-13 22:30:20 +00:00
Doris Liu
7fc18d996f
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am: 42d39300cf
...
am: da1cd7a43f
2016-06-13 22:30:12 +00:00
Daniel Nishi
d630a5b9a4
Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev
...
am: 7374971c28
2016-06-13 22:28:18 +00:00
Svetoslav Ganov
b01939c3b3
Merge \\\"Fix permissions update for VrListenerService on user changes.\\\" into nyc-dev am: d054f4f2fe am: 3224aa7505
...
am: 3505a88472
2016-06-13 22:28:12 +00:00
Doris Liu
5bc7bf3305
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am: 42d39300cf
...
am: a28f0003eb
2016-06-13 22:27:27 +00:00
Yorke Lee
67fb47fb9f
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9
...
am: fead52ebf4
2016-06-13 22:27:22 +00:00
Yorke Lee
23b3de425a
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9
...
am: 71ab239765
2016-06-13 22:27:20 +00:00
Ruben Brunk
3505a88472
Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe
...
am: 3224aa7505
2016-06-13 22:21:04 +00:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
2016-06-13 22:20:05 +00:00
Makoto Onuki
93322e6818
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 22:17:10 +00:00
Doris Liu
da1cd7a43f
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
...
am: 42d39300cf
2016-06-13 22:16:57 +00:00
Yorke Lee
71ab239765
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
2016-06-13 22:14:24 +00:00
Svetoslav Ganov
5d411eb81a
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
...
am: d054f4f2fe
2016-06-13 22:14:09 +00:00
Adrian Roos
c8649b381d
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
2016-06-13 21:55:06 +00:00
Adrian Roos
a5e2aa99c0
Merge "Add MessagingStyle transitions" into nyc-dev
2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3
Add MessagingStyle transitions
...
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00
TreeHugger Robot
58806af09c
Merge "new ClipData constructor."
2016-06-13 21:30:48 +00:00
Makoto Onuki
78f16950c6
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 21:23:18 +00:00
Daniel Nishi
7374971c28
Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev
2016-06-13 21:18:29 +00:00
Makoto Onuki
f419bd9e03
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
2016-06-13 21:16:29 +00:00
Doris Liu
a28f0003eb
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
...
am: 42d39300cf
2016-06-13 20:31:32 +00:00
Doris Liu
42d39300cf
Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev
2016-06-13 20:24:45 +00:00
Yorke Lee
fead52ebf4
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
2016-06-13 20:15:15 +00:00
TreeHugger Robot
cdc9d7bed9
Merge "Check for detached view in drag-related APIs" into nyc-dev
2016-06-13 20:09:43 +00:00
Svetoslav Ganov
3224aa7505
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
...
am: d054f4f2fe
2016-06-13 20:03:40 +00:00
Ruben Brunk
d054f4f2fe
Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev
2016-06-13 19:58:31 +00:00
Steve McKay
57eaaf6857
new ClipData constructor.
...
Add new constructor with args: ClipDescription, ArrayList<Item>.
This allows description and item list to be constructed separately.
Change-Id: I09f63d308dbafdb2c749019848afb0d2d24b8c44
2016-06-13 12:54:14 -07:00
Roozbeh Pournader
dce22f0406
Merge "Clean up TextUtils.doesNotNeedBidi()"
2016-06-13 19:53:32 +00:00
Yorke Lee
07452c37ab
Check for detached view in drag-related APIs
...
Bug: 29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
2016-06-13 11:32:23 -07:00
Daniel Nishi
c535be179a
Add a flag to toggle how much the storage manager should retain.
...
This flag is used to set how many days of storage the automatic
storage manager will retain when clearing data.
Bug: 28965462
Change-Id: I87afafb7d3252d8c390ea43b7c45fd923f911e4e
2016-06-13 10:54:31 -07:00
Doris Liu
caa2ebf814
Fix setCurrentPlayTime for started but not yet pulsed animations
...
Also fix the behavior for calling reverse() immediately after
start(). Such case now triggers end() right away, which is
consistent with what the animation would do in M.
Bug: 29271714
Change-Id: I045e36e039179a3c462f22bc6a3a765437de4074
2016-06-13 17:29:03 +00:00
Andreas Gampe
3196999a50
Merge \\"Otadexopt: Expose progress percentage\\" into nyc-mr1-dev am: b71c36b000
...
am: cda39b3af7
2016-06-13 17:02:11 +00:00
Andreas Gampe
cda39b3af7
Merge \"Otadexopt: Expose progress percentage\" into nyc-mr1-dev
...
am: b71c36b000
2016-06-13 16:58:06 +00:00
