wifi: forward port avoid poor connection setting

Change-Id: I22d0866e2c5d9b7f119b7ad42cc66e78bfd6ada0
fixup "wifi: forward port avoid poor connection setting"

Change-Id: I3545e874bd6519a586744fc36297f7f3f3cb1f42
Battery style: fix dynamic percentage setting

not being disabled after escaping from the statusbar
settings page and going back to it
(bug reported here: http://review.cyanogenmod.org/#/c/82420/)

PS2: better int name thanks to Michael

Change-Id: I3ddf69081866f6214c8880b6a4e2bab6fcd01b9c

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBarSettings.java
Wakelock Blocker [2/2]
Fix the hyphen in "Wi-Fi" to use an actual hyphen instead

If one were to change the system font to something else, the hyphen in "Wi-Fi" would appear as a box since it can't find the character. This fixes it and uses actual hyphens so they will appear properly when the system font is changed.