Quicksettings: Correct alignment.

* Fix issues cumulated during quick settings rework, restore android behaviour for margins and ditch empty views (that were applied only to basic constructed tiles).
* Wrap battery views into a separate parent layout so we align only that one that contains both.
* Clean circle battery sizes calculations and ditch inside padding for external margin (derp).
* Increase dual switch area a bit, since is an overlaied view is fine does not affects margins.

Before:
* https://drive.google.com/file/d/0B2UbDLX5_0AjWkFmcEtKN3hJcHM/edit?usp=sharing
* https://drive.google.com/file/d/0B2UbDLX5_0Ajb1F3MWw4UjVpYzg/edit?usp=sharing

After:
* https://drive.google.com/file/d/0B2UbDLX5_0AjY3ZvUm54S1ZURGc/edit?usp=sharing
* https://drive.google.com/file/d/0B2UbDLX5_0AjUXJrMlpTSlpVLTQ/edit?usp=sharing

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Conflicts:
	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/BatteryCircleMeterView.java
Add NFC QuickSettings Tile

Conflicts:
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

Conflicts:
	packages/SystemUI/res/values/ras_strings.xml
Fix NFC tile not showing on reboot

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
[1/2] base : disable immersive mode on lockscreen

Change-Id: I2b8e00d22b1e16bf137d20b14d1191bc2318eea3

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Revert "immersive mode: don't unconfirm a package, that's just dumb"

This reverts commit ecba6c92b272bfb31808246772a5de6f430fbcbb.

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java