poss widget derp

(cherry picked from commit a698cc780063d4da14ddd7a064db77fdd5081532)
[3/3] Settings: Add NFC polling setting

Change-Id: I1f715d9ab6b77cf4903e2bf5ef8310471c178309

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml

(cherry picked from commit a9b458d8ece6496f80a94ae3adf4781298e51ae0)
Revert "Settings: Lockscreen Temasek Handle"

This reverts commit ab5f2a9cf0f0918127f9c8c86e57435647665e7c.

Conflicts:
	res/drawable/temasek_lock.png

(cherry picked from commit bdbd24acc347ff3575da28abc66bc238a3e80417)

Conflicts:
	src/com/android/settings/temasek/LockscreenStyle.java
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)
Add AOSP version 2

(cherry picked from commit 7ca6927d6f1a876123c8ec31a53cd65788f105c5)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 4af4a3934f0277a3dabeca83e6cf17890a7a2c26)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 83a96cd06be51558c5dda0c15c3c71c8ed7e796f)
(cherry picked from commit 52ed3fed5e45ca41e6b936f14904beee41bf74cf)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 58054b2e4806277e01c08e66f765136f1374b980)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 8d8413698b6c81ebea6d6a90f3a82121117a5eba)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 3275b34932f2f2698447e7e0b44e8e4ab42f92db)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 81c96f9a3d3a7a9aba4ae867674dc5861ddb3167)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 287f9ff17de2cd552a25d8cb9ca11bb73a4c8183)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit b9f5f90092cedce7d5ffc9547baccae699633d92)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 681cf956e222061455b82b7b6bf7a5d9097a45f5)

Conflicts:
	res/values/cr_strings.xml
updated KitKat 4.4 Rev 1.1

(cherry picked from commit c9f60f68ff68814b78011b4467d85696d4bb3177)
(cherry picked from commit 360700d9e9a4c849a9be4c5540e9e0fd2844b6c9)
(cherry picked from commit f542c8c1ee99b8ac4647a43e9bbb62171f9e9e8f)
(cherry picked from commit ac4d1fede89758a5c1f2097bc5bdf4f391a524c6)
(cherry picked from commit c6a798d0c484a6f97495914517a2aba4f3f529bf)
(cherry picked from commit 6e352d7b07ff7b9a2dd926e931f53c4281b801ac)
(cherry picked from commit a63339108cba61eaa7e8606501c24099547823d0)
(cherry picked from commit 3d1ede002a245c767affc1ef5616fc8e1526b6a0)
(cherry picked from commit c8f98a60a20f00a3422b7a8e1b68149d986a3374)
(cherry picked from commit f7215bb46e1fdcfbf1d08b2bdcd7393fda35f73e)
upgrade AOSP to 4.4r1.2

(cherry picked from commit e716a2a31d96691033bad3de1c45845c0659e092)
(cherry picked from commit 0397f16656723e24e4b068418b3aabdaa727645e)
(cherry picked from commit a3a3553e1346752d9225ed9f3ed7779b4838f893)
(cherry picked from commit efd2558168122cc93975878bf92708048427e764)
(cherry picked from commit ed8f809c03bc9e3f43ed58d9a26b6be53f987ade)
(cherry picked from commit 76b593f908202e300edd68b43d3b6f769aaea223)
(cherry picked from commit 1504c41314afa0e085b1d0d4828971ba8d36b3a4)
(cherry picked from commit 5d28fe60ee73e70abbffa26b948c44a7dfaae5d5)
rename Global menu to Power menu

(cherry picked from commit 7a19be1fc09772305e9d6550f659114b323054e8)
(cherry picked from commit 8ad3f0605a9fc6b1cc75dc7b0420736616985d45)
(cherry picked from commit b675b747bf352844a41a5c67ec39ec51e2e976e8)
(cherry picked from commit f3bc25aa2807d7c960872c9c8871f86708058da0)
(cherry picked from commit 2772c8d28c989d3904db1b32ead6b0714451aa64)
(cherry picked from commit 9cb3f4a598f1af63b4e635b5c42656a87fce4ff7)
(cherry picked from commit 1d7438e90b61228d6aeca3567123b95d6cf0dc7d)
(cherry picked from commit 0c90a6bea06c30e33dd47aee347c990857b215c5)
rearrange menu

(cherry picked from commit 124273db834760981516adc6ff5b43dae37ecf74)

Conflicts:
	res/xml/settings_headers.xml

(cherry picked from commit 28547003126aeeafeca3d4edf9635c725f9a5270)

Conflicts:
	res/xml/settings_headers.xml

(cherry picked from commit 942c75b23c24d322c5fee33b330948d616834367)

Conflicts:
	res/xml/settings_headers.xml

(cherry picked from commit 3efc1cd8372b5ae1c0663b2c3f63c3d60824c845)
(cherry picked from commit 2783f2334a681e845122d5e23ce0dcb0e13507f6)

Conflicts:
	res/xml/settings_headers.xml
rename back to Lock screen

(cherry picked from commit 2f8b0eba756bc1a1324885a383fc77d3dc517588)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit e3d79bc76d3742ef60565144be9edf6a4b87075d)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 00573c84887ccd4b95b2e2f2547bbc4116403b36)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 99e75001286c1c01461450eb1509176b2de81004)
(cherry picked from commit 6c148afb3112fa9087d437065264397409352383)
remove slim strings

(cherry picked from commit 870b42503d705f1071a12a0c65ce554190023aa6)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 733e7d9c6fe8c4cc93be649980db1c1c65b5a8a0)
(cherry picked from commit 608e51748fdd69aaa1461543ec84778572e0e7a9)
(cherry picked from commit a4c15e266a05945ccf3304b5608fd2f8da49ff83)
(cherry picked from commit 162bbb08060c65c81af8e944cf2cecafc8a799dc)

Conflicts:
	res/values/cr_strings.xml
rename Home and TRDS

(cherry picked from commit 58153ebea60d70bdcf75317feedd1e7761df6bff)
(cherry picked from commit 0021f17a27fadd7bb26004dd9a6761e004e5d8de)
(cherry picked from commit 14d0f65aadce17a6346e6d380398d4da29174b64)
(cherry picked from commit 45d1b56966b862906a35aba5d1cff37814e43619)
(cherry picked from commit 16fce916142576428c8422f8f90af9bfa8f97a54)

Conflicts:
	res/values/cr_strings.xml
rename home 2

(cherry picked from commit dc9c0abb0de22f7714d15888832edcad48b0c074)
(cherry picked from commit ea5b7abe376496b55247eb82d004a9d2acae8c64)
(cherry picked from commit c2ce93a9d70d887d86f19b4704832a3e8fd0bf51)
(cherry picked from commit 1be5536863c8e8d0890652f283e2aadcc6929a78)
(cherry picked from commit d5afee029c45376f5b1055148cf2a921985a3ec0)
updated settings names

(cherry picked from commit 8ad665ad366a6b35962145fb984e64a897e291b6)
(cherry picked from commit 9614219a150dd3b56a3815b8ad1bc5d4148dc3ad)

Conflicts:
	res/values-en-rGB/strings.xml
	res/values/cm_strings.xml

(cherry picked from commit e2e8f47ba132f8a2ea5bb1cafe7232a9a1d4096a)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 2a2573fbe206e7041b5a68389127133b5ba3022a)
(cherry picked from commit 848c5689c2bd1e0d18cc1764ac2f6a2b0e7fef2c)
Derp

(cherry picked from commit 2e8fa1fcb09fdae8961af5a1dead6897b18d42d7)
(cherry picked from commit baf3284abb68cbfa71b92f127bf71cbbd91cc779)
(cherry picked from commit 871154e00645b7e24b48f34a4bec3b07d18e60dd)
(cherry picked from commit f3742d061274b8b020d1a558c6bad2db727ec4ef)
(cherry picked from commit 54d957d89f828a5d275c7b26ad76759ccedbb0c0)
updated settings names 2

(cherry picked from commit 96536734d40804fc415022c4b0ccc4e69032a8bf)
(cherry picked from commit 96166c3f4210f56ca547b24f96edd011465d3396)

Conflicts:
	res/values-en-rGB/strings.xml
	res/values/cm_strings.xml

(cherry picked from commit 03119c98e5906b09bdb398643e3eee7eca5926b1)
(cherry picked from commit d0f064f5d4a37b0a7f8d8b819319a534616c5e28)
(cherry picked from commit 8072712b564ce3de932d457aec560d1ea0d1a162)
move Active Display to Lock Screen

(cherry picked from commit ad79ae92cf0a495e9b16a8dbd577754ca5a3c722)
(cherry picked from commit f472b1ca4f68e7367ab2c082bd1b2b9ebd73878c)
(cherry picked from commit 316df5c4486680f64985d3a9b753e2bc98378492)
(cherry picked from commit 0f357b421705ed4975b6d988b72e036308ae8b5b)
(cherry picked from commit 45e29439e9ac185c5a5022d3632212286761f147)

Conflicts:
	res/xml/lockscreen_interface_settings.xml
	res/xml/screen_and_animations.xml
Updated AOSP to 4.4.1 Rev 1

(cherry picked from commit c173db2c106058b251d51212e7acd78f3754d539)
(cherry picked from commit bb6690fb3e62d4bd02dc19320a84ba6062e54b13)
(cherry picked from commit 94282031d8b641c4f1e349dea067ac240d48aaeb)
(cherry picked from commit adb820dc78b499d26715bca61942b9ef79cedc06)
remove systemui

(cherry picked from commit 50ca85c257bb2dac66daed66f39e5430e3b29b41)
(cherry picked from commit 3c614d5f657fb159450700eab0bac405bd8f2b58)
(cherry picked from commit 2251c0f8197c15a54de40ef7875eac84802a0f65)
(cherry picked from commit 818fb658b24f4faa3232500ff5419277281c7c13)
derp

(cherry picked from commit 13e3fb2e564c7c0babb0ac74a785f3bf028d53da)
(cherry picked from commit 9e01bea74a5480d074a012ac85897895d4e85d9e)
(cherry picked from commit 188c7c786b414ff89e00c9d5ffdfb27099e9eecb)
(cherry picked from commit 83a3ef84460c81d89f2adab573c68f6a6bc2a978)