Commit Graph

256895 Commits

Author SHA1 Message Date
Android Build Merger (Role)
87f3aeeee2 Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 am: 260167cada" into nyc-mr1-dev-plus-aosp 2016-05-27 04:03:59 +00:00
Bert McMeen
6f609c484d Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53
am: 260167cada

* commit '260167cada82f55272aabcf85da37effd2326c9e':
  docs: Refinements for testing

Change-Id: I3019173298bce29e130a13f21ddcc1dee6202b1b
2016-05-27 04:02:36 +00:00
Android Build Merger (Role)
90fa062c1a Merge "Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc am: af7d6fa9a7" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:41 +00:00
Android Build Merger (Role)
81956e5fc6 Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 am: 769c456bc1" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:31 +00:00
Android Build Merger (Role)
8e98306631 Merge "Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f am: 9e2c84014f" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:20 +00:00
Android Build Merger (Role)
27432f0d60 Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae am: 0361d504da" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:02 +00:00
Android Build Merger (Role)
eced95f626 Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 am: d9c9b591b7" into nyc-mr1-dev-plus-aosp 2016-05-27 04:00:51 +00:00
sreevanis
726681f117 Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc
am: af7d6fa9a7

* commit 'af7d6fa9a708605f9af1579d06f7b8ce0615f23b':
  Updated link to material design page.

Change-Id: I0860fc89cf1eccc6b074d11d8ed46b960ed9b457
2016-05-27 04:00:04 +00:00
John Reck
397b124477 Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6
am: 769c456bc1

* commit '769c456bc13f7c6b539e192fe01d1dcf788de0c4':
  Change overdraw test to use windowbackground

Change-Id: Ibd770a8021e879a2164dc1b10df3b5a8a93387e7
2016-05-27 03:59:46 +00:00
Kevin Hufnagle
b402e3ea65 Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f
am: 9e2c84014f

* commit '9e2c84014fcf852b5f796689a891e5919a3cc508':
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.

Change-Id: I279fdda9500f6ee002955b8224ac1f9b4824b0d2
2016-05-27 03:59:27 +00:00
Selim Cinek
e844788417 Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae
am: 0361d504da

* commit '0361d504da7a842108218deed7610e26ba783089':
  Fixed the relative time spoken with accessibility

Change-Id: I52740a97b660f996f0212e4be7c363180cefb242
2016-05-27 03:59:08 +00:00
Chris Tate
5295bc4ebd Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198
am: d9c9b591b7

* commit 'd9c9b591b72c33db2328f89a0268120e034cc450':
  Use backstop timeouts on asynchronous countdown during preflight

Change-Id: I1728d393ac230278baff2cccbaa32c1b457a286c
2016-05-27 03:58:45 +00:00
Android Build Merger (Role)
364e2b07a5 Merge "Fix toast with accessibility and app pinning am: cf984c56ad am: 8e68533c9d" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:50 +00:00
Android Build Merger (Role)
522a19a330 Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d am: b148f83ec0" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:38 +00:00
Android Build Merger (Role)
149ba9af6e Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: a868723467" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:26 +00:00
Android Build Merger (Role)
144a044308 Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f am: ae2a646295" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:16 +00:00
Android Build Merger (Role)
626e587b56 Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f am: c1434b4559" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:05 +00:00
Jorim Jaggi
a5dd071a21 Fix toast with accessibility and app pinning am: cf984c56ad
am: 8e68533c9d

* commit '8e68533c9d8b87122bdb07993b061113082a679f':
  Fix toast with accessibility and app pinning

Change-Id: I9028532f6e758ec947deda2ab76606042f896524
2016-05-27 03:56:18 +00:00
George Mount
af0b74e906 Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d
am: b148f83ec0

* commit 'b148f83ec0f7b77e18d1e6c0d6072bedc19349f0':
  Fix Activity Transition mess-up.

Change-Id: I4bf8510cb21e4f35f1a935f2885b14bc511c47ac
2016-05-27 03:55:43 +00:00
Android Build Merger (Role)
0c67994e33 Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:25 +00:00
Wyatt Riley
726c1300a7 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219
am: a868723467

* commit 'a86872346728c3d6a3d8ea948204cf374dcaea73':
  Prevent use of a null sCallbackObj by Hardware FLP

Change-Id: Iacb495c4c26c4d79042e91575b3f7cdfb84b6e5c
2016-05-27 03:55:19 +00:00
Android Build Merger (Role)
7f65fca112 Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e am: 59fd8dce39" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:16 +00:00
Android Build Merger (Role)
daaa2eed9a Merge "Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c am: 51a8c19fb2" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:07 +00:00
Android Build Merger (Role)
6e5260f24f Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: 06fac4f77b" into nyc-mr1-dev-plus-aosp 2016-05-27 03:54:59 +00:00
Alan Viverette
b53dea88c7 Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f
am: ae2a646295

* commit 'ae2a6462952a650c185b11fff2ad12958539b650':
  Prevent callbacks during DrawableContainer child initialization

Change-Id: I2953ce50d4bb64a4587491bbf152379c04ec8689
2016-05-27 03:54:57 +00:00
Android Build Merger (Role)
61903f9151 Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: c67c7c0799" into nyc-mr1-dev-plus-aosp 2016-05-27 03:54:51 +00:00
Winson Chung
28f356f05e Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f
am: c1434b4559

* commit 'c1434b455916dc102ea61c293d90021ae8e84c04':
  Fixing crash in SysUI due to invalid group.

Change-Id: Ief9b53c8d500ad213cf9cc771bc655eb5f282b9a
2016-05-27 03:54:34 +00:00
Adam Lesinski
408002879c Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d
am: fc7c27b215

* commit 'fc7c27b21596fbc379d08add355b90893d9a0e25':
  Fix issue where max idle time > total idle time

Change-Id: Ie247488ca42fbd3c214a7c493ac17dea74c9dde4
2016-05-27 03:54:15 +00:00
Adrian Roos
869fa28697 Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e
am: 59fd8dce39

* commit '59fd8dce39b12ed3055fc17ab09c6bcf5d1c3c0a':
  Fix spurious crashes in StatusBarIconView

Change-Id: I83bb9580dc834ae9b490328aea9a1ab99416065f
2016-05-27 03:54:10 +00:00
Roozbeh Pournader
c680b76894 Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c
am: 51a8c19fb2

* commit '51a8c19fb26103a0c1205ebc69b3dfcca3ab5b40':
  Ellipsize Preference summaries

Change-Id: I320a1fc57f0f651577e1345334c3757730119f60
2016-05-27 03:54:05 +00:00
Wale Ogunwale
e7d5974077 Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7
am: 06fac4f77b

* commit '06fac4f77bd63909098914385be01d929a2336e8':
  Protect against NPE while to updating service connection activities.

Change-Id: Ibdb5d96f6678ec75e597312371ca9b8f7e8d084b
2016-05-27 03:53:58 +00:00
Rob Carr
b4f8d09b28 Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf
am: c67c7c0799

* commit 'c67c7c079915946c9ae100ed02982a826ec06e3a':
  Ensure surfaces only resize during relayout.

Change-Id: I06c2e7eca16710a3296264754f96880995e9e51b
2016-05-27 03:53:48 +00:00
Android Build Merger (Role)
d065fe5be5 Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035 am: 82aba559fa" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:34 +00:00
Android Build Merger (Role)
d5b17b2688 Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397 am: ec298b1567" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:23 +00:00
Android Build Merger (Role)
a3b87c5d16 Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b am: 2efd671e48" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:13 +00:00
Android Build Merger (Role)
19e8f51d7e Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30 am: d5fada7253" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:02 +00:00
Android Build Merger (Role)
268b04e160 Merge changes from topic 'am-e885a22f20324bb0b94c97a807186535' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651 am: 3f9059fb8d
  Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205 am: 7eb7b41510
2016-05-27 03:52:50 +00:00
Android Build Merger (Role)
04e20d3805 Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a am: 26ae893c03" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:32 +00:00
Android Build Merger (Role)
f4e1c42240 Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:12 +00:00
Android Build Merger (Role)
5af6e7d4b5 Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: 8d27936438" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:04 +00:00
Android Build Merger (Role)
3b5aac257b Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:57 +00:00
Android Build Merger (Role)
e6c133249b Merge "Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 am: c37fb8aa6e" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:49 +00:00
Android Build Merger (Role)
93c1d3aa6e Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 am: d76cc5d107" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:41 +00:00
Daniel Sandler
1882e0e8f4 Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035
am: 82aba559fa

* commit '82aba559fabd18dd0c0a7e47e6e1581e22b3b3c1':
  Time to #NameAndroidN!

Change-Id: I3835b4fb0c1b8df86069147f6970302e63f2c544
2016-05-27 03:51:28 +00:00
Jeff Sharkey
917bc8f303 Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397
am: ec298b1567

* commit 'ec298b1567c4ca16438ce63252408879056f81c5':
  Delay PACKAGE_RESTARTED until after data cleared.

Change-Id: I88f76b508b928375f36e6d1f110a823b18746e6c
2016-05-27 03:51:00 +00:00
Garfield Tan
da19f14dd5 Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff
am: f846d8518b

* commit 'f846d8518bdf788bbba9ace89d8fd04c79946edd':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: I13b89ea99d8319da7cbb001a024814757b1beec7
2016-05-27 03:50:58 +00:00
Robin Lee
212083bd4f Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801
am: 8d27936438

* commit '8d2793643843471a23ebad38acb4ef1f544ecb98':
  Move VPN restriction check into setup dialog

Change-Id: I4beb9edb0ec4631cef969250e36083a518e2d9b7
2016-05-27 03:50:50 +00:00
Jorim Jaggi
e6e9a701f2 Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3
am: 03d0a3aeff

* commit '03d0a3aeffe0dddfa1c2cfc26df0a155d7470f4f':
  Handle trampoline activites in different tasks

Change-Id: I5ed39794c95de8fa36388cb9080a5727837c9ee2
2016-05-27 03:50:40 +00:00
Jeff Sharkey
ea46d115bb Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b
am: 2efd671e48

* commit '2efd671e48d7cd47484cb90f2b0c594c6aecd7ed':
  Careful process validation for unaware providers.

Change-Id: I6fde850370e497f732ede1ec0ee572ca647a8496
2016-05-27 03:50:33 +00:00
Akshay Thakker
173e2e6b90 Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440
am: c37fb8aa6e

* commit 'c37fb8aa6e2094336201840ec0a44aa0a5ad6913':
  Finalize resource IDs for N.

Change-Id: Ide5ce846a130624db23ab3df2fa3fc70d4e04eab
2016-05-27 03:50:27 +00:00