change to support android 4.1.1+(api16), and update Edit Acitivity