Replacing deprecated fill_parent xml value with match_parent
Replacing dip with dp