OSDN Git Service
Doris Liu [Fri, 11 Mar 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Testing initial value for 0-duration animations" into nyc-dev
Doris Liu [Fri, 11 Mar 2016 20:25:19 +0000 (20:25 +0000)]
Merge "Set end value immediately when start a 0-duration animation" into nyc-dev
Alan Viverette [Fri, 11 Mar 2016 20:19:09 +0000 (20:19 +0000)]
Merge "Invalidate DrawableContainer's cached canConstantState on child add" into nyc-dev
Wale Ogunwale [Fri, 11 Mar 2016 20:18:55 +0000 (20:18 +0000)]
Merge "Display home activity behind pinned activity that should return home" into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 20:04:18 +0000 (20:04 +0000)]
Merge "fix build" into nyc-dev
Wale Ogunwale [Fri, 11 Mar 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Notify task changed listeners when a pinned activity is removed" into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 20:03:44 +0000 (12:03 -0800)]
fix build
Change-Id: Icd05c30eabaa526d85ef328d781380781b44d371
Yohei Yukawa [Fri, 11 Mar 2016 19:56:01 +0000 (19:56 +0000)]
Merge "Use LocaleUtils#filterByLanguage for non-keyboard subtypes." into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 19:38:34 +0000 (19:38 +0000)]
Merge "Allow app downgrades" into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 19:37:17 +0000 (11:37 -0800)]
Allow app downgrades
only system apps can do this
Change-Id: If0947f13f5c447f9396690bfda3ad40b07fbbb6b
Alan Viverette [Fri, 11 Mar 2016 19:34:03 +0000 (19:34 +0000)]
Merge "Ensure Outline consistently sets the radius to be undefined" into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 19:26:36 +0000 (19:26 +0000)]
Merge "Add minSdk to dumpsys" into nyc-dev
Todd Kennedy [Fri, 11 Mar 2016 19:18:32 +0000 (11:18 -0800)]
Add minSdk to dumpsys
Bug:
27526333
Change-Id: I0148275013ebab899bcb63c07d71a840539c1863
Alan Viverette [Fri, 11 Mar 2016 18:42:41 +0000 (18:42 +0000)]
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
Yohei Yukawa [Fri, 11 Mar 2016 18:39:51 +0000 (10:39 -0800)]
Use LocaleUtils#filterByLanguage for non-keyboard subtypes.
With this CL, we expand the target of Bug
27129703 and Bug
27348943 to
non-keyboard subtypes.
Suppose there is a handwriting IME (mode == "handwriting") that supports
the following 5 subtypes.
- en-US
- en-GB
- fr
- sr-Cyrl
- sr-Latn
Also suppose the system languages are configured as follows.
1. sr-Latn-RS
2. ja-JP
3. fr-FR
4. en-GB
5. en-US
In this case we want to enable [sr-Latn, fr, en-GB] by default when
"use system language" is checked in the subtype enabler.
See previous commits [1][2] about how we addressed those issues for
keyboard subtypes.
[1]: Iaf179d60c12b9a98b4f097e2449471c4184e049b
e985c240e3feb62ea38d5b4e386be083ca0f215b
[2]: I8fc774154f5175abff2f16e8f12a4847bf5f5b7c
072a95a3094af2ced4f009ad62c4553c28e3f830
Bug:
27560993
Change-Id: I416b5671602c550805ed6267dd210968aa1de83c
Winson [Thu, 10 Mar 2016 22:00:14 +0000 (14:00 -0800)]
Fixing issue where screenshot notification remains non-dismissible.
- Ensure that we start the screenshot as a foreground service to reduce
likelihood that it is killed while taking a screenshot.
- If the screenshot process times out or gets killed for any reason,
ensure that we update the notification with an appropriate error
message.
Bug:
27389179
Change-Id: I5007bda95538044bc753e4ceffd2f59a069c857b
Winson [Thu, 10 Mar 2016 20:52:27 +0000 (12:52 -0800)]
Prevent crash with invalid cancelled params.
Bug:
27368990
Change-Id: I3eaa9e0391a4149da29bb5dc638ef152f5125bc6
Wale Ogunwale [Fri, 11 Mar 2016 18:38:36 +0000 (10:38 -0800)]
Notify task changed listeners when a pinned activity is removed
Bug:
27558494
Change-Id: I68573e5654f476e0b3027ad80d0e86496867f128
Eino-Ville Talvala [Fri, 11 Mar 2016 18:13:00 +0000 (18:13 +0000)]
Merge "Camera2: Add buffer drop error callback" into nyc-dev
Makoto Onuki [Fri, 11 Mar 2016 18:00:38 +0000 (18:00 +0000)]
Merge "Fix caller validation on secondary user." into nyc-dev
Makoto Onuki [Fri, 11 Mar 2016 18:00:16 +0000 (18:00 +0000)]
Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev
Sanket Padawe [Fri, 11 Mar 2016 17:59:34 +0000 (17:59 +0000)]
Fix build failure.
am:
44729c613f
* commit '
44729c613fe65fd9b2f14b1844c1f02ba94ad498':
Fix build failure.
Sanket Padawe [Fri, 11 Mar 2016 17:50:56 +0000 (09:50 -0800)]
Fix build failure.
+ Fix build failure caused by
https://partner-android-review.googlesource.com/#/c/538910/
Change-Id: I83b579f3db4c5a167b206318edcc627c6d2f4b0a
Wale Ogunwale [Fri, 11 Mar 2016 17:33:17 +0000 (09:33 -0800)]
Display home activity behind pinned activity that should return home
If we are pinning an activity whose task should return home, then move
the home stack forward so that the home activity is visible behind it
instead of the next task in the fullscreen stack.
Bug:
26697763
Change-Id: Iadb7f5453d4351bc4200bcc2feed0ab9fe41e530
twen.chang [Fri, 11 Mar 2016 17:37:06 +0000 (17:37 +0000)]
Merge "Add RIL Error code list" into mm-wireless-dev
am:
49916d39e9
* commit '
49916d39e9d27acbc6fb28b38abc78ad5dada5a4':
Add RIL Error code list
Tenghui Zhu [Fri, 11 Mar 2016 17:35:58 +0000 (17:35 +0000)]
Merge "Add the missing overriden API" into nyc-dev
Sanket Padawe [Fri, 11 Mar 2016 17:31:55 +0000 (17:31 +0000)]
Merge "Add RIL Error code list" into mm-wireless-dev
Mady Mellor [Fri, 11 Mar 2016 17:03:56 +0000 (17:03 +0000)]
Merge "Improve interaction around showing / hiding the gear behind notifications" into nyc-dev
Jason Monk [Fri, 11 Mar 2016 16:00:46 +0000 (16:00 +0000)]
Merge "Set QS edit overflow bg" into nyc-dev
Jason Monk [Fri, 11 Mar 2016 13:56:25 +0000 (08:56 -0500)]
Set QS edit overflow bg
Bug:
27396825
Change-Id: I656e49f66518f23bd05d59392f43fc1227207666
Steve McKay [Fri, 11 Mar 2016 15:42:01 +0000 (15:42 +0000)]
Merge "More snazzy animation for UX happiness." into nyc-dev
Alan Viverette [Tue, 8 Mar 2016 23:12:56 +0000 (18:12 -0500)]
Invalidate DrawableContainer's cached canConstantState on child add
Bug:
27553319
Change-Id: I625234baea8a992900935f562f9b767c85e527fd
Alan Viverette [Fri, 11 Mar 2016 15:09:14 +0000 (10:09 -0500)]
Add consistent @NonNull annotations for drawable callbacks
Bug:
27599515
Change-Id: I33fdc5392302403bfff9cc74a8226173ec962af6
Alan Viverette [Fri, 11 Mar 2016 15:08:24 +0000 (15:08 +0000)]
Merge "Add temporary logging to SimpleMonthView" into nyc-dev
Jorim Jaggi [Fri, 11 Mar 2016 12:02:36 +0000 (12:02 +0000)]
Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
Keisuke Kuroyanagi [Fri, 11 Mar 2016 11:17:35 +0000 (11:17 +0000)]
Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev
Yohei Yukawa [Fri, 11 Mar 2016 10:25:57 +0000 (10:25 +0000)]
Merge "Make sure to compare subtype language with system language." into nyc-dev
Keisuke Kuroyanagi [Fri, 11 Mar 2016 07:31:29 +0000 (16:31 +0900)]
Fix: Context menu can contain obsolete suggestions.
When there are not enough number of suggestions, previously used
suggestions was continue to be used. This fixes it and simplifies code
by always allocating SuggestionInfo array.
Bug:
27602619
Change-Id: I9378315b8c810f126f65fade96ce9f6ff5271957
Adam Lesinski [Fri, 11 Mar 2016 09:16:43 +0000 (09:16 +0000)]
Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev
Yohei Yukawa [Fri, 11 Mar 2016 09:08:52 +0000 (01:08 -0800)]
Make sure to compare subtype language with system language.
This CL addresses a regression introduced by a recent CL [1] that
non-keyboard subtypes are no longer implicitly enabled based on the
system language (a.k.a. "use system language" in the subtype enabler)
due to a type mismatch in comparison.
Here is the original logic:
if (language.equals(systemLanguage) && systemLocale.startsWith(locale))
And here is the logic replaced by [1]:
if (locale != null && locale.equals(systemLanguage)) {
The new logic is simply broken, because locale is a Locale object while
systemLanguage is a String object. It never matches.
With this CL we will compare the system language with the locale
language again, with several test cases that should have been included
in [1], as a temporary solution until we start relying on
LocaleUtils#filterByLanguage() for non-keyboard subtypes.
[1]: Iaf179d60c12b9a98b4f097e2449471c4184e049b
e985c240e3feb62ea38d5b4e386be083ca0f215b
Bug:
27560993
Change-Id: If2d1710174853180465832e6ecbbb91235b76210
Yohei Yukawa [Fri, 11 Mar 2016 09:02:21 +0000 (09:02 +0000)]
Merge "Persist isAsciiCapable attribute of additional subtypes." into nyc-dev
Martijn Coenen [Fri, 11 Mar 2016 08:38:58 +0000 (08:38 +0000)]
Merge "NFC antenna location asset." into nyc-dev
Adam Lesinski [Fri, 11 Mar 2016 05:55:04 +0000 (21:55 -0800)]
AAPT2: Add descriptions of Attributes in Styleables for R.java
Change-Id: I69e7b73cbdfe4baf502348397435c501ae29ff5e
twen.chang [Fri, 4 Mar 2016 10:25:25 +0000 (18:25 +0800)]
Add RIL Error code list
BUG:
27589497
Change-Id: Ib8d7e0ff13f72106b79210ea786020c17b0ba842
Yohei Yukawa [Fri, 11 Mar 2016 07:46:07 +0000 (23:46 -0800)]
Persist isAsciiCapable attribute of additional subtypes.
This was somehow missed in the previous commit [1] that added
isAsciiCapable attribute to InputMethodSubtype.
For devices from API level 14 to 23, IME developers might be able to
work around this issue by specifying "AsciiCapable" [2] in
imeSubtypeExtraValue, which is not coverted by CTS though.
[1]: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
dc8abf6cee0bcf44e2cad8155f0c151105d46471
[2]: I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6
8e303cc5dd4860b6050d5725ce60ca7e6fb00c7b
Bug:
27603986
Change-Id: Ifb6bc83e782ac05df180dfe0d689897d07441a0c
Keisuke Kuroyanagi [Fri, 11 Mar 2016 05:43:17 +0000 (05:43 +0000)]
Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev
Joe Fernandez [Fri, 11 Mar 2016 04:50:17 +0000 (04:50 +0000)]
Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 04:42:34 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 04:42:17 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 04:41:59 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 04:41:43 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 04:41:25 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 11 Mar 2016 03:02:22 +0000 (19:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4dfab5521dc760ea630dbc54490f1531d6a2c22d
Auto-generated-cl: translation import
Bill Yi [Fri, 11 Mar 2016 02:52:52 +0000 (18:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: If375ea874afe99e685cb66c295785b108fc98e29
Auto-generated-cl: translation import
Bill Yi [Fri, 11 Mar 2016 02:50:20 +0000 (18:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72b2693c21cc8536a5642b6c0526f611a28631bc
Auto-generated-cl: translation import
Bill Yi [Fri, 11 Mar 2016 02:45:30 +0000 (18:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7b062c5a86c4ddd248859b41c335aa74be16e6b3
Auto-generated-cl: translation import
Bill Yi [Fri, 11 Mar 2016 02:40:16 +0000 (18:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibda1377b0848a22be0484ba30be16f43e92a663b
Auto-generated-cl: translation import
Mady Mellor [Fri, 11 Mar 2016 02:37:54 +0000 (02:37 +0000)]
Merge "Use FlingAnimationUtils for dismissing a notification" into nyc-dev
Mady Mellor [Tue, 8 Mar 2016 22:12:42 +0000 (14:12 -0800)]
Use FlingAnimationUtils for dismissing a notification
Addressing comment in ag/877913 PS6
Adds FlingAnimationUtils to SwipeHelper for dismissing notification
so that it may better follow a user's finger. This is not used
when a dismiss all is called (i.e. useAcceleration is requested).
Additionally alters dismiss behavior to accelerate out if velocity
was 0.
Change-Id: Ia7dc15d64e8427d5cfbdee3f4e48ccd60f5b0b36
Steve McKay [Fri, 11 Mar 2016 00:13:05 +0000 (16:13 -0800)]
More snazzy animation for UX happiness.
Slide up/down and fade in/out.
Bug:
26918725
Change-Id: I4ef8e31d3e1f6087369daddbfd0a74bca3ff6937
Selim Cinek [Fri, 11 Mar 2016 02:20:14 +0000 (02:20 +0000)]
Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev
* changes:
Fixed a bug where text would still not animate
Reseting user expansions when the shade is collapsed
Added more spacing around notifications
Fixed an bug with the notification backgrounds
Selim Cinek [Fri, 11 Mar 2016 02:06:54 +0000 (18:06 -0800)]
Fixed a bug where text would still not animate
Bug:
27419215
Change-Id: I8c1cd4d4436ae019875f3e1ae5620c1673c7584e
Selim Cinek [Fri, 11 Mar 2016 02:06:27 +0000 (18:06 -0800)]
Reseting user expansions when the shade is collapsed
Bug:
27597152
Change-Id: I5ed13c17a95defc9ddc3f5f184f7a98b012baef1
Rob Carr [Fri, 11 Mar 2016 02:03:48 +0000 (02:03 +0000)]
Merge "Do not enforce minimum size for pinned stack." into nyc-dev
Makoto Onuki [Fri, 11 Mar 2016 01:01:08 +0000 (17:01 -0800)]
Test for ShortcutManager.updateShortcuts(), also
... fix bugs
Bug
27548047
Change-Id: Ia55d35521912dcba2fb1bb9c20588a83d1a2d004
Lajos Molnar [Fri, 11 Mar 2016 01:44:56 +0000 (01:44 +0000)]
Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev
Lajos Molnar [Fri, 11 Mar 2016 01:44:26 +0000 (01:44 +0000)]
Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev
Makoto Onuki [Fri, 11 Mar 2016 01:28:55 +0000 (17:28 -0800)]
Fix caller validation on secondary user.
Bug
27548047
Change-Id: Ibf01bc0f9d3dc76cc23403bf076e2faa7d033234
Raph Levien [Fri, 11 Mar 2016 01:26:51 +0000 (01:26 +0000)]
Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev
Aga Wronska [Fri, 11 Mar 2016 01:23:19 +0000 (01:23 +0000)]
Merge "Display file names in Media libraries in grid mode" into nyc-dev
Aga Wronska [Fri, 11 Mar 2016 01:15:23 +0000 (01:15 +0000)]
Merge "Open drawer when showing copy/move destination screen" into nyc-dev
Winson [Fri, 11 Mar 2016 00:35:03 +0000 (16:35 -0800)]
Adding docking checks for multi-window support.
Bug:
27387257
Change-Id: I9f16302e1f9475225538871d9fc09c0706e4dbfb
Aga Wronska [Thu, 10 Mar 2016 01:36:44 +0000 (17:36 -0800)]
Open drawer when showing copy/move destination screen
Bug:
27479369
Change-Id: I0bc7efe88ad47885ecf35fb447cfe5c1f38a10d7
Robert Carr [Thu, 10 Mar 2016 23:52:46 +0000 (15:52 -0800)]
Do not enforce minimum size for pinned stack.
We don't need to enforce a minimum size for the tasks in
the pinned stack as the bounds are controlled by the system.
Bug:
27536840
Change-Id: I9ecb2ebd3792b2739d05e9f403fe0acba969e46a
Steve McKay [Fri, 11 Mar 2016 00:03:59 +0000 (00:03 +0000)]
Merge "Delete downloads activity." into nyc-dev
Aga Wronska [Thu, 10 Mar 2016 19:06:47 +0000 (11:06 -0800)]
Display file names in Media libraries in grid mode
Bug:
26829518
Change-Id: If9e2f331df0233ef114c4147ffbc16214558b5ce
Chris Craik [Thu, 10 Mar 2016 23:45:19 +0000 (23:45 +0000)]
Merge "Fix node rejection crash" into nyc-dev
Prathmesh Prabhu [Thu, 10 Mar 2016 23:44:09 +0000 (23:44 +0000)]
Merge "screencap: Nix deprecated direct read of framebuffer." into nyc-dev
Scott Main [Thu, 10 Mar 2016 23:43:50 +0000 (23:43 +0000)]
Merge "fix the docs preview version number" into nyc-dev
Chris Craik [Thu, 10 Mar 2016 23:43:13 +0000 (15:43 -0800)]
Fix node rejection crash
bug:
27598131
Change-Id: Iea05c22ec10f92beef9c47236929eb5f860d84f9
smain@google.com [Thu, 10 Mar 2016 23:37:58 +0000 (15:37 -0800)]
fix the docs preview version number
Change-Id: I8c8a8fb6bd431eade40e62a6b135b628811c0558
Muyuan Li [Thu, 10 Mar 2016 23:34:18 +0000 (23:34 +0000)]
Merge "Making clearAllNotifications in PSB public." into nyc-dev
Prathmesh Prabhu [Thu, 10 Mar 2016 23:23:34 +0000 (15:23 -0800)]
screencap: Nix deprecated direct read of framebuffer.
screencap command had a fallback path that tried to read the framebuffer
directly. This is no longer supported (and is blocked by selinux
policy), so delete said path.
BUG:
27598623
Change-Id: I1b002d4a68ad93f75b150029d01b5f0c500be56c
Steve McKay [Thu, 10 Mar 2016 23:18:49 +0000 (23:18 +0000)]
Merge "Fallback to byte-by-byte copy/move if optimized fails." into nyc-dev
Scott Main [Thu, 10 Mar 2016 23:14:26 +0000 (23:14 +0000)]
Merge "update preview version number to 2 for offline docs" into nyc-dev
smain@google.com [Thu, 10 Mar 2016 23:13:28 +0000 (15:13 -0800)]
update preview version number to 2 for offline docs
Change-Id: I56cab8d21f9521fab17ec79a441c518cf9da536c
Scott Main [Thu, 10 Mar 2016 23:12:43 +0000 (23:12 +0000)]
Merge "make new 'referenceonly' docs build the default for offline docs. add preview codename and version number HDF variables for generated docs." into nyc-dev
Vadim Tryshev [Thu, 10 Mar 2016 23:08:06 +0000 (23:08 +0000)]
Merge "Setting mBackdropBack to null if artwork isn't available." into nyc-dev
smain@google.com [Thu, 10 Mar 2016 22:13:30 +0000 (14:13 -0800)]
make new 'referenceonly' docs build the default for offline docs.
add preview codename and version number HDF variables for generated docs.
Change-Id: I165526f4e575ec8885bab906e66d17666ea8b4ba
Abhijith Shastry [Thu, 10 Mar 2016 22:55:17 +0000 (22:55 +0000)]
Merge "Tweak createManageBlockedNumbersIntent API documentation." into nyc-dev
Makoto Onuki [Thu, 10 Mar 2016 22:29:20 +0000 (22:29 +0000)]
Merge "Guard against null bitmap path" into nyc-dev
Makoto Onuki [Thu, 10 Mar 2016 22:24:58 +0000 (14:24 -0800)]
Guard against null bitmap path
Bug
27548047
Change-Id: I7130652f5ae6f7ff6bd4ae6a3ace31986a49be30
Alan Viverette [Thu, 10 Mar 2016 20:52:00 +0000 (15:52 -0500)]
Ensure Outline consistently sets the radius to be undefined
Radius should only be defined when the rect is also defined. Also updates
ArcShape to not return an outline, since it may be convex.
Bug:
27593976
Bug:
27592381
Change-Id: I99010b139361607af6ec8cab26c9aa1d4dcbba77
Adam Lesinski [Thu, 10 Mar 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Cache per-Activity Resources objects" into nyc-dev
Makoto Onuki [Thu, 10 Mar 2016 20:42:26 +0000 (20:42 +0000)]
Merge "Refactor ShortcutService" into nyc-dev
Makoto Onuki [Thu, 10 Mar 2016 20:41:43 +0000 (20:41 +0000)]
Merge "Fix crash-loop on wiped FBE device." into nyc-dev
Eino-Ville Talvala [Mon, 7 Mar 2016 02:40:01 +0000 (18:40 -0800)]
Camera2: Add buffer drop error callback
Previously single buffer drop errors were not propagated to
the client application, even though the HAL generated them.
Add new error callback to handle this case.
Bug:
24168122
Change-Id: Ice0d9a3592efed222351353abd7acc35854a20bd
Makoto Onuki [Thu, 10 Mar 2016 20:28:38 +0000 (12:28 -0800)]
Fix crash-loop on wiped FBE device.
Bug
27595678
Change-Id: I02708b3c9e5472c5548bda7e6e15189614056471
Vadim Tryshev [Thu, 10 Mar 2016 00:44:30 +0000 (16:44 -0800)]
Setting mBackdropBack to null if artwork isn't available.
Otherwise, it preserves the old image. Later, mBackdropFront will
get this image and try fading from it. This will suddenly flash the
old image.
Bug:
25185253
Change-Id: I702e73684e692712edf48ce31c152c5f5a8bffdb
Jason Monk [Thu, 10 Mar 2016 20:13:20 +0000 (20:13 +0000)]
Merge "Fix weird QS Edit bug" into nyc-dev