Small cleanup of deprecated API, simpler way to make a pref intent

git-svn-id: https://zxing.googlecode.com/svn/trunk@2818 59b500cc-1b3d-0410-9834-0bbf25fbcc57