Settings: Forward port ADB over network (Part 1 of 2)

Squashed commit of:
- Adb over network (Settings part for Jellybean)
  + Display WiFi IP Address & Port as preference summary.
  Note: adb_over_network were already pushed in 5555aae
  Author: Tanguy Pruvot
  Id: Ia05aa8f6281c9bdcb3d5e62566b103c38bc70b82

- Settings : Fix mismatched dialog listener
  Set listener on correct dialog
  Author: Danesh Mondegarian
  Id: I0c05af859ad0e93ba6a1d3d395dc6c31e9949426

- ADB: missing dialog dismiss, and use updateCheckBox()
  this function check if debug features are enabled.
  Author: Tanguy Pruvot
  Id: I675a3a9ce5c28b16f9e13e78499e5f6f897b9dd3

- DevelopmentSettings: Refactor ADB over Network
  The checkbox would never enable adbd in tcpip mode.
  Author: Alexander Hofbauer
  Id: Iab8307bb91f69d85ed3a46d5ef09274fa8b03da

Patchset 2 : Remove dupe checkbox and move to proper header

[mikeioannina]: Update for L

Change-Id: I3d61408946912fa0e5f796531413c78255257efe

(cherry picked from commit 087b555046cd5bc225228f13e9e20dc3d4fae5c7)
Remove merge error in cm_arrays comment block

* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512

(cherry picked from commit c30b32bf2817d40a11f53f09014cbd6a4bcbe745)
(3/3) allow to configure lcd density

Change-Id: If043aa731a3515ea644079f1842d48de1f5cfec1
(cherry picked from commit 0cc2579b6abb04566fd831b886a9ce61aa07b375)

Conflicts:
	res/values/cmr_strings.xml
	src/com/android/settings/DisplaySettings.java
Battery text mode (2/2)

Change-Id: I13bdf2236811f535b0ac324b5b78c0ab12f365a6
Signed-off-by: kecinzer <kecinzer@gmail.com>

Patchset: 2
http://review.cyanogenmod.org/#/c/79709/
(cherry picked from commit 87ee529839bb3cb8343db6d576b4ad8401505c56)

Conflicts:
	res/xml/status_bar_settings.xml
Settings: Add vibration intensity support (Temasek)
https://github.com/temasek/android_packages_apps_Settings/commit/1dd7fb3358ea9cf02fb6802fe14b86c286e9dcdf