Commit Graph

8476 Commits

Author SHA1 Message Date
Alex Hills
c295774697 Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
am: 7816efa6af

Change-Id: Idcf5a780abc93b3a7c5d3e497b98352ddc26d257
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
Selim Cinek
b3e68016e1 Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
am: 91965ce2e9

Change-Id: Ia6dfb5ba27696eb4938f528a57374ae8ef0be16c
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

Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f
2016-06-14 23:12:12 +00: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
f381297dea Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
am: 2c50962538

Change-Id: Ibb907f480b0c11839a2fc33ec95ff77b8a54b244
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

Change-Id: I2f59abdfcfd28876995b98b13ce15a40d601ca3f
2016-06-14 19:53:25 +00:00
Adrian Roos
2c50962538 Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941
2016-06-14 19:41:59 +00:00
Adrian Roos
746a64493b Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I1a445bc9ce438432643f94ec912b7838b55849dd
2016-06-14 19:41:57 +00:00
Adrian Roos
ba38cc6992 Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I3098eb8a803de7bc471bb362a2eb01b7f6d473ce
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
df30e75294 Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
am: f7c91b8838

Change-Id: Idbbc9d23187489903ecd27d3c24d688464d1273c
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

Change-Id: I61c3582d8b51124b33b39249f20bdfe71e764a69
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

Change-Id: I7e4d1044616bdb6e88c96dc1f79ab683b760bc5a
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
Selim Cinek
bac9f44555 Merge \\"Fixed a bug with a legacy notification API\\" into nyc-dev am: 05e19bba37
am: 844d178c2e

Change-Id: I5d0a1bc53d71e4f84668fc3e964d89c075395236
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

Change-Id: If9bd17e99ba4665f49f873bf01e0d1db01d49f54
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

Change-Id: I419b48b3a4e73b5cc1c7597d885541f4b163a00f
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
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

Change-Id: Ifd034837a0b82416e6f87dffb944b0761734a59a
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

Change-Id: I4fd9877c9e6adcdeeb17a9a5a2e70731f6e0b596
2016-06-13 22:30:20 +00:00
Ruben Brunk
3505a88472 Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe
am: 3224aa7505

Change-Id: I2e189f09f28a3b64c37da44caeb96af095cc1709
2016-06-13 22:21:04 +00:00
Adrian Roos
0a91c8dddf Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
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

Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
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

Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
2016-06-13 22:14:09 +00:00
Adrian Roos
c8649b381d Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0
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
Makoto Onuki
78f16950c6 Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am: f419bd9e03

Change-Id: Ic3071f3a712da72fd141ef37ac6aabe6dbd09355
2016-06-13 21:23:18 +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
Svetoslav Ganov
3224aa7505 Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am: d054f4f2fe

Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
2016-06-13 20:03:40 +00:00
Svetoslav Ganov
e33f613190 Fix permissions update for VrListenerService on user changes.
- Fixes a bug where we would not update the
overlay restrictions if the VR listener we are bound to
changes bug the VR enabled state doesn't.
- Also fixed a case where the notification listener access
and location permission were not granted/revoked for the
correct user. For example, if a vr activity in one user calls
a VR activity in another (possible for cross profiles) we end
up not revoking the special access for the vr service in the
first user. The notification listener setting was also updated
for the system user instead of the user for which we grant/revoke
specal access.
- Properly remove the overlay restrictions for the old user
if we transition from a vr actiivty in one user to a vr activity
in a profile of this user.

Bug: 29273985
Change-Id: Ib1de6f2f5445001ac61edca5c77ea3a066544307
2016-06-10 14:05:51 -07:00
Dianne Hackborn
773a45272b Merge \\"Fix more of issue #28689719: Runtime restart\\" into nyc-dev am: 4781525399
am: 6d8e471072

Change-Id: I30ca001929011e28a4b5e3e97d313bcced22b47e
2016-06-09 22:26:49 +00:00
Dianne Hackborn
a2cb7a0ef3 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I03d781408ef7b0c7c6156d6b63ca0ab4ee457ae1
2016-06-09 22:22:48 +00:00
Dianne Hackborn
6d8e471072 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
2016-06-09 22:22:00 +00:00
Chris Tate
3b2e584686 Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38
am: 4676cc96ac

Change-Id: I14d78f7d229c3691c11462c0e293219603f1ef2e
2016-06-09 22:16:39 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Christopher Tate
f252ef9ec1 Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
2016-06-09 22:13:43 +00:00
Christopher Tate
4676cc96ac Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Adam Lesinski
7cdd96ec10 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
am: 4b9a4a18f9

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358
2016-06-09 21:28:00 +00:00
Adam Lesinski
cdca6fe8a6 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
2016-06-09 21:24:09 +00:00
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
2016-06-09 21:22:34 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00