Commit Graph

266851 Commits

Author SHA1 Message Date
Adrian Roos
ac2b44f502 Merge "Fix crash with intent-less actions" into nyc-dev 2016-05-31 20:51:50 +00:00
Roshan Pius
7bc0adbced WifiManager: Add new API's for backup/restore
Expose new API's to retrieve data to be backed up for Wifi
configurations and to restore configurations from the data.
BackupSettingsAgent will invoke these API's to backup/restore wifi
settings.

BUG: 28967335
Change-Id: I64e2f37a29d538d976bcc53dd2165653073b5862
2016-05-31 13:36:38 -07:00
Roshan Pius
651209b597 XmlUtils: Add missing readThisByteArrayXml method
Add the missing XML to byte array conversion method.

While there,
1. Fix writeByteArrayXml method to store the hex chars of the value.
2. Cleanup couple of error strings in |readThisIntArrayXml| method.

BUG: 29039296
Change-Id: I6386f7df7c5c8b7bc3bc5a268196da617209cea9
TEST: Compiles & manual testing.
2016-05-31 13:36:32 -07:00
Jorim Jaggi
4c1e147085 Merge "Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391 am: 0172bea180" into nyc-mr1-dev-plus-aosp
am: bc46818d2f

* commit 'bc46818d2fd7f9c22bf6579948f6944d6c21d52b':

Change-Id: Ia7565b134f5bf7a85ca001197e4ac1d05a71535d
2016-05-31 20:36:06 +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 a379fad3b9)
2016-05-31 20:32:55 +00:00
Jorim Jaggi
0cb9a7950d Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391 am: 8ff8259ca4
am: 92d960cd58

* commit '92d960cd58a36db136e9bebac5bd655fb53967cf':
  Fix multi-window enter animation

Change-Id: I967fe8a5160825ad1a85af9ff91b1b6640b28eeb
2016-05-31 20:29:48 +00:00
Android Build Merger (Role)
bc46818d2f Merge "Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391 am: 0172bea180" into nyc-mr1-dev-plus-aosp 2016-05-31 20:24:06 +00:00
Jorim Jaggi
61fcda205d Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391
am: 0172bea180

* commit '0172bea180debdbbb319bd811ceee054d1ec17a6':
  Fix multi-window enter animation

Change-Id: Id19c16dd9947291c736873e3b81b50b7262b55cb
2016-05-31 20:23:32 +00:00
Jorim Jaggi
92d960cd58 Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391
am: 8ff8259ca4

* commit '8ff8259ca40d72e4288ce2ddc8cb7cb4270c2ed9':
  Fix multi-window enter animation

Change-Id: I32393099407a36c3c7125435eaa4dbeb7f4518ef
2016-05-31 20:23:22 +00:00
Jorim Jaggi
8ff8259ca4 Merge "Fix multi-window enter animation" into nyc-dev
am: 0c54d2c391

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

Change-Id: I89b75e2ab9b8fa5a628e77ed9ebd09b70f6a2dc4
2016-05-31 20:17:07 +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
TreeHugger Robot
50d3baa543 Merge "Don't assert on uris with stack." 2016-05-31 19:59:42 +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
14dfdb44ef Merge "Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev am: ddc6de1eda am: f874020399" into nyc-mr1-dev-plus-aosp
am: dfb1e36b9c

* commit 'dfb1e36b9cf2cf46688890320971830f3dbadd95':

Change-Id: I6dc18c9bcc70d9eb0468730f6b8254d90ce2c084
2016-05-31 19:54:44 +00:00
Selim Cinek
5651fb55be Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 80b8e67a99
am: 01d7ef6909

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

Change-Id: Ifcb87972b511760726ac634b4499478d56cb0e34
2016-05-31 19:54:41 +00:00
Yigit Boyar
a16f58c49b Merge "Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 8e5e136403" into nyc-mr1-dev-plus-aosp
am: 30da26af1b

* commit '30da26af1b82b2e1c88b6da98c2423828044c44e':

Change-Id: I75c9a947e1cd308222969b5b5b7dc4e85a3fa1d5
2016-05-31 19:52:41 +00:00
Yigit Boyar
a71a70335d Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 1968ffe284
am: cd44c1631f

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

Change-Id: I32e6b83700ca9ba9799a1bd4349f2ca2d44b8e61
2016-05-31 19:51:29 +00:00
Jason Monk
e5107a36b0 QS: Only put visible tiles in listening state
- Make it so the QSPanel doesn't listen until expansion starts
 - Push listening state through the TileLayout
 - Make PagedTileLayout only listen for visible pages
 - Push setListening onto background thread

Change-Id: Id7c008c9447f9a5dac69469fef72bc580f423b0c
Fixes: 28962155
2016-05-31 15:49:35 -04:00
Android Build Merger (Role)
dfb1e36b9c Merge "Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev am: ddc6de1eda am: f874020399" into nyc-mr1-dev-plus-aosp 2016-05-31 19:42:09 +00:00
Selim Cinek
7e960f8346 Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev am: ddc6de1eda
am: f874020399

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

Change-Id: I329adba60f2f1214b47dbbf897d4165c61dee80a
2016-05-31 19:41:42 +00:00
Yigit Boyar
01d7ef6909 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17
am: 80b8e67a99

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

Change-Id: Ica5eb674e8c12a633c86c3cfb6620bed08fae117
2016-05-31 19:39:47 +00:00
Selim Cinek
f874020399 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: Iaa2ddc8bedaad3623190e65116f0d8b85687eb78
2016-05-31 19:36:27 +00: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
Android Build Merger (Role)
30da26af1b Merge "Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 8e5e136403" into nyc-mr1-dev-plus-aosp 2016-05-31 19:35:33 +00:00
Yigit Boyar
353c0ac661 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17
am: 8e5e136403

* commit '8e5e13640310b6decd388732d35efa45d8324e5b':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I9ff38e783e393aac70faa376c135aa6d3d9e9dfa
2016-05-31 19:34:32 +00:00
Yigit Boyar
cd44c1631f Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17
am: 1968ffe284

* commit '1968ffe2845b5a98ff9f3bc9bf549d9db981e5ad':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I77dccc2452243bba6461e5adc80e703b1b1755b4
2016-05-31 19:34:05 +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
1968ffe284 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
am: bb039d2f17

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

Change-Id: I5d139388bea3610d2e1de2ded48ae7a510d2aba7
2016-05-31 19:26:11 +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
b9746650a4 Updated image sizes and wrapped text around images. am: 1ce2279423 am: 2cbac3c122 am: 9801a9269c am: 68efdf6758
am: 174a6865a2

* commit '174a6865a2440c66572415860b6d3466f4b3ac4d':

Change-Id: I4e9d4276f932c6b4e6540d6d19fd7ebfa7d9ca08
2016-05-31 19:03:40 +00:00
Christopher Tate
1d7d9404e0 Don't back up/restore the "automatically restore app data" setting
It stomps on the Setup Wizard intended [or user-supplied!] behavior.

Bug 29030834

Change-Id: Iabb0ff88b7f8b9130abb59af68872d02e5534140
2016-05-31 12:03:25 -07:00
Ian Rogers
88e376dac4 Fix call to equals that could never succeed.
Caught by Error Prone.
Bug: 27723540

Change-Id: I9368201b37818f145b5ffc33130fbfd7d03e48aa
2016-05-31 12:03:25 -07:00
sreevanis
d6d52575bd Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25 am: c854e70a49
am: a97bf41819

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

Change-Id: I10dd7c4de37b934ad71225f70c3820c1b403fb7e
2016-05-31 18:59:13 +00:00
sreevanis
174a6865a2 Updated image sizes and wrapped text around images. am: 1ce2279423 am: 2cbac3c122 am: 9801a9269c
am: 68efdf6758

* commit '68efdf6758bd0393c12f907fbad5a0364f21ffdc':

Change-Id: I8893d8e091202344241beaa642d49c23020fed1b
2016-05-31 18:58:24 +00:00
Eric Schmidt
804482222c docs: Fixed 'MessageStyle' typo
Bug: 28964745
Change-Id: Ida96fbae10fa70c4cfffdad8642cfb4c8132c3a3
2016-05-31 11:56:03 -07:00
TreeHugger Robot
a190e12f59 Merge "am/UserController: Log system uptime at two 'boot complete' markers." 2016-05-31 18:55:22 +00:00
Chris Tate
0674c15e55 Merge "Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25 am: 4d628b86e4" into nyc-mr1-dev-plus-aosp
am: 867c8eb374

* commit '867c8eb3740db0126d00a77311d767e176b339ef':

Change-Id: I940e4f4c2ee0c9d88be98033ed09b78463913201
2016-05-31 18:54:18 +00:00
Chris Tate
a97bf41819 Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25
am: c854e70a49

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

Change-Id: Id5bc196c525b93576cfd307de75e7a6c718f07f7
2016-05-31 18:54:14 +00:00
Christopher Tate
996bca5aa6 Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25 am: 6dd6046b8a
am: 9c7d3987ff

* commit '9c7d3987ff20d474a68b22d0274c026b4eb45f88':
  Build JobStatus objects outside the lock

Change-Id: I9773852423969eb1f9148d10e8bec2790cdac99d
2016-05-31 18:54:09 +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
68efdf6758 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: I38c62368040c897d9c1ea1875a1951b2801b4df2
2016-05-31 18:50:11 +00:00
Android Build Merger (Role)
867c8eb374 Merge "Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25 am: 4d628b86e4" into nyc-mr1-dev-plus-aosp 2016-05-31 18:49:05 +00:00
Chris Tate
5cd3591987 Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25
am: 4d628b86e4

* commit '4d628b86e407747ee641253fbdc723a41fa380d7':
  Build JobStatus objects outside the lock

Change-Id: I288ab060fdd5f831a9363d66c8f2220439e00eae
2016-05-31 18:48:27 +00:00
Chris Tate
9c7d3987ff Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce25
am: 6dd6046b8a

* commit '6dd6046b8aa33e249cd087bcf693a0112eea5f40':
  Build JobStatus objects outside the lock

Change-Id: I185a6e0b21c95ffddef692818eb72b86d1125f78
2016-05-31 18:48:21 +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
6dd6046b8a Merge "Build JobStatus objects outside the lock" into nyc-dev
am: 87ad1fce25

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

Change-Id: I41a7cd9fcf04e0ad40334e4a470a028bbb871752
2016-05-31 18:42:09 +00:00