微小改动
Merge branch 'master' of https://github.com/ShaoKi/360FloatWindow16

Conflicts:
	360FloatWindow/res/values/styles.xml