Alexander Hills
eb4420a985
Merge \\"Adds a flag to Action.WearableExtender to display actions inline on Wear\\" into nyc-mr1-dev am: 7816efa6af
...
am: c295774697
2016-06-15 19:40:19 +00:00
Aurimas Liutikas
6465299aec
Merge "Clarify Fragment construtor javadoc."
2016-06-15 16:37:39 +00:00
Alex Hills
c295774697
Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
...
am: 7816efa6af
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
2016-06-15 16:02:48 +00:00
Aurimas Liutikas
c59422a2c6
Clarify Fragment construtor javadoc.
...
Bug:
https://code.google.com/p/android/issues/detail?id=170497
https://code.google.com/p/android/issues/detail?id=55991
Change-Id: If2309f441bb947f32da60ba7926cc6796e472fdf
2016-06-14 16:50:07 -07:00
TreeHugger Robot
064aa25de3
Merge "Remove TransitionListener after transition completes."
2016-06-14 23:45:47 +00:00
Selim Cinek
a592bdf4ed
Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52bf am: 91965ce2e9
...
am: b3e68016e1
2016-06-14 23:24:39 +00:00
Selim Cinek
b3e68016e1
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
...
am: 91965ce2e9
2016-06-14 23:19:50 +00:00
Selim Cinek
91965ce2e9
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:12:12 +00:00
George Mount
25f98a4c01
Remove TransitionListener after transition completes.
...
Bug 22232371
Change-Id: I1ba6f8742792ff00996b7fdaa892d5e1388ef61c
2016-06-14 14:11:28 -07:00
Selim Cinek
279fa867e5
Fixed another case where the systemUI could crashloop
...
Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.
Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes: 29255365
2016-06-14 13:02:56 -07: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
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
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
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
Adrian Roos
2d5dbba923
Make RemoteView margins density-change safe
...
Bug: 28935363
Change-Id: I279da8da84f794c512a66cb46c76ae9e746a6387
2016-06-13 15:39:05 -07:00
Adrian Roos
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
2016-06-13 22:33:38 +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
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
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
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
