OSDN Git Service
Chong Zhang [Wed, 2 Mar 2016 20:10:09 +0000 (20:10 +0000)]
Merge "Force disconnect when the surface is about to be saved." into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:07:33 +0000 (20:07 +0000)]
Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev
Robin Lee [Wed, 2 Mar 2016 20:05:39 +0000 (20:05 +0000)]
Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev
Steve McKay [Wed, 2 Mar 2016 19:56:20 +0000 (19:56 +0000)]
Merge "Don't show title in delete confirmation." into nyc-dev
Robin Lee [Wed, 2 Mar 2016 19:54:04 +0000 (19:54 +0000)]
DevicePolicyManager#removeKeyPair- update contract
May also return true if the keypair didn't exist in the first place
which is a small reduction in the amount of information leakage, but
more importantly lets a caller be sure about keystore state at the end
of their call.
Bug:
27335182
Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
Jason Monk [Wed, 2 Mar 2016 19:52:27 +0000 (14:52 -0500)]
Shrink button ripple on QS btns to 36dp
Bug:
27388390
Change-Id: I1efbedfdf720edf4cf5d43797da59904d91cb543
Jason Monk [Wed, 2 Mar 2016 19:48:24 +0000 (19:48 +0000)]
Merge "Add edit title to QS edit" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 19:48:00 +0000 (19:48 +0000)]
Merge "Guard against monkey crash" into nyc-dev
Ben Kwa [Wed, 2 Mar 2016 19:39:04 +0000 (19:39 +0000)]
Merge "Tweak root item layouts." into nyc-dev
Jason Monk [Wed, 2 Mar 2016 19:38:31 +0000 (14:38 -0500)]
Guard against monkey crash
Bug:
27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
Alan Viverette [Wed, 2 Mar 2016 19:21:16 +0000 (19:21 +0000)]
Merge "Check process state when killing background processes for density" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 19:11:14 +0000 (14:11 -0500)]
Add edit title to QS edit
Bug:
27439419
Change-Id: I3807dc56a05b1ffafcd9b390dfdbc1da9a7ebcac
Jim Kaye [Thu, 11 Feb 2016 16:27:51 +0000 (08:27 -0800)]
Support keyboard entry of non-ASCII characters
Add characters to the keyboard mapping to allow them
to be entered into the AVD from the developer's PC
keyboard.
This mapping supports the non-ASCII keys that appear
on the "US International" keyboard. Most of the Latin-1
characters (but not all) appear on this keyboard.
This change does not remove support for any keys.
b.android.com/200042
Change-Id: I65d54eb36183382b171c388b26848941eb0ff8d9
(cherry picked from commit
dac57966a9ddc2e3dbd233c8b1e7b83f60e11373)
Chris Craik [Wed, 2 Mar 2016 18:52:33 +0000 (18:52 +0000)]
Merge changes I4f72448f,I74b7233c into nyc-dev
* changes:
Fix ripple positioning within scrolled node
Clip projected ripples to outlines
Steve McKay [Wed, 2 Mar 2016 18:49:27 +0000 (18:49 +0000)]
Merge "Always show intern storage." into nyc-dev
Chris Craik [Wed, 2 Mar 2016 02:48:37 +0000 (18:48 -0800)]
Fix ripple positioning within scrolled node
bug:
27275799
Skip applying clip/matrix properties from projected node op, since we
don't want to respect the clip, and matrix is already baked into
transformFromCompositedAncestor.
This skips op clips in the new pipeline, and fixed a double application
of scroll on ripple backgrounds.
Change-Id: I4f72448fe0463ab666564ca538d8b6bf525d98de
Steve McKay [Tue, 1 Mar 2016 23:41:47 +0000 (15:41 -0800)]
Always show intern storage.
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".
Bug:
27297398
Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
Dongwon Kang [Wed, 2 Mar 2016 18:34:08 +0000 (18:34 +0000)]
Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev
Adam Lesinski [Wed, 2 Mar 2016 18:32:15 +0000 (18:32 +0000)]
Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev
Chong Zhang [Wed, 2 Mar 2016 18:29:57 +0000 (18:29 +0000)]
Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev
Chris Craik [Tue, 1 Mar 2016 21:27:54 +0000 (13:27 -0800)]
Clip projected ripples to outlines
bug:
27343928
Also fixes positioning of ripples to a scrolled projection receiver.
Change-Id: I74b7233c46d7c15839ca8bf50e188ba6646d7432
Gus Prevas [Wed, 2 Mar 2016 18:28:27 +0000 (18:28 +0000)]
Merge "Removes swipe-to-dismiss from Wear window styles." into nyc-dev
Fyodor Kupolov [Wed, 2 Mar 2016 18:18:35 +0000 (18:18 +0000)]
Merge "Added dump method to NetworkTimeUpdateService" into nyc-dev
Chris Wren [Wed, 2 Mar 2016 17:51:23 +0000 (17:51 +0000)]
Merge "add all those great comments from the other file" into nyc-dev
Jaewan Kim [Fri, 26 Feb 2016 20:54:33 +0000 (12:54 -0800)]
PIP: Show recents again when PIP menu is closed
Framework enforces that an app cannot go back to Recents.
So launches the Recents again for the PIP menu.
Change-Id: I7526edfe7dd38c7eb1befe6a8b2b5f4ea30aa84e
Rubin Xu [Wed, 2 Mar 2016 17:48:04 +0000 (17:48 +0000)]
Merge "Fix widget icon and tap behaviour." into nyc-dev
Jason Monk [Wed, 2 Mar 2016 17:42:26 +0000 (17:42 +0000)]
Merge "Fix crash from battery detail" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 17:40:43 +0000 (12:40 -0500)]
Fix crash from battery detail
Bug:
27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
Greg Kaiser [Wed, 2 Mar 2016 17:27:46 +0000 (17:27 +0000)]
Merge "SensorEventListener: Clarify documentation." into nyc-dev
Greg Kaiser [Wed, 2 Mar 2016 17:26:44 +0000 (17:26 +0000)]
Merge "doc: Fix syntax error in code example." into nyc-dev
Greg Kaiser [Wed, 2 Mar 2016 17:15:51 +0000 (17:15 +0000)]
Merge "docs: Mild fix to a sensors_overview code example" into nyc-dev
Keun-young Park [Wed, 2 Mar 2016 17:12:40 +0000 (17:12 +0000)]
Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev
Gus Prevas [Tue, 23 Feb 2016 14:06:57 +0000 (09:06 -0500)]
Removes swipe-to-dismiss from Wear window styles.
Change-Id: I15eef22c0c90961932b9aad9b618e582804aea9e
(cherry picked from commit
6da0566a03f93c4576a0dbd5facfd6bac5206066)
Geoff Mendal [Wed, 2 Mar 2016 16:38:49 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Calin Juravle [Wed, 2 Mar 2016 16:17:33 +0000 (16:17 +0000)]
Merge "Simplify the error logs for profiles we can't open." into nyc-dev
Alan Viverette [Wed, 2 Mar 2016 15:47:14 +0000 (10:47 -0500)]
Check process state when killing background processes for density
Previously, we were not killing many processes because we weren't in an
actual OOM condition. This CL moves the background killing rules to a
separate method and checks the process state. This removes the OOM
adjustment check and *will* kill persistent processes.
Bug:
27397233
Change-Id: Ibc21e97cfc729a0835e613095acd9a4b648906d8
Geoff Mendal [Wed, 2 Mar 2016 15:30:42 +0000 (07:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
Geoff Mendal [Wed, 2 Mar 2016 15:26:06 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 2 Mar 2016 15:25:28 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
Geoff Mendal [Wed, 2 Mar 2016 15:22:26 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 2 Mar 2016 15:20:37 +0000 (07:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 2 Mar 2016 15:20:12 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 2 Mar 2016 15:14:03 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
Narayan Kamath [Wed, 2 Mar 2016 14:25:37 +0000 (14:25 +0000)]
Merge "Track libcore change
2729b8c4d26170." into nyc-dev
Narayan Kamath [Wed, 2 Mar 2016 13:35:23 +0000 (13:35 +0000)]
Track libcore change
2729b8c4d26170.
test-current.txt was regenerated on nyc-dev.
bug:
27423298
(cherry picked from commit
b16a96538aa735c6926a95250fde2eca4b8e38ad)
Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
Kenny Guy [Wed, 2 Mar 2016 14:16:17 +0000 (14:16 +0000)]
Merge "Don't clear widget providers from stopped profiles." into nyc-dev
Deepanshu Gupta [Wed, 2 Mar 2016 13:32:17 +0000 (13:32 +0000)]
Merge "Add StubMethodAdapterTest" into nyc-dev
Deepanshu Gupta [Wed, 2 Mar 2016 08:39:24 +0000 (00:39 -0800)]
Add StubMethodAdapterTest
This tests the bugfix in StubMethodAdapter made in the change with id
I098996e43e330e995d33f12df1c16355bbc02f0f (commit
491523d)
Change-Id: I1ac897a49071dd9558bdc6b8abec29df913a6047
Geoff Mendal [Wed, 2 Mar 2016 13:28:43 +0000 (13:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Deepanshu Gupta [Wed, 7 Oct 2015 00:53:51 +0000 (17:53 -0700)]
LayoutLib: Reference android's junit in intellij project.
Prevents errors due to mismatch in junit version.
Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4
Geoff Mendal [Wed, 2 Mar 2016 13:25:51 +0000 (08:25 -0500)]
Import translations. DO NOT MERGE
Change-Id: I290495e9a0b12c372f30904725ac1d5fad961042
Auto-generated-cl: translation import
Nimrod Gileadi [Wed, 2 Mar 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Close InputStream in BatteryStatsHelper" into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 09:00:46 +0000 (09:00 +0000)]
Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 08:57:46 +0000 (17:57 +0900)]
Fix DocumentUI's perf tests compile failure.
It compiled locally, but not on the APCT.
Bug:
27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
Diego Perez [Wed, 2 Mar 2016 08:57:25 +0000 (08:57 +0000)]
Merge "Fix layoutlib expand unit test" into nyc-dev
Erik Kline [Wed, 2 Mar 2016 08:37:06 +0000 (08:37 +0000)]
Add 464xlat notification callback
am:
8d6edc3270
* commit '
8d6edc3270616b119645fbdf8752c0ea37de0731':
Add 464xlat notification callback
Lorenzo Colitti [Wed, 2 Mar 2016 08:32:50 +0000 (08:32 +0000)]
Merge changes Id78aab9c,I51096b18 into nyc-dev
* changes:
Speed up ConnectivityServiceTest.
Make it easier to test code that uses WakeupMessage.
Tomasz Mikolajewski [Wed, 2 Mar 2016 08:06:02 +0000 (08:06 +0000)]
Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 07:58:55 +0000 (16:58 +0900)]
Add a missing include in DocumentsUI Android.mk.
Without it, perf tests were not built on APCT.
Bug:
27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
Lorenzo Colitti [Sat, 20 Feb 2016 16:09:26 +0000 (01:09 +0900)]
Speed up ConnectivityServiceTest.
1. Override WakeupMessage with an implementation that uses
sendEmptyMessageDelayed. This allows us to replace a
6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.
With these changes ConnectivityServiceTest goes from ~9s to ~3s.
Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
Erik Kline [Mon, 29 Feb 2016 07:00:01 +0000 (16:00 +0900)]
Add 464xlat notification callback
Bug:
26238390
Bug:
26991160
Change-Id: I556e779c642d19cd8d26637dd98055157d005f77
Tomasz Mikolajewski [Wed, 2 Mar 2016 06:12:28 +0000 (06:12 +0000)]
Merge "Fix broken tests due to uninitialized roots." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 05:38:23 +0000 (14:38 +0900)]
Fix broken tests due to uninitialized roots.
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
Sungsoo Lim [Wed, 2 Mar 2016 05:40:00 +0000 (05:40 +0000)]
Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 05:35:02 +0000 (05:35 +0000)]
Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev
Lorenzo Colitti [Sat, 20 Feb 2016 16:04:13 +0000 (01:04 +0900)]
Make it easier to test code that uses WakeupMessage.
Code that uses WakeupMessage uses the AlarmManager. Testing such
code is slow because AlarmManager.MIN_FUTURITY ensures that
alarms must wait at least 5 seconds before firing.
This change makes WakeupMessage's fields protected so that test
code can subclass from it and override schedule() and cancel()
with implementations that do not use AlarmManager, for example
by making schedule() call sendEmptyMessageDelayed and making
cancel() call removeMessages.
Change-Id: I51096b182d9eb87cc7bd46c3c91906f18356b354
Sungsoo Lim [Tue, 23 Feb 2016 08:30:33 +0000 (17:30 +0900)]
MediaBrowserService: Make SubscriptionCallback.onError be called
Bug:
26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
Wale Ogunwale [Wed, 2 Mar 2016 04:46:52 +0000 (04:46 +0000)]
Merge "Enable add/remove window manager log points" into nyc-dev
Wale Ogunwale [Wed, 2 Mar 2016 04:42:53 +0000 (20:42 -0800)]
Enable add/remove window manager log points
To debug
27286867.
Bug:
27286867
Change-Id: Iab5e608f8437ee0e315bfa3d091980f4a9e3a3b5
Hyunyoung Song [Wed, 2 Mar 2016 04:40:45 +0000 (04:40 +0000)]
Merge "Update wallpaper asset for N dev preview Bug:
27434845" into nyc-dev
Hyunyoung Song [Wed, 2 Mar 2016 04:39:03 +0000 (20:39 -0800)]
Update wallpaper asset for N dev preview
Bug:
27434845
Change-Id: I0f9ff168beab12d630ab824ab632f98051564570
Lorenzo Colitti [Wed, 2 Mar 2016 04:18:02 +0000 (04:18 +0000)]
Merge changes Ic366b532,I0179b45b into nyc-dev
* changes:
Move PinningNetworkCallback out to a new NetworkPinner class.
Use MessageUtils in ConnectivityManager.
Tomasz Mikolajewski [Wed, 24 Feb 2016 03:53:44 +0000 (12:53 +0900)]
Add scaffolds for performance tests of DocumentsUI
Bug:
27370274
Change-Id: I14dea1b85cd84c8bb3c0eee27b2954108bfa4f8b
Lorenzo Colitti [Tue, 1 Mar 2016 03:55:58 +0000 (12:55 +0900)]
Move PinningNetworkCallback out to a new NetworkPinner class.
Also add tests.
Bug:
19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
Bryce Lee [Wed, 2 Mar 2016 03:21:35 +0000 (03:21 +0000)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. am:
7c2539e2a5 -s ours
am:
21c47d1b22 -s ours
* commit '
21c47d1b22cfa317d7925b01de1c13cc2a39b3d6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Jeff Sharkey [Wed, 2 Mar 2016 03:17:41 +0000 (03:17 +0000)]
Merge "When system server goes down, crash admins." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 02:46:25 +0000 (19:46 -0700)]
When system server goes down, crash admins.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.
The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.
Bug:
27364859
Change-Id: I866a8c3c9682da1de2a31fe8b4ffcc9d7f4d8ba0
Bryce Lee [Wed, 2 Mar 2016 03:12:09 +0000 (03:12 +0000)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
am:
7c2539e2a5 -s ours
* commit '
7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Jeff Sharkey [Wed, 2 Mar 2016 02:42:14 +0000 (02:42 +0000)]
Merge "When system server goes down, crash apps more." into nyc-dev
Fyodor Kupolov [Wed, 2 Mar 2016 02:41:51 +0000 (02:41 +0000)]
Merge "Restored switchTo method" into nyc-dev
Fyodor Kupolov [Wed, 2 Mar 2016 02:39:27 +0000 (18:39 -0800)]
Restored switchTo method
It is current used in another branch. Restored to fix a breakage.
Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
Jeff Sharkey [Wed, 2 Mar 2016 02:27:23 +0000 (19:27 -0700)]
When system server goes down, crash apps more.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.
The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.
Bug:
27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
Keun-young Park [Wed, 2 Mar 2016 02:18:19 +0000 (02:18 +0000)]
Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
This reverts commit
92373d23ee13a3d017ee8570229eed164935cd35.
Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f
Jeff Sharkey [Wed, 2 Mar 2016 01:54:11 +0000 (01:54 +0000)]
Merge "Start unaware persistent apps after user unlocked." into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 01:52:18 +0000 (01:52 +0000)]
Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 01:51:42 +0000 (01:51 +0000)]
Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
This reverts commit
9f68f41a5866e1feb810b16c769705c10e850d5d.
Caused breakage.
Change-Id: I441737f61f6f38ed9f440211b52bbac0f74982e3
Jeff Sharkey [Wed, 2 Mar 2016 01:38:49 +0000 (18:38 -0700)]
Start unaware persistent apps after user unlocked.
Otherwise we'll never start them. In particular, this fixes NFC.
Bug:
27360562
Change-Id: I9d430b1e377e63b35060b234f585ac180a369ad2
Insun Kang [Wed, 2 Mar 2016 01:36:09 +0000 (01:36 +0000)]
Merge "Annotate Media section of framework/base" into nyc-dev
Steve McKay [Wed, 2 Mar 2016 01:33:31 +0000 (01:33 +0000)]
Merge "Fix roots filtering for move operations." into nyc-dev
Steve McKay [Tue, 1 Mar 2016 23:11:56 +0000 (15:11 -0800)]
Fix roots filtering for move operations.
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
directory is in the set of files to be copied.
Bug:
27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
Selim Cinek [Tue, 1 Mar 2016 20:06:57 +0000 (12:06 -0800)]
Fixed a bug where the notification texts wouldn't animate
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.
Bug:
27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
Jeff Sharkey [Wed, 2 Mar 2016 00:53:11 +0000 (00:53 +0000)]
Merge "Don't evict SharedPreferences when migrate no-op." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:52:34 +0000 (00:52 +0000)]
Merge "Make preferred activities encryption aware." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:52:20 +0000 (00:52 +0000)]
Merge "Utility to detect lock inversions in system." into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 00:49:28 +0000 (00:49 +0000)]
Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev
Wale Ogunwale [Wed, 2 Mar 2016 00:45:02 +0000 (00:45 +0000)]
Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev
Vadim Tryshev [Thu, 18 Feb 2016 23:41:21 +0000 (15:41 -0800)]
Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
It allows badging an image regardless of of the user (no
user id parameter). The styling for managed users is applied.
This is useful for new cases where the existing functions
wouldn't badge the icon, but we need it.
Bug:
25192539
Change-Id: I20ca2d7265cbc3a47c050a72ec1843cc0a481c74
Jeff Sharkey [Wed, 2 Mar 2016 00:38:39 +0000 (00:38 +0000)]
Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:38:31 +0000 (00:38 +0000)]
Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev
Yigit Boyar [Wed, 2 Mar 2016 00:36:48 +0000 (00:36 +0000)]
Merge "Check if item is selectable before calling on click" into nyc-dev