Add back increasing ring feature (2/3).

Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be
Add missing strings
Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-12.0
Settings: Add Advanced reboot (1 of 2)

This commit adds a setting in Development settings for including options
in the power menu for rebooting into recovery or bootloader, defauled to
off.

When enabled, the Advanced reboot options will only be available once the
device is unlocked.

Change-Id: Ib77f0be178d15131b99adbe0abb6ba18b2b7c0b6

From: jackmu95 <jacob.mueller.elz@gmail.com>
Settings: Move 'Advanced reboot' to other position

This commit moves the 'Advanced reboot' checkbox one item down
because it looks a bit strange as first element in the list IMHO.

Before: http://goo.gl/jhw8h
After:  http://goo.gl/X3H68

Change-Id: I26d4a5caba3e720b952ec405e200c1528f7a7321

From: ThiagoVinicius <thiagovfar@gmail.com>
Development Settings: fix setting reset on disable

When Development Settings are disabled, some settings are
reset to values other than the default. This fixes it.

 - No need to have resetAdvancedReboot(), as it is already
   reset by the "unckeck all checkboxes" logic.

Change-Id: If5d88d220d2a17d6e172b2f54facd4afa3bae904
(cherry picked from commit 28ad8e332631198a987d55eed13440a5332ec19a)
Port "Option to hide Adb notification icon (1/2)"

Frameworks part is already in place

Change-Id: Ie65625305153b45012846f6d2250fb707c4eebfd
(cherry picked from commit 56bf1fd7a15d4ce6169790c2957f93c9a385fdd1)
Settings: Forward port long-press-back to kill app (1/2)

Change-Id: I60f4b95eb9cc2ef6cf73a5f9317bca066e6bb901
(cherry picked from commit 34789e4e418dceed878902ca8d4f90642fcd48c0)
Add AOSP version
(cherry picked from commit 963cb165c77d3c084e0e11812187c336898f660c)

(cherry picked from commit 44987456bcf7eb8187184a08456c50d942ba8d0a)
(cherry picked from commit ec6a8031c6115a4f2c18625caf03fdebc4adc7ee)
(cherry picked from commit 431222ca640a22ba1101eb6c63413ed751e124b1)
(cherry picked from commit bc1d912cd31f40b724d851438160e012737150e6)
(cherry picked from commit d8d8958e51c6a990b3bd1d52e3884cbfc9ad41e8)
(cherry picked from commit d83c61131051f47e5ecac4f1c288022669edec63)
(cherry picked from commit 78ef55f03bb6a5118ecc6844579cec76872ebb04)
(cherry picked from commit 48260ff7ae2f51f7d61b96562415b781194cd30c)
(cherry picked from commit a5b9b834210e7065eff1845805b3582be58603fe)
(cherry picked from commit 09ebd5eef0b09eb0ffad20a43021a3e035af3aba)
(cherry picked from commit cfdc5308da58013e2329bd9eb187408b81cbd28c)
(cherry picked from commit 9206e3e2a1a0ca5d05e52893586bf4a965961d50)
(cherry picked from commit 264197886e7a525b7110e424530012857a2bf17e)
(cherry picked from commit 0b147d69e5b6f656530d8133c4937f42eae4ccda)
(cherry picked from commit df3bd3e9f2a6cdb837f20b5b7ea5d857cb3cb33a)
(cherry picked from commit 8734f8db169b698321f067ef40e88b0b69582b19)
(cherry picked from commit 18333dd1bc5b6a81155349953ca4e8aa6e30b40f)
(cherry picked from commit 1401a0930ebd31d6c01aeb3c0f486fc161809e9b)
(cherry picked from commit c3fe973f75a3b14d819a20a4f5af51caf2b9e3a8)
(cherry picked from commit 1f5503c98d7907012794759f882d6193a850f9d2)
(cherry picked from commit e79445de859fb136ca0c4b14ba44acf71565dcc7)
Revert "Add AOSP version 2"

This reverts commit c82d8bfbe4d70f6d998e94ec6bd27cbdfdb8472c.

Conflicts:
	res/values/cr_strings.xml
rename Home

(cherry picked from commit 9223cf0158213febcf070abd6910e2ea36d9158f)
(cherry picked from commit ec94213560bd25feac17dd911ef577f09b253ec7)
(cherry picked from commit aea7c365c4b1785c575546cdcc0164052efe94e5)
(cherry picked from commit 6795910b52fef7a7fea106337ed02724fcb3647d)
(cherry picked from commit 50cac53f236540482aa44f0b509a3b2465c149e4)
(cherry picked from commit 56f39dd0981f526bf9cb8d4067f27ccb85f29ee5)
(cherry picked from commit 1c03c69f2cc1f7b3ef632580ee4440b728db352d)
(cherry picked from commit 0ca72cd61375ad39388266083d91fbcab90868bd)
(cherry picked from commit f04a451e69bc95f9e95c1e9c636d0aa6b9a0df10)
Add build id to AOSP rev

(cherry picked from commit bc28464e36f959f33ccf796561a8901d0c68bb09)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit f1bbaf26c9e86ea976c7638565a5fbe91316355c)
(cherry picked from commit a53990cab1f04d5dedcad19d0c1e7e469cbdc9a3)
(cherry picked from commit f08eff19efdc2995f02e0ef7211142424e006442)
(cherry picked from commit 03bc96419970711e96052a1ec916ffe0768c516c)
(cherry picked from commit 86ca2cabb237f72000ebda31803ecb9e9d3d86a0)
(cherry picked from commit 31e3add73faede5b062ee620d591d362aa2847df)
(cherry picked from commit c2b4bb16f23251b311ad6d155a9748b6f275439c)
(cherry picked from commit e6e23a5dbb8715e72f076d7886c4c777105b22af)
(cherry picked from commit b6af34cb7a9a0942380b275b3a8bde2cb7f57542)
Derp

(cherry picked from commit 1c27e9a42a3bd84736e5b88df7e508e50ab67cc6)
(cherry picked from commit 0b6a692000e22631e8e2db5c26b490c20c2891d2)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit ff14f9e3106cc891628276ecd76deda308656c7c)
(cherry picked from commit 042548b37ae998185e89ecfe5776ed601f440d72)
(cherry picked from commit aeeaf521b6a108147821cbd2c5242bcc48a06e83)
update to AOSP 5.0.0r7

(cherry picked from commit 7f60fa8a56833b81e15cb5046ccbe2eb5e743e29)
(cherry picked from commit 0d66c0783d3c7d22dd622bf0a19b2026c85cc547)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 0eaf4c1c5c4423a46cba0ebcb875b1f1a7f51853)
derp

(cherry picked from commit 9beedfe12917b4cb6929008ecdcb9249ef5b57a9)
(cherry picked from commit 080ff6a719792679647bba6540139b3a564957c0)
team ub

(cherry picked from commit 1439458d938b9db85c5e2d93044049078f706135)
(cherry picked from commit 52baf58855c1595f7651ab26dbc1e6be03ca7623)