Wrong referring to the resource - id/android:id

We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
Use java.util.Objects instead of internal API

Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
Settings: Added choice of 45 seconds for screen timeout, lock screen and dream.

Change-Id: I58cb14776fe9d447b79faf810d7f6142bc058341
Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
Fix elapsed time formatting.

We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Bluetooth: Set alias name only through Rename option

Set the alias name only when user is trying to change the
name using the Rename option of paired device.

CRs-Fixed: 539420
Change-Id: I415b6a962d8e7884b67d37b94c04df19e2c23012
Fix null pointer exceptions in NetworkPolicyEditor

This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
[2/2] LED: Battery Light

PS2: Fix variable and fw/base overlays logic
PS3: works
PS4: change title to: Battery LED

Signed-off-by: Andre Saddler <dresadd09691@gmail.com>
Change-Id: I9c737d0cf49a1f84688b4295975e13dd8e91f874

Conflicts:
	src/com/android/settings/DisplaySettings.java
[1/2] Settings: HALO

Forward port from jb43.

PS1: Initial port
PS2: Fix conflicts with notification LED
PS3: FIx derp in strings
PS4: Fix derp in pa_arrays (tag not closed)
PS5: HALO Mods
PS6: Update pa_arrays & pa_strings
PS7: derp: rmv pesky file backups
PS8: rebased
     Clean some white spaces
     removed some settings
PS9: Rebase

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d
Conflicts:
	AndroidManifest.xml
	res/values/pa_strings.xml
Halo: rm ninja mode