build cmRemiX v1.0
Settings: Show clock enabled/disabled status summary in status bar settings

Change-Id: Iee63538fe695ec1df50841b157f67f3efa0b22df
(cherry picked from commit 8ee022fbce26d3087d294b54840eb62e382c5b17)

Conflicts:
	res/values/cmr_strings.xml
Settings: Option to enable/disable HOME button wake

(cherry picked from commit 57ae77035326cb373e23325455211259f9bd55cc)

Conflicts:
	res/values/cmr_strings.xml
Add CPU & RAM info.

SlimLP Conflicts:
        res/xml/device_info_settings.xml
        src/com/android/settings/DeviceInfoSettings.java

Change-Id: I0cce559c86321827d6f920d61ad9dfcb34a63b3c
(cherry picked from commit 6fd50319a10919822edce60a7d10a7d3c520fec0)

Conflicts:
	res/values/slim_strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
Revert: Add cm-RemiX version and build date to device info
Add cmRemiX version to Device Info

@ZION959
cmRemix Add build date to device info
Settings: Developer Settings -CheckBoxPreference to SwitchPreference
Settings: Option to enable/disable HOME button wake

(cherry picked from commit 46b3f638df2dfbbf27e4c38902d9970923666640)
house keeping
Settings: Add proximity wake option

Ports and combines:

http://review.cyanogenmod.org/#/c/66658/
Settings : Add preference for proximity wake

http://review.cyanogenmod.org/#/c/69347/
Proximity Wake-Up : adjust strings

http://review.cyanogenmod.org/#/c/69803/
Settings : Make proximity opt-in

Change-Id: Iea0853eccf764438c7aaac76afd13c364fcea0ec
(cherry picked from commit 7241e89c8611bddf3de19b9f4c02eb969444e1e7)

Conflicts:
	src/com/android/settings/DisplaySettings.java
Settings: Port "Development shortcut" (1/2)

New setting under "Debug settings" that enables the development shortcut
Change-Id: I9a43e611911f2e278605715f714860ad11236fd9

Modify the Development shortcut help text
Change-Id: Iaa6d87f5044a46e8c0f8d88a4fc9bf9a494188b8

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
(cherry picked from commit 2b1a660a172b182d387c8d0b4e6ea3d7baf5b1d0)

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Settings: Fix no preferred APN

Add preferred APN if found no match.

CRs-Fixed: 748830

Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0

(cherry picked from commit 308c89f3b7048e0d13b472f4ef5b8ae7dcd464ad)
packages: settings: CryptKeeper: Disable FDE if PFE activated

Don't allow Full-Disk-Encryption (FDE) after Per-File-Encryption (PFE)

Change-Id: I5ed46d4362f6536a6cf526aa5bf4bac4610c47b6

(cherry picked from commit 1d523acd54679269bf50be19f5321aeea7a6e798)
Remove activity tags with fragments from Manifest

Change-Id: I95118ebe7b876cf29ee0bfdfe876ebd839619b89

(cherry picked from commit b59e4b300012341b8632ede12c5961b650714450)
Port: Wake on plug (2/2)

(cherry picked from commit 08b68bd8686bc0e667751d7043da0bd016ee9ff2)
Settings: add back button in actionbar on Status settings

for more consistence. We add it as drawable due that we still have 3 other
places in settings where it is missing.

We will change later....after that we should have worked every inconsistence out.

Change-Id: If21d03b04d2356fa78349baa8ff2fb3b008dacbf

Conflicts:
	src/com/android/settings/deviceinfo/Status.java

(cherry picked from commit 52545af357d1fcae7c2ee6446eaeeb0deb16de3e)

(cherry picked from commit ea1e4597e0f75e504f2ca0cd4b9e0dc5308109e2)
Settings: Update AppNotificationSettings if user resumes

Right now if a user resumes this activty (eg from recents) and did change in the
mean time settings which effects the visibility of preferences in AppNotificationSettings
(eg were removed) it does not get updated.

Fix it with simply reloading the content on onResume and decide to show the entries
on the current user settings situation.

Change-Id: I0b16ebf35604fdca1611f026c9b609427f3060c8

(cherry picked from commit f48f6c3d0358d481f9dbbdf3de8b28eb59194ce6)
Settings: add quick pulldown listpreference

as well respect rtl layout changes

Change-Id: I298794651302a34817d8212f7af9ad565d504c3c
(cherry picked from commit 0fd1ad4c0878faf0f5d2636820543527bd3dab0d)

Conflicts:
	res/values/cm_arrays.xml
	res/values/slim_strings.xml
Settings: Fix devloper options FC and remove all bug report options

This change: https://gerrit.slimroms.net/#/c/18820/

removed it just in the xml which is a pretty bad idea if java code
still assumes it is there.

Due that we will never need it we remove the code completely.

As well remove bug report in power menu option.

Change-Id: I234dee3a19639f89b5a7b5295ca408142e4223dc
(cherry picked from commit 0a27677f1654d22ffec836d4be157c8aa57c7282)

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