Commit Graph

256895 Commits

Author SHA1 Message Date
Chris Wren
e8491bf8c5 Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
am: 6c751b2e60

* commit '6c751b2e60868513f69f49a9b6662b9737979c94':
  boost starred people to at least high importance

Change-Id: Ie853218f61b2e089937482d0545e9acef1fe36fd
2016-05-26 23:24:29 +00:00
Bert McMeen
260167cada Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev
am: 3dba0fbd53

* commit '3dba0fbd5388c367d00543331bc2125dd2871786':
  docs: Refinements for testing

Change-Id: I461204b91cc09abb52906e6f437691e468661cb1
2016-05-26 23:17:31 +00:00
sreevanis
af7d6fa9a7 Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev
am: 3106e71ddc

* commit '3106e71ddc6ace7bc15b50e4a91ed98ed428bee2':
  Updated link to material design page.

Change-Id: If280c4efa95fe8179ac5053c2e34ff26c9158492
2016-05-26 23:17:24 +00:00
John Reck
769c456bc1 Merge "Change overdraw test to use windowbackground" into nyc-dev
am: 34979a3af6

* commit '34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
  Change overdraw test to use windowbackground

Change-Id: Ie116603fc53999dd4251d940b5d5ee783684ac8e
2016-05-26 23:17:16 +00:00
Chris Wren
6c751b2e60 Merge "boost starred people to at least high importance" into nyc-dev
am: 8e5d7413b8

* commit '8e5d7413b85a7b202bc917eee4287762b13b864b':
  boost starred people to at least high importance

Change-Id: I40d102f3534558894056b2048c629ca955975ca2
2016-05-26 23:16:27 +00:00
Akshay Thakker
7bbab7e440 Merge "Finalize resource IDs for N." into nyc-dev 2016-05-26 23:16:03 +00:00
Kevin Hufnagle
9e2c84014f Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev
am: 8d063a396f

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

Change-Id: I040555beba971dbf0d2a41f620344def7d5b970f
2016-05-26 23:13:55 +00:00
Jonathan Basseri
9a19e8948d resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
  Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
2016-05-26 23:13:17 +00:00
Android Build Merger (Role)
3dba0fbd53 Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev 2016-05-26 23:10:21 +00:00
Android Build Merger (Role)
3106e71ddc Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev 2016-05-26 23:10:13 +00:00
Bert McMeen
e2a3cac750 Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66
am: feb0b87230

* commit 'feb0b87230c28b2303da217c07177f00b52e87d0':
  docs: Refinements for testing

Change-Id: Ieecec450459bcb175979a3ef3ddccb6161a598e2
2016-05-26 23:09:40 +00:00
sreevanis
cfc48ccbfa Updated link to material design page. am: ff05383baf
am: ee44b14cd4

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

Change-Id: Iaf4bc31d8541e75d3840e6c6f5aa5f667e0baf42
2016-05-26 23:09:34 +00:00
John Reck
34979a3af6 Merge "Change overdraw test to use windowbackground" into nyc-dev 2016-05-26 23:07:53 +00:00
Kevin Hufnagle
8d063a396f Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev 2016-05-26 23:06:43 +00:00
Garfield, Tan
01958b11ef Fix an assertion to avoid crash on deletions in Recent root.
Bug: 28917333
Change-Id: I758c01898a6bb45cbf4975a1e7223efddd17a448
2016-05-26 16:06:04 -07:00
Adam Lesinski
8ce3694181 Fix issue where max idle time > total idle time
If the batterystats were reset while the device was
idling (via command line most likely), then also reset the
last time the device started idling so that the max idle time
calculation is correct.

Bug:28452600
Change-Id: I8a3d5dc3081deda76356c03d891e098baa85f88a
2016-05-26 16:05:35 -07:00
Roozbeh Pournader
f0dae2c515 Ellipsize Preference summaries
Previously, if the summary ran longer than 10 lines, there was no
indication to the user that it is cut off.

Bug: 28872122
Change-Id: Ie216298a2865ee08c1049914c2b029d870481581
2016-05-26 16:01:33 -07:00
Bert McMeen
feb0b87230 Merge "docs: Refinements for testing" into mnc-io-docs
am: 9da0730d66

* commit '9da0730d66b36b11a93e147857f62e641ac76276':
  docs: Refinements for testing

Change-Id: I981bf909a77f680854064e5a45e9fad0aef07425
2016-05-26 22:49:04 +00:00
Bert McMeen
9da0730d66 Merge "docs: Refinements for testing" into mnc-io-docs 2016-05-26 22:43:56 +00:00
Selim Cinek
0361d504da Merge "Fixed the relative time spoken with accessibility" into nyc-dev
am: 38b5946fae

* commit '38b5946fae50d4e9e8f32c985983d03a4437910d':
  Fixed the relative time spoken with accessibility

Change-Id: I0f4568af71a996b3d2f0aa65b7b26785423d8221
2016-05-26 22:39:03 +00:00
Christopher Tate
d9c9b591b7 Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev
am: 210f2ff198

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

Change-Id: I6839fa3658cdd1fe3210761f1cb6cd65453bf8a6
2016-05-26 22:38:59 +00:00
Selim Cinek
38b5946fae Merge "Fixed the relative time spoken with accessibility" into nyc-dev 2016-05-26 22:33:51 +00:00
Chris Tate
210f2ff198 Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev 2016-05-26 22:32:46 +00:00
Bert McMeen
6cb2cf7151 docs: Refinements for testing
Bug: 28964312
Change-Id: Ie98b74860659046199f8ee920d1cd4899a9c7ce6
2016-05-26 15:32:22 -07:00
Jorim Jaggi
8e68533c9d Fix toast with accessibility and app pinning
am: cf984c56ad

* commit 'cf984c56adf88ab9d85b9a6ca71d800c2a937e6c':
  Fix toast with accessibility and app pinning

Change-Id: I6ac10499ecb08f1a19ac8f5d55efaa4e2f6ab826
2016-05-26 22:27:56 +00:00
Jorim Jaggi
cf984c56ad Fix toast with accessibility and app pinning
Bug: 28912468
Change-Id: Ica33ba691bbcb921c5d3e953890498c04bb624e3
2016-05-26 22:22:18 +00:00
George Mount
b148f83ec0 Merge "Fix Activity Transition mess-up." into nyc-dev
am: bd34103c5d

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

Change-Id: I3c0785fa6a862d41210b124ab8836c0594990457
2016-05-26 22:21:33 +00:00
sreevanis
ee44b14cd4 Updated link to material design page.
am: ff05383baf

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

Change-Id: Ic56e38ad1b18c324577586a979364c8e1d0edf3a
2016-05-26 22:21:29 +00:00
George Mount
bd34103c5d Merge "Fix Activity Transition mess-up." into nyc-dev 2016-05-26 22:15:32 +00:00
Wyatt Riley
a868723467 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
am: 793ac34219

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

Change-Id: I9f7984826be418e8703bce449a9753d40e477fd0
2016-05-26 22:07:30 +00:00
sreevanis
ff05383baf Updated link to material design page.
Bug:28983647
Change-Id: Ic4ca199ca71d3cbfc3ffde477b423aebbf626ac1
2016-05-26 15:06:13 -07:00
Wyatt Riley
793ac34219 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev 2016-05-26 22:03:26 +00:00
Kevin Hufnagle
397ae7a2e6 resolve merge conflicts of 7f7eec3 to nyc-dev
Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668
2016-05-26 14:57:15 -07:00
John Reck
2ccaf6a448 Change overdraw test to use windowbackground
Bug: 28786023

Fixes an issue where the first couple frames would
be extremely slow due to the simpleness of HWUI's
overdraw rejection optimization.

Change-Id: I1fe3d83f7e2e0eb3299124b00b9f877c2c3aebf9
2016-05-26 14:36:42 -07:00
Robert Carr
fed1007420 Ensure surfaces only resize during relayout.
For clients which use an indeterminate measure spec in their
layout params (MATCH_PARENT). We could try and change their window size
due to a stack resize, before the client calls relayout. This isn't
safe as the client never had an opportunity to pause rendering, so it
could be in the middle of producing a frame for the old size to suddenly
find the buffer size change underneath it.

Bug: 28559097
Change-Id: I3982936fdf85c22def2f9c754d5508e029e4a84d
2016-05-26 14:33:44 -07:00
Alan Viverette
ae2a646295 Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
am: 0f1ae5fa0f

* commit '0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f':
  Prevent callbacks during DrawableContainer child initialization

Change-Id: Iaabeeac46bf1e2205e629375fb8e0bfa9bfa9761
2016-05-26 21:25:41 +00:00
Alan Viverette
0f1ae5fa0f Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev 2016-05-26 21:20:02 +00:00
Kevin Hufnagle
7f7eec31f8 Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs
am: f23477385e

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

Change-Id: I59ebda20856fd90f50968f9a341b8f87ce2bd9c1
2016-05-26 20:59:57 +00:00
Kevin Hufnagle
f23477385e Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs 2016-05-26 20:55:56 +00:00
Alan Viverette
2b561f1c35 Prevent callbacks during DrawableContainer child initialization
Bug: 28900939
Change-Id: I9c6c8af1665c2dc0bfa8bc8fc773c81e14f6aab1
2016-05-26 16:49:29 -04:00
Winson
c1434b4559 Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
am: 814358a24f

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

Change-Id: I21a46f388ad01f5f4aa370b7a39e78737e30fc71
2016-05-26 20:44:21 +00:00
Winson Chung
814358a24f Merge "Fixing crash in SysUI due to invalid group." into nyc-dev 2016-05-26 20:39:28 +00:00
Christine Hallstrom
995c90aa18 Properly check if BT is off when shutting down radios
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.

Bug: 27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
2016-05-26 13:20:56 -07:00
Dan Sandler
82aba559fa Merge "Time to #NameAndroidN!" into nyc-dev
am: 45caebe035

* commit '45caebe035a67db18d06c4f4e4f124246fb5321d':
  Time to #NameAndroidN!

Change-Id: I12f2fd8c169059cb454e8a8d63e1a0110321aaf6
2016-05-26 20:14:40 +00:00
Jeff Sharkey
ec298b1567 Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
am: d6ee899397

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

Change-Id: I77f3923a2988dfe1375008f26a532e2adf2f8d1e
2016-05-26 20:10:43 +00:00
Jeff Sharkey
2efd671e48 Merge "Careful process validation for unaware providers." into nyc-dev
am: 678dba737b

* commit '678dba737bed94eb5eeeed63db74aa811ee896cb':
  Careful process validation for unaware providers.

Change-Id: I20d3b078d389f1d91d28926853fc6a7c7d9a269c
2016-05-26 20:10:28 +00:00
Daniel Sandler
45caebe035 Merge "Time to #NameAndroidN!" into nyc-dev 2016-05-26 20:07:09 +00:00
Winson
d5fada7253 Defer calling the stack task removed callbacks.
am: 6c8217ab30

* commit '6c8217ab3072fa65851316a922b482506b3c2a4c':
  Defer calling the stack task removed callbacks.

Change-Id: Ib8b7b0c17f529ab2b22f79542720655b0d1e7343
2016-05-26 20:04:18 +00:00
Jeff Sharkey
d6ee899397 Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev 2016-05-26 20:04:16 +00:00
Jeff Sharkey
3f9059fb8d Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
am: a39d888651

* commit 'a39d888651493d20f3814cd88a39a521450b3eac':
  Suppress unlock notifications on non-FBE devices.

Change-Id: I0b1417d3035f528c397ef368b1fb6e19e522788a
2016-05-26 20:04:15 +00:00