settings: This is CyanogenMod!

Change-Id: If9f14d6579b18c4ae049d35e312dd2d98746aced

Conflicts:

	res/xml/device_info_settings.xml
Quick Settings: Option to use floating window (2/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: I00237f6b667d35f0e8d2cf8201f4efee6adf762c
settings: quicksettings: allow flip animation on clicking a tile (1/2)
fix building
more fixes, thanks to Dave Kessler
ported from https://github.com/BeerGang/android_packages_apps_Settings/commit/e0968963d1260d6b7497d301cc2caa2df540eb93

Change-Id: I754b6194312bc93b8c876db4edf94fd4310363a5
fix quicksettings flip preference not sticking

Change-Id: I91f78f0413ebb8a7c5a1e617113dec1e54b82e8e
rearrange quick settings

Change-Id: I6f000440bdfd055fce86057ab74d6d6c458d1a14
App sidebar (2/2)

Change-Id: Ie6ad9a80da257f7aada9c5c08d516e24168cbec6
[Settings] Disable LN by deafult

Also every other option enable by default

Change-Id: I41a12ac091396a10bd45236824f39f87c2e16009
Settings: Inaccurate proximity switch (1/2)

Change-Id: I755b94d2200fb42f2f19fad20b0c9fab29eb1e69
Settings: Second Clock (2/2)

https://github.com/Dokdo-Project/platform_packages_apps_Settings/commit/ae92418a3e50fdae6891053492d155fc7e010e5f#diff-ad1634d6f24fb13c45a1137e95c26371R287

PS2: Fu Whitespace

Change-Id: Ie5ad1c877d86a5048dda6f14cf9ccef2d2819acb
Use actual storage type of sdcard/usb (2/2).

Currently, storage volume description for mount/unmount/format determined at
build time using PRODUCT_CHARACTERISTICS. For device which has only a sdcard or
only support usb storage, displayed description is correct. For device which has
both storage, the displayed description is totally wrong.

Use of actual storage type at runtime can eliminate the needed to specify
product characteristics, either default or nosdcard.

Change-Id: I9f8d53a4648d960f1009b1fe94787eecd4343427

Patchset: 6
http://review.cyanogenmod.org/#/c/63736/
Build V85
Update cr_strings.xml
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into HEAD

Conflicts:
	res/values/cr_strings.xml
	res/xml/quick_settings_panel.xml
	res/xml/system_ui_settings.xml

Change-Id: I0ccf92a44a02792de734d1deab965c0d816047e9
hide notifcation reminder setting since it does not work...and I have no clue why

Change-Id: Iea8ba5a9325f7ba2083b97ee88c5c37a519fc03c
cleanup some strings

Change-Id: Ia22a5ce7384c4527812d2eddd8d6047a2030b373
Update cr_strings.xml

fixes and Updates UK translation for v84(v85) (Settings)
Update cr_strings.xml
Merge pull request #204 from Basti1337/patch-27

Update cr_strings.xml
Merge pull request #205 from prinsnmx/patch-6

Update cr_strings.xml
Revert "settings: This is CyanogenMod!"

This reverts commit 738f2b75dc109e166b7b68110f27868d9e6a16ce.