Fix: reported disable redundant statusbar information

Current state we introduced with first SlimPIE patch is that
if the user disable statusbar information (clock/date/airplanemodeicon)
that it is always hidden...even if the user set SlimPIE to only on
expanded desktop mode. That is not consistent and some user
wonder why the do not have this information any more in normal mode.

This commit fixes this.....respects also the expanded mode hide
only navbar.....as well a small cleanup from old battery code.
Airplanemodeicon hide I removed from redundant hide information now....
to change that on the fly would need an observer and a bit code rearrange
which does not fit the use compared to the resources we would use then.
Beside that all other icons are as well shown because our PIE does not
show signal strength etc.

Cheers

Change-Id: I53f1fed10a13551e7642e5b00c1d3b88a9622ab0

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java