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
Merge "Wrong referring to the resource - id/android:id" into kitkat
[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
PS10: Remove unused resources

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
[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
[1/2] Setting: Lockscreen maximized widgets

      Enable lockscreen widgets to be expanded by default.

      PA modifications to commit:
          Allow for long press unlock.
          Enable checkbox only if "Enable Widgets" is selected
          Remove preference is device is a tablet (already expanded)

PS2: Actually remove preference from tablets

Change-Id: I3d52b752415f48e5468db0804be5c2ff93a71e31

Conflicts:
	res/values/pa_strings.xml
[2/2] Settings: NavigationBar Customization

Change-Id: I71cdfba8a7aac3aa8656d4e15515e57741b598be
Settings: Forward port Kill app longpress back

Based on http://review.cyanogenmod.org/#/c/27235
Original author: DaneshM

Change-Id: I6e8bfb4e7e4a35c321a01debf8fdb3a38120267b

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	res/values/cr_strings.xml
Settings: [2/2] Customizable lockscreen & navring targets

Change-Id: I2bc06a50f7c08081ff29a91bf37071028b4e0e01
Fixes in Utils.java

Change-Id: I55a0c462fa2b55616903ca36fce86e2eddac2884