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
Spanish translation for increasing ringtone

Also clean up a bit strings and organize structure

Change-Id: I8777a6a700c9ae2f0eb3ab2d9be2c20034c6d40c
Merge "Wrong referring to the resource - id/android:id" into kitkat
[3/3] Settings: Add AOSP Dialer check

Disable increasing ringtone option if Google dialer is used

Change-Id: I46a129e24bda51ffb9aa0d39d203523b9e00ef10
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
Initial Italian translation

This is the initial Italian translation for Paranoid Android 4+.

Change-Id: I1470c90bef61384a321564b0db7f535335d1ec8b
[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
PS3: Show option in all security categories
     (credit Cristiano Matos)
PS4: Rebase

Change-Id: I3d52b752415f48e5468db0804be5c2ff93a71e31
[2/2] Settings: Add an option to reset custom user preferences

Change-Id: I07223fe924860dee0ce22d0946d569eeef6b9d7e
Merge "Fix elapsed time formatting." into kitkat
Merge "[2/2] Settings: Add an option to reset custom user preferences" into kitkat
Merge "[3/3] Settings: Add AOSP Dialer check" into kitkat
Merge "[1/2] Setting: Lockscreen maximized widgets" into kitkat
Fix redundant string & add translation

Change-Id: I3b89c831635713506d1d15c41fd1dc3169b99099
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat-remix

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	src/com/android/settings/SecuritySettings.java
Revert "[2/2] Settings: Add an option to reset custom user preferences"

This reverts commit 5253c9af149a4ef214accb9e406d354d3836dd12.

Conflicts:
	res/values-es/pa_strings.xml