Move editing from long press to edit button

Change-Id: I2bd0e2febbde4babe05545c79d585280a7b2fb14
4 files changed