gap & trigger area

Change-Id: Ife0ceca8f4b86b216e7a94af24a0066a867eba79

Conflicts:

	res/values/strings.xml