Settings: option to hide battery icon (2/2)

Change-Id: I1c63e5f7ed6f5e695265e68399670032b12a74ed
fixes for hiding signal and battery icon (2/2)

  - signal icon was still showing when set to text or dbm
  - data network type was still showing when bars were hidden
  - battery icon was still showing when set to circle or circle with percentage, etc..
  - fix signal icon by setting the icon to bars when hiding option is set
  - fix battery icon by setting the icon to default when hiding option is set

patchset 2:
  - added code to disable the icon options when icons are hidden
  - set data activity indicator summary dependant on icons showing or disabled
Change-Id: I949cbc872cac064a54208f9138a838b8b0e5a46b