fixed disabled status in  listview
merging changes
adding back android support jar