Commit Graph

266851 Commits

Author SHA1 Message Date
Jonathan Basseri
0660813aa9 Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp
am: f322db1e0d

* commit 'f322db1e0db11c670c34bea6014c3d43f030941b':

Change-Id: Ie16b5e1b2c2012282cb3777ca4ea8fa2954264e1
2016-05-26 23:33:32 +00:00
Jorim Jaggi
352d584b20 Handle trampoline activites in different tasks
When the app uses a trampoline activity that launches in a different
task than the main task, we fail to show recents when the task is
docked and the user launches the trampoline activity from home. Add
logic to handle this case.

Bug: 28368989
Change-Id: Iea29e6cd1a9919da0e856955691fac4792e30604
2016-05-26 16:32:37 -07:00
Chris Wren
82bccd7f85 Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8 am: 6c751b2e60
am: e8491bf8c5

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

Change-Id: I5b6c7d4a4b6c67d1d7f659b95252ad4e406dc46c
2016-05-26 23:29:31 +00:00
Android Build Merger (Role)
121fa21ef9 Merge "Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8 am: 9f7067bb80" into nyc-mr1-dev-plus-aosp 2016-05-26 23:27:32 +00:00
Android Build Merger (Role)
f322db1e0d Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp 2016-05-26 23:27:21 +00:00
Steve McKay
716912e719 Move BandController out of MultiSelectManager.
Improved dependency injection (elimination of propagating dependencies).
This change cleans up MultiSelectManager ahead of other improvements.
Also, cancel band select in response to touch events....else weird things happen.

Change-Id: I261d928ff7eb5d8a50791d5dd9d7202b324efc54
2016-05-26 16:26:39 -07:00
Chris Wren
1fc4082c5e Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
am: 9f7067bb80

* commit '9f7067bb80b79396992b719ac46e8ab47e00ff10':
  boost starred people to at least high importance

Change-Id: Ie452e76ad683e916699d9bfa4ee6d687b6d5d961
2016-05-26 23:25:35 +00:00
Michael Wright
66eeff63b7 Merge "Finalize resource IDs for N." into nyc-dev
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: I6eb87bf4e6ee41ea32e497562635a8432b85ba59
2016-05-26 23:25:11 +00:00
Jonathan Basseri
d099eddf8d Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
am: 531cd8724c

* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':

Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238
2016-05-26 23:24:45 +00:00
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
Ben Lin
1a3b676441 Adding docsui prefix to access metric tags.
Bug: 28934495
Change-Id: I44291b887e8aa9f4412ee1e7e1826ea68ffb40b9
2016-05-26 16:19:21 -07: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
Jonathan Basseri
448b67ee15 resolve merge conflicts of 4c04097 to nyc-mr1-dev am: 04c35e78db
am: 9a19e8948d

* commit '9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d':
  Change how TelephonyManager handles subscriptions.

Change-Id: I7f2c6b4b7b4c1a2229c43003f0cfa6734fdc227a
2016-05-26 23:17:25 +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
Doris Liu
335d7d1744 Copy native tree's property when mutate vector drawable
When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.

Bug: 28974071
Change-Id: If793f5f2b6e116472a1c6da0fb60d8278a78b03f
2016-05-26 16:06:58 -07:00
Kevin Hufnagle
8d063a396f Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev 2016-05-26 23:06:43 +00:00
Christopher Wiley
36f6f4e394 Use an ArrayMap instead of HashMap to track tether interfaces
Since the number of tetherable interfaces should be small (e.g. <10),
the computational cost of a looking up objects in an ArrayMap is negligible,
and the memory required is less than a HashMap.

While here, remove some unused imports.

Change-Id: I3fb7091cfb93697d2fc6388b843d60f7e8e7e1a6
Test: Compiles.
2016-05-26 16:06:10 -07: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
Adrian Roos
4a57967650 NotificationStackScroller: Fix scrollTo for notification groups
Change-Id: Iab101d7583e9849809058c96f0c480ea9b5cc0f5
Fixes: 28936844
2016-05-26 15:44:40 -07: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
Hemal Patel
17fb049a97 Docs: Removed note in "Platform Versions" section
Bug: 27768014

Removed note that explained why Android versions older than 2.2 do not appear in the dashboard

Change-Id: I108d37cd4885fb4f2418b85d0e8c0a6e9a0b0fd0
2016-05-26 15:02:21 -07:00
Kevin Hufnagle
397ae7a2e6 resolve merge conflicts of 7f7eec3 to nyc-dev
Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668
2016-05-26 14:57:15 -07:00
Mark Goldstein
9f2dba71c5 Doc change: Fix broken link.
The href must include the page containing
the anchor "#dynamic-interfaces".

Change-Id: Ie6503584aff0104d11dcafed4fd03ce447ef4c59
2016-05-26 14:43:47 -07:00
Wale Ogunwale
ca2af9e38c Only make Recents activity invisible if not focused on TV devices.
Change was introduced in b/28246419 to fix Recents activity visibility
issues on TV, but was causing other issues on phones. So, only apply
rule on TV devices.

Bug: 28246419
Bug: 28943853
Change-Id: Icd19eae4ffa5e0a798bc9f63bc7a6c9a60422236
2016-05-26 14:43:19 -07:00