separate files for activity/dialog styles
Merge branch 'master' into android-1.5