Commit Graph

246497 Commits

Author SHA1 Message Date
Chia-I Wu
e6bcaf134a Fix clipRect transform rounding errors
For clipRect.right and clipRect.bottom, we need to round them up.

Bug: 28864193
Change-Id: I2bd30eec8a8093e0fdcc7ce8484a0610fd068792
2016-05-27 11:06:00 +08:00
Julia Reynolds
0e64814c7d Merge "Reset slider animator on density change" into nyc-dev
am: d52a81eeae

* commit 'd52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
  Reset slider animator on density change

Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
2016-05-27 03:05:42 +00:00
Fyodor Kupolov
5d531e4f6c Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
2016-05-27 03:05:20 +00:00
smain@google.com
b35e6f9ad7 add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5
am: 5d3ca78d3f

* commit '5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
2016-05-27 03:05:00 +00:00
TreeHugger Robot
20237bc68f Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev 2016-05-27 03:04:44 +00:00
Paul Jensen
fdc53e96d3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6
am: 50615e498e

* commit '50615e498e11f356ef582af0f9616945d04faa80':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
2016-05-27 03:04:34 +00:00
Christopher Tate
50aa0324c9 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours
am: d39c0a8d77

* commit 'd39c0a8d775988bfbf319777b2a17af1579b531a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
2016-05-27 02:58:27 +00:00
Teng-Hui Zhu
56d4dae9ec Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am: e78ba24c17

* commit 'e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
  Update the light center when the root view's layout changed

Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
2016-05-27 02:50:14 +00:00
Phil Burk
29e8879307 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am: d34d06606d

* commit 'd34d06606dd5be9fc18029e87cb4b56ecef21864':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
2016-05-27 02:49:44 +00:00
Rubin Xu
d667ff5930 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
am: 1ad12e0678

* commit '1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
2016-05-27 02:48:59 +00:00
Bill Yi
02befc3229 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9aed8c2fa0  -s ours

* commit '9aed8c2fa01785be20cd7cc07976670812bc84a0':
  Import translations. DO NOT MERGE

Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
2016-05-27 02:47:12 +00:00
Bill Yi
977d5bbfd2 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cb8c569414  -s ours

* commit 'cb8c569414121158adb2a627d4a91b47dd3c4362':
  Import translations. DO NOT MERGE

Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
2016-05-27 02:46:32 +00:00
Julia Reynolds
19a8d034fb Merge "Importance slider updates." into nyc-dev
am: 2bf73e94c3

* commit '2bf73e94c389bf9457df132d6eaf294f9d35587f':
  Importance slider updates.

Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
2016-05-27 02:43:28 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
2016-05-27 02:42:44 +00:00
Jason Monk
628c714f3e Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am: 72f19ff6f0

* commit '72f19ff6f057fff184c875194e802005f8e8fd08':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
2016-05-27 02:42:04 +00:00
Robin Lee
6c3cb2c392 Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am: 33154deb70

* commit '33154deb700a8cf5df6fff39f0b3291d1278efa0':
  Check if we're connected before marking a UID blocked

Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
2016-05-27 02:39:45 +00:00
Chris Wren
5b3b72e7b7 resolve merge conflicts of 0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
2016-05-26 22:28:03 -04:00
Adam Lesinski
89046edb4d Merge "Fix issue where max idle time > total idle time" into nyc-dev 2016-05-27 01:44:32 +00:00
Siyamed Sinir
108b013a51 Revert "Fix TextView layout reuse when maxLines is set"
This reverts commit f75775ea7f.

Bug: 28885989
Bug: 28468120
Change-Id: I6fa5401c8a76db1bacc2d8201eece91a3c52b758
2016-05-27 01:37:59 +00:00
Siyamed Sinir
24aba4b9e9 Set StaticLayout.maxLines only when ellipsize is set
A partial revert for the CL I5dbc48a6c7f0f4ac4c693d5c95f0a99b989e07f4.
The mentioned CL tried to always set the maxLines attribute of
StaticLayout. However this caused regressions at certain points.

Bug: 28885989
Bug: 28468120
Change-Id: Ic09cb194c8811a06b5d53de50bfb77938b91b88d
2016-05-26 18:33:33 -07:00
Adrian Roos
7fe83ab54e Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev 2016-05-27 01:04:16 +00:00
Adrian Roos
a8e18ef911 Fix spurious crashes in StatusBarIconView
Fixes a crash that happens when we cannot look up a package's
resources for reasons.

Change-Id: I4884536a3eefa8fe82bd274925241f4c798e08e3
Fixes: 28982204
2016-05-26 17:57:25 -07:00
Selim Cinek
f1614a6ec2 Fixed a few memory leaks in SystemUI
Fist of all we made the statemap a weak hashmap in order never
to leak any views anymore.

Another leak could occur because predrawlisteners were added twice
but removal only removes one. A view was then leaked in case it was detached
before predraw.

Also fixed a leak when transforming the header because a state wasn't
nulled.

Change-Id: I2573a506c307196ef60c905dc823ea8a95e91a16
Fixes: 28945863
2016-05-26 17:52:03 -07:00
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +00:00
Christopher Tate
b5c0788d36 Purge an app's scheduled jobs when the whole package is disabled
Bug 28979894

Change-Id: If8a99489eaaa219274289fdf2e90be8bdecb3bfa
2016-05-26 17:14:27 -07:00
Roozbeh Pournader
0ca3829d4c Merge "Ellipsize Preference summaries" into nyc-dev 2016-05-27 00:11:14 +00:00
TreeHugger Robot
cef12198a7 Merge "Protect against NPE while to updating service connection activities." into nyc-dev 2016-05-27 00:08:16 +00:00
Rob Carr
58f1167ecf Merge "Ensure surfaces only resize during relayout." into nyc-dev 2016-05-26 23:58:32 +00:00
Winson
c4a038ad28 Prevent setting the launch task id when docking.
- In this case, recents is the last running task instead of the 
  previously fullscreen app (likely due to some preparation for the 
  docking), and we should not set the task to launch/cancel window 
  transitions for.

Bug: 28943422
Change-Id: I3c381d3fa33a69adb7d8b606633433a898841526
2016-05-26 23:51:40 +00:00
Garfield Tan
7a91029bff Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev 2016-05-26 23:46:42 +00:00
Robin Lee
32ceb9c801 Merge "Move VPN restriction check into setup dialog" into nyc-dev 2016-05-26 23:41:28 +00:00
Jorim Jaggi
0d35765ca3 Merge "Handle trampoline activites in different tasks" into nyc-dev 2016-05-26 23:38:09 +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
Ben Lin
1a3b676441 Adding docsui prefix to access metric tags.
Bug: 28934495
Change-Id: I44291b887e8aa9f4412ee1e7e1826ea68ffb40b9
2016-05-26 16:19:21 -07: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
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
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
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