Doris Ling
8cdceba0dc
Merge \\"Added config system navigation keys.\\" into nyc-mr1-dev am: 32300db186
...
am: 4be6c44ee2
2016-06-14 22:57:23 +00:00
Doris Ling
4be6c44ee2
Merge \"Added config system navigation keys.\" into nyc-mr1-dev
...
am: 32300db186
2016-06-14 22:39:50 +00:00
Doris Ling
32300db186
Merge "Added config system navigation keys." into nyc-mr1-dev
2016-06-14 22:35:19 +00:00
TreeHugger Robot
8cf1cf99c9
Merge "Notify end animation after setting the state to not running."
2016-06-14 22:15:41 +00:00
Adrian Roos
87818fa11c
Merge \\\"Fix jittery action bar during transitions\\\" into nyc-dev am: 8507d98ad1 am: 2c50962538
...
am: f381297dea
2016-06-14 19:59:02 +00:00
Adrian Roos
2c0c3b941b
Merge \\\"Make RemoteView margins density-change safe\\\" into nyc-dev am: 26e864c398 am: 06976edc0b
...
am: eac63514e4
2016-06-14 19:58:59 +00:00
Adrian Roos
f381297dea
Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
...
am: 2c50962538
2016-06-14 19:53:31 +00:00
Adrian Roos
eac63514e4
Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
...
am: 06976edc0b
2016-06-14 19:53:25 +00:00
Adrian Roos
2c50962538
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:59 +00:00
Adrian Roos
746a64493b
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:41:57 +00:00
Adrian Roos
ba38cc6992
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:54 +00:00
Adrian Roos
8507d98ad1
Merge "Fix jittery action bar during transitions" into nyc-dev
2016-06-14 19:31:25 +00:00
Adrian Roos
26e864c398
Merge "Make RemoteView margins density-change safe" into nyc-dev
2016-06-14 19:31:14 +00:00
Makoto Onuki
1424be1e60
Merge \\\"Don\\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\\" into nyc-dev am: 5e94a16b74 am: f7c91b8838
...
am: df30e75294
2016-06-14 18:37:54 +00:00
Makoto Onuki
df30e75294
Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
...
am: f7c91b8838
2016-06-14 18:32:35 +00:00
Makoto Onuki
f7c91b8838
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:26:00 +00:00
Makoto Onuki
e220722bdf
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:25:25 +00:00
Makoto Onuki
5e94a16b74
Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev
2016-06-14 18:17:01 +00:00
George Mount
0eba1dfba0
Notify end animation after setting the state to not running.
...
Bug 28404635
Change-Id: I13a480b54bb652e52d6b36addfe6d3799ece7568
2016-06-14 10:35:31 -07:00
Aurimas Liutikas
73e88e9a5a
Merge "Clarify Fragment#onHiddenChanged() documentation."
2016-06-14 17:32:04 +00:00
TreeHugger Robot
b58b9c2c27
Merge "Fix mapping two shared elements to a single shared element."
2016-06-14 17:31:18 +00:00
Selim Cinek
2975ddfe75
Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev am: 05e19bba37 am: 844d178c2e
...
am: bac9f44555
2016-06-14 17:16:50 +00:00
Aurimas Liutikas
c3cfdaf651
Clarify Fragment#onHiddenChanged() documentation.
...
Prior comment said that fragment was hidden for both true and false
values of hidden.
Bug:
https://code.google.com/p/android/issues/detail?id=53178
Change-Id: I453ff52692157cffafef34d165c1436e845c217d
2016-06-14 17:08:00 +00:00
Selim Cinek
bac9f44555
Merge \\"Fixed a bug with a legacy notification API\\" into nyc-dev am: 05e19bba37
...
am: 844d178c2e
2016-06-14 17:07:52 +00:00
Selim Cinek
1eb9ae9220
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:40 +00:00
Selim Cinek
844d178c2e
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:39 +00:00
Selim Cinek
05e19bba37
Merge "Fixed a bug with a legacy notification API" into nyc-dev
2016-06-14 16:54:21 +00:00
Makoto Onuki
26704957fe
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
...
This method is called by AM with the lock held, so can't take the
DPMS lock.
It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.
Bug 29242568
Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6
2016-06-14 09:41:21 -07:00
George Mount
358856356c
Fix mapping two shared elements to a single shared element.
...
Bug 29090777
Change-Id: I7b51527096f0fb6564e3d84575b2270bc577fc68
2016-06-14 08:35:09 -07:00
Tomasz Mikolajewski
eacd7b9d5c
Merge \\\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\\" into nyc-dev am: ac3fe8fffe am: be6e44cdfa
...
am: 55ab54e33d
2016-06-14 04:39:25 +00:00
Tomasz Mikolajewski
55ab54e33d
Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am: ac3fe8fffe
...
am: be6e44cdfa
2016-06-14 04:34:50 +00:00
Tomasz Mikolajewski
be6e44cdfa
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
...
am: ac3fe8fffe
2016-06-14 04:24:44 +00:00
Tomasz Mikolajewski
499ab43ce3
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
...
am: ac3fe8fffe
2016-06-14 04:24:39 +00:00
Tomasz Mikolajewski
ac3fe8fffe
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
2016-06-14 04:15:26 +00:00
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
Chad Brubaker
193efc8bd0
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
...
am: c738e48ed6
2016-06-14 00:47:21 +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
Selim Cinek
4ac6f6010b
Fixed a bug with a legacy notification API
...
When using setLatestEventInfo the icons would not be shown
at all anymore, leading to a crash if they were grouped.
This CL makes sure the smallIcon is always set even for those
legacy apps.
It also fixes the usage of setShow when, as legacy apps wouldn't
have the time anymore.
Change-Id: I2645175b2adabcedbbfec7a502b89d143d2b9bd3
Fixes: 29255365
Fixes: 27430676
2016-06-13 15:47:03 -07:00
Adrian Roos
f852a42b04
Fix jittery action bar during transitions
...
Fixes a bug where the action bar would get cut off slightly
resulting in a bad transition when transforming between action
bars that were correct and those that were cut off.
Fixes: 28935363
Change-Id: I7d8eeb5e5fa545820a8979ea09816b330bdb384b
2016-06-13 15:39:11 -07:00
