240735 Commits

Author SHA1 Message Date
Kweku Adams
3cabb2a6b3 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 2016-04-25 20:09:41 +00:00
Jorim Jaggi
4a9653841b Merge "Fix stuck windows in multi-window" into nyc-dev 2016-04-25 19:33:40 +00:00
Jorim Jaggi
dbe44ac48d Fix stuck windows in multi-window
Window manager checked for the full display size so isHiddenFromUserLocked
always returned true but activity manager and other places in window manager
thought it would be visible which created a really weird state.

Bug: 28344326
Change-Id: I98daefbcc64bf7a5196588c25d2cbc5ee046a77d
2016-04-25 12:31:17 -07:00
Jorim Jaggi
17178d95f2 Merge "Fix layout for child windows" into nyc-dev 2016-04-25 19:29:41 +00:00
Jorim Jaggi
5f23a57707 Fix layout for child windows
Turns out that we also need to fit child windows to display in all
cases except NO_LIMITS is set.

Bug: 27991404
Change-Id: I34a12bbf9d0169bdb770e0e96f4b994146063e90
2016-04-25 12:24:57 -07:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
2016-04-25 19:22:40 +00:00
Daniel Sandler
4c40888673 Merge "Tap, don't touch." into nyc-dev 2016-04-25 19:21:46 +00:00
Daniel Sandler
5602898dd5 Merge "Don't generate stack in logcat if assistant missing." into nyc-dev 2016-04-25 19:21:03 +00:00
Amith Yamasani
bc6d96e4d0 Merge "Fix NPE when assist data request times out" into nyc-dev 2016-04-25 19:07:32 +00:00
Mady Mellor
904a39ca92 Merge "Fix gear being covered on notification update" into nyc-dev 2016-04-25 19:06:17 +00:00
Mady Mellor
5a3e441158 Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev 2016-04-25 19:05:48 +00:00
TreeHugger Robot
73624af552 Merge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into nyc-dev 2016-04-25 18:57:30 +00:00
TreeHugger Robot
b698fc9d84 Merge "WebView doc: explain persist js across navigations" into nyc-dev 2016-04-25 18:39:47 +00:00
Rubin Xu
cda50893b6 Merge "Add back protected profile availibility broadcasts." into nyc-dev 2016-04-25 17:58:29 +00:00
TreeHugger Robot
442fd2a1dd Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev 2016-04-25 17:51:13 +00:00
Rubin Xu
dae6beda7b Add back protected profile availibility broadcasts.
Bug: 27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0
2016-04-25 18:47:36 +01:00
Selim Cinek
08b38f87ef Merge "Added the ripple drawable back to the media notification" into nyc-dev 2016-04-25 17:44:11 +00:00
Kweku Adams
5b2747e133 Removing extraneous field from batterystats dumpsys.
Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d
2016-04-25 10:44:05 -07:00
Amith Yamasani
6e267d3d23 Fix NPE when assist data request times out
Bug: 28329835
Change-Id: I032e20ea1008512954b97519a4abb6fe4d65c673
2016-04-25 10:24:52 -07:00
Chong Zhang
5e40748d3f Merge "fix "am start -W" hang on activity start" into nyc-dev 2016-04-25 17:08:07 +00:00
Fyodor Kupolov
6eb8c15b7e Merge "Return null when user is locked" into nyc-dev 2016-04-25 17:03:36 +00:00
Bo Liu
e29d313e95 WebView doc: explain persist js across navigations
BUG: 28207652
Change-Id: Ib33f029c2cae6c1482c0c951075275e9f96ae73c
2016-04-25 09:38:06 -07:00
Jeff Sharkey
5dc3304531 Merge "Strings for post-upgrade." into nyc-dev 2016-04-25 16:34:13 +00:00
Winson Chung
de91709935 Merge "Fixing animation regression due to ag/957220." into nyc-dev 2016-04-25 16:25:51 +00:00
Felipe Leme
ee5d630459 Added a 'deferred' parameter on executeRunnableDismissingKeyguard().
OnDismissAction() should return true only when the dismiss should be
deferred, but the annonymous class on
executeRunnableDismissingKeyguard() was always return true, which was
cause a janky timeout when the runnable didn't launch an activity.

BUG: 28303552

Change-Id: I1f9e299102d6cebba44794c026a69cf43ea06990
2016-04-25 09:12:06 -07:00
Winson
60df24648e Fixing animation regression due to ag/957220.
- Ensure we clear deferred relayouts after finishing all animations in
  case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6
2016-04-25 16:01:03 +00:00
TreeHugger Robot
096e2dcf85 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev 2016-04-25 15:54:37 +00:00
Dan Sandler
5ccae1fb75 Don't generate stack in logcat if assistant missing.
Low ram devices don't have assistants. Worth noting, but not
making a big stink about it.

Change-Id: I5a49be99bf688a5f1b800a1124b14a589ecf5b52
Fixes: 27210719
2016-04-25 11:49:39 -04:00
Bill Yi
4316b8a09d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 15:09:05 +00:00
Bill Yi
779722d7ed Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 15:08:48 +00:00
Bill Yi
3496262a98 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 15:08:32 +00:00
Bill Yi
b6a186ce52 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 15:08:09 +00:00
Bill Yi
c8ad9db8b0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 15:07:51 +00:00
John Reck
a5bbbe55b7 Merge "PixelCopy fixes" into nyc-dev 2016-04-25 14:55:28 +00:00
Calin Juravle
430ef455d6 Disable StrictMode policy when setting up profile support
Bug: 28304158
Change-Id: Iedf8714bd4f3526823b3060b30e0f11c6c0abcea
2016-04-25 15:09:03 +01:00
Ricky Wai
4ace836661 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev 2016-04-25 13:11:46 +00:00
Bill Yi
90edb46d01 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-25 12:49:01 +00:00
Bill Yi
5f49e81006 Import translations. DO NOT MERGE
Change-Id: Ie8ab19f46d7eebd00b7d1cc476ebd153d733ceb0
Auto-generated-cl: translation import
2016-04-25 05:12:11 -07:00
Bill Yi
47314dde8e Import translations. DO NOT MERGE
Change-Id: I052034274afbe75c7898cd0360ea627abed0dd19
Auto-generated-cl: translation import
2016-04-25 04:58:49 -07:00
Bill Yi
84ba684a6b Import translations. DO NOT MERGE
Change-Id: Ic8c6b11898eaccb7327492bbf5d1aaff9070f135
Auto-generated-cl: translation import
2016-04-25 04:54:12 -07:00
Bill Yi
dcd656051a Import translations. DO NOT MERGE
Change-Id: I0812aa0343d38d49e868e1e8fd895cb9d924b366
Auto-generated-cl: translation import
2016-04-25 04:49:48 -07:00
Bill Yi
94adad88fb Import translations. DO NOT MERGE
Change-Id: Icf2694bb659505ee340498f007c1f303b006b5d0
Auto-generated-cl: translation import
2016-04-25 04:45:05 -07:00
Ricky Wai
7881cf8f81 Make "work mode on dialog" show personal challenge in unified work lock
Bug: 28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558
2016-04-25 10:26:14 +00:00
Rubin Xu
0c9c09ccff Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev 2016-04-25 10:12:02 +00:00
Clara Bayarri
f48f390a60 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev 2016-04-25 09:31:06 +00:00
Erik Kline
7587ba8608 Merge "Add state and callback logs for IpManager dump" into nyc-dev 2016-04-25 07:55:59 +00:00
Bill Yi
6e2d20b2b6 Import translations. DO NOT MERGE
Change-Id: I1811b4ca04bc4386f233bc1bdc2b486e6ce48b01
Auto-generated-cl: translation import
2016-04-24 22:31:19 -07:00
Erik Kline
a84572b503 Add state and callback logs for IpManager dump
Bug: 27605330
Change-Id: I2e659d08fa9acd57a71901f28c85a92c0876c663
2016-04-25 13:11:58 +09:00
Seigo Nonaka
ab8913e364 Merge "Fix unexpected truncation again." into nyc-dev 2016-04-25 03:36:30 +00:00
TreeHugger Robot
14d8be728b Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev 2016-04-24 14:44:28 +00:00