Settings: move getFormattedSimName() to frameworks (1/2)

Conflicts:
        res/values/cm_strings.xml
        src/com/android/settings/DataUsageSummary.java
        src/com/android/settings/MultiSimSettings.java
        src/com/android/settings/SelectSubscription.java

Signed-off-by: Roman Birg <roman@cyngn.com>

Change-Id: I6925ac82a777c15fcb6b8ada37ef79dd31ce77dd
Settings - Wifi notifications: notify when wifi connects [2/2]

Options:
off (default)
a dry white toast
a notification
a notification with a sound

For those of us that survive on wifi islands in small college towns this
is
pretty nice to have

Any notification within 30 seconds of broadcast intent
ACTION_BOOT_COMPLETED
will be canceled to prevent startup notification spamming. 8 (default)
of the
previous connections are remembered and it will update the
notification's content
accordingly if you've restored a connection.

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Change-Id: Ica4b868e4db5a77e1ad352b8a2e9308e2429aba0
Signed-off-by: STELIX <ssspinni@gmail.com>
Settings menus: aosp-ify

Change-Id: Idb49f395245143587ac54a89d71aeea09e56d452
Revert "settings: Enable location mode header switch"

This reverts commit 41f2869865fafdeee5dc96deb1ebb96bbe9447dd.

Conflicts:
	src/com/android/settings/Settings.java

Change-Id: I0bb34edb38d88a861324fba08a62ba4b29ffc56e