246109 Commits

Author SHA1 Message Date
Andrii Kulian
ae01e27755 Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce
2016-06-01 01:20:50 +00:00
Andrii Kulian
88be465ce5 Merge "Update override config to include some changes from global config" into nyc-dev 2016-06-01 01:08:37 +00:00
Lajos Molnar
c4da6b9962 Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am: a72a83a172

* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
  media: avoid recursion when evaluating profile support

Change-Id: I2ba4a9e16b1989cb05291f9db2412c61bf3e2d07
2016-06-01 01:05:47 +00:00
TreeHugger Robot
a72a83a172 Merge "media: avoid recursion when evaluating profile support" into nyc-dev 2016-06-01 00:58:29 +00:00
Hall Liu
561df62a52 Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
2016-06-01 00:33:39 +00:00
Hall Liu
d7007923c5 Merge "Add null check in showLockTaskToast" into nyc-dev 2016-06-01 00:25:05 +00:00
sergeyv
c4d91f0bbf Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am: 21a608f27f

* commit '21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
  HWUI: do nothing in case of empty layer

Change-Id: Iec199a2a20c9981922468c3a33065a86f818d833
2016-06-01 00:20:56 +00:00
Sergei Vasilinetc
21a608f27f Merge "HWUI: do nothing in case of empty layer" into nyc-dev 2016-06-01 00:15:32 +00:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
2016-05-31 16:41:27 -07:00
Christopher Tate
7d45e0231e Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am: cd0aa9cda8

* commit 'cd0aa9cda8e57c224b473198a345fb008fe30b5a':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I3b28a8c03cee7fe6f85540f1f679de10de09923c
2016-05-31 23:13:20 +00:00
Jorim Jaggi
b5952d22f0 Merge "Enforce background fallback to be non-translucent" into nyc-dev
am: a35724f666

* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
  Enforce background fallback to be non-translucent

Change-Id: If68ead500309566e66230b079f71667e0d555be0
2016-05-31 23:02:23 +00:00
Chris Tate
cd0aa9cda8 Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev 2016-05-31 22:59:26 +00:00
Hall Liu
45784f13ef Add null check in showLockTaskToast
Bug: 29056498
Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
2016-05-31 15:50:48 -07:00
Jorim Jaggi
a35724f666 Merge "Enforce background fallback to be non-translucent" into nyc-dev 2016-05-31 22:50:09 +00:00
Christopher Tate
09d7d8f674 Don't bother with WeakHashMap for direct alarm bookkeeping
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.

Bug 28987260

Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
2016-05-31 15:19:47 -07:00
Steve McKay
5371f04cac Merge "Don\'t assert on uris with stack." into nyc-dev
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
2016-05-31 22:10:08 +00:00
TreeHugger Robot
760b557158 Merge "Don't assert on uris with stack." into nyc-dev 2016-05-31 22:03:29 +00:00
Joe Onorato
668a60bf8d Merge "Turn this wtf into just a log." into nyc-dev
am: 1755dd08cb

* commit '1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
  Turn this wtf into just a log.

Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10
2016-05-31 21:50:18 +00:00
TreeHugger Robot
1755dd08cb Merge "Turn this wtf into just a log." into nyc-dev 2016-05-31 21:42:46 +00:00
George Mount
27a0e5a632 Merge "Better handling of confused finish transition." into nyc-dev
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
2016-05-31 21:37:51 +00:00
TreeHugger Robot
2fd9cd7cbb Merge "Better handling of confused finish transition." into nyc-dev 2016-05-31 21:31:31 +00:00
sergeyv
aebbbef565 HWUI: do nothing in case of empty layer
bug:28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
2016-05-31 14:18:02 -07:00
Todd Kennedy
4fb6509032 Merge "Remove STOPSHIP" into nyc-dev
am: 1c39a112b4

* commit '1c39a112b43e50da4e801d634e28ae7a130c0dcb':
  Remove STOPSHIP

Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
2016-05-31 21:14:37 +00:00
Todd Kennedy
1c39a112b4 Merge "Remove STOPSHIP" into nyc-dev 2016-05-31 21:07:34 +00:00
Sharvil Nanavati
7a845c5283 Merge "Clean up Bluetooth test code." into nyc-mr1-dev 2016-05-31 21:03:46 +00:00
Adrian Roos
e090dcbc8a Merge "Fix crash with intent-less actions" into nyc-dev
am: ac2b44f502

* commit 'ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
  Fix crash with intent-less actions

Change-Id: Ifa3e489a206c04b43d9747bd260156e346111d3e
2016-05-31 20:59:07 +00:00
Adrian Roos
ac2b44f502 Merge "Fix crash with intent-less actions" into nyc-dev 2016-05-31 20:51:50 +00:00
Steve McKay
3c6d499858 Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit a379fad3b9b9e708e9211f7c026ddd13572fc16e)
2016-05-31 20:32:55 +00:00
Jorim Jaggi
0172bea180 Merge "Fix multi-window enter animation" into nyc-dev
am: 0c54d2c391

* commit '0c54d2c391b6d781fc660646e731f562bcd7037f':
  Fix multi-window enter animation

Change-Id: I85cb5a7ee1ce17e21bb52052c77352e065354734
2016-05-31 20:16:13 +00:00
Andrii Kulian
f12fce1a3a Update override config to include some changes from global config
In override config for task we set Configuration#screenLayout field based on
initial global config + shrink to fit the area on screen given for this task.
However this field also contains information (like layout direction) that we
do not intend to override and it can be changed in global config separately.
In this case we need to update the override config with changes from global
config.

Bug: 28616488
Change-Id: I22673257621b3f9ae7933b37bd0fb9446c6042ea
2016-05-31 13:14:55 -07:00
Jorim Jaggi
0c54d2c391 Merge "Fix multi-window enter animation" into nyc-dev 2016-05-31 20:08:50 +00:00
Jorim Jaggi
8e879f1fec Enforce background fallback to be non-translucent
To avoid screen garbage or wallpaper shining through, the background
we use there for filling the whole needs to

a) Be non-translucent in all cases except if the window is translucent.
b) Don't infer it from the theme as it might be unexpected. Don't define
it in the theme, and use black if it's not defined.

Bug: 28763785
Change-Id: Ifb724b5c5feea3ed70d68e5bd7615fa91185e743
2016-05-31 20:05:37 +00:00
George Mount
5ae0b7abf0 Better handling of confused finish transition.
Bug 28347277

When an activity calls startActivity with makeSceneTransitionAnimation
and then calls finishAfterTransition, it should not do any transition
and just finish.

Change-Id: I00e537638fa6f24c95605f09bbafd843b569bb4d
2016-05-31 12:58:52 -07:00
Selim Cinek
80b8e67a99 Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev
am: ddc6de1eda

* commit 'ddc6de1eda495790e6564438994df5d49ddf248f':
  Fixed a few accessibility issues with notifications and groups

Change-Id: Ieec9526a2c54edd2f0d3b34973cc61f610f452ae
2016-05-31 19:36:21 +00:00
Selim Cinek
ddc6de1eda Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev 2016-05-31 19:26:16 +00:00
Yigit Boyar
8e5e136403 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
am: bb039d2f17

* commit 'bb039d2f17d61b96c88d2cae445a53a642fb421f':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I204f80216fb0594b7c7cb6070add58e91003b7a7
2016-05-31 19:26:09 +00:00
Yigit Boyar
bb039d2f17 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev 2016-05-31 19:20:21 +00:00
sreevanis
c854e70a49 Updated image sizes and wrapped text around images. am: 1ce2279423 am: 2cbac3c122
am: 9801a9269c

* commit '9801a9269c6fcdc9996fb752b2421eb409fc3b09':
  Updated image sizes and wrapped text around images.

Change-Id: I82a1e05d0c1da0560dff4199c36ce75f094064a0
2016-05-31 18:50:20 +00:00
sreevanis
9801a9269c Updated image sizes and wrapped text around images. am: 1ce2279423
am: 2cbac3c122

* commit '2cbac3c122e1114f72ef44c3e62c8ec7c372db94':
  Updated image sizes and wrapped text around images.

Change-Id: Ie0df8af83058bf81a71f6fb75cb71b453ad9f47e
2016-05-31 18:45:36 +00:00
Christopher Tate
4d628b86e4 Merge "Build JobStatus objects outside the lock" into nyc-dev
am: 87ad1fce25

* commit '87ad1fce254bdb398c5a33753f0368a596fd81f0':
  Build JobStatus objects outside the lock

Change-Id: I91f11f9de40e5d8cfa8c5619796dedd56c490eb5
2016-05-31 18:42:03 +00:00
sreevanis
2cbac3c122 Updated image sizes and wrapped text around images.
am: 1ce2279423

* commit '1ce2279423a544d431bf6b64f2bfeb1a4617120b':
  Updated image sizes and wrapped text around images.

Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
2016-05-31 18:39:38 +00:00
Chris Tate
87ad1fce25 Merge "Build JobStatus objects outside the lock" into nyc-dev 2016-05-31 18:36:49 +00:00
sreevanis
1ce2279423 Updated image sizes and wrapped text around images.
Fixed messagingstyle link in api-overview page.

Bug:28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
2016-05-31 10:55:13 -07:00
Joe Onorato
9d97ee2ad2 Turn this wtf into just a log.
We're seeing this a bunch, but the overhead from the WTF is concerning.
So turn it off.  It means that somewhere there is a race in tearing
down the app, or maybe some place fails to call back in some scenario.

Bug: 28932059
Change-Id: Ice14ade95bb9377ad622d440fb022953ad51c34c
2016-05-31 10:49:08 -07:00
Hall Liu
49459e4ee8 Merge "Disable app pinning when emergency call button pressed" into nyc-dev
am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: Ibe8d37716ad1630359b3ef08350f485b0d1177a7
2016-05-31 17:37:37 +00:00
Ricky Wai
f2ca8f9c50 Merge "Do not get device owner admin info when device owner is null" into nyc-dev
am: 21f98459b7

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de
2016-05-31 17:37:33 +00:00
Hall Liu
8b655e0f57 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 2016-05-31 17:29:37 +00:00
Daniel Yu
674cfd13af Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f
am: 24d5e1b9ec

* commit '24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I269a97d21f165148512cd6a76a262839bb659a41
2016-05-31 17:25:26 +00:00
Ricky Wai
21f98459b7 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 2016-05-31 17:22:55 +00:00
Dan Yu
24d5e1b9ec Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c
am: 2ad3221e5f

* commit '2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
2016-05-31 17:21:48 +00:00