Add back a helper pref that holds a system setting.

Change-Id: I7d8978829bde1f1dd15bf59f464557f64aa07beb

(cherry picked from commit 5a51eab743fd3c675c20e6662aa1da7969f2964b)
Add Buttons settings drawable

Change-Id: I8a684dafc823e580d855ed608130fd14f8684cd9

(cherry picked from commit 24de8f52e438ffeb9eda071fe066d71c3d00d1cb)
Development Settings: Reenable Nuplayer

* Nuplayer is now the default in Lollipop, do not uncheck the setting when disabling developer options.

Change-Id: Ic47365192404a866434630a7a4f2f669b8f80233

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
bugfix: there are other options after in-app search

On "Settings -> Buttons -> Home Button -> Long press action" there's
a list of options. Any option after the "in-app search" one was being
ignored.

Change-Id: I136235a6798496a0a8786bad59b168845c677bdd
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.
Show a preview of the selected font size immediately

Ported from CM 10.2, squashed commits 46678 and 49167.
Credit to Veeti Paaananen for the latter commit.

Change-Id: I754d7fdcaf27c23dfccf9d56291956e70b23f63e

Conflicts:
	res/values/cm_strings.xml
Merge pull request #34 from AOSPA-legacy/lollipop

merge from AOSPA-legacy