OnItemClickListener verlagert

Change-Id: Ib43b921b434b00c46151107df377e25d47b16f49