more direct option constructor calls in PreferenceActivity
Merge branch 'master' into ice-cream-sandwich