Merge pull request #198 from Basti1337/patch-25

Update cr_strings.xml
(cherry picked from commit e820499c7073d823c7d6516c83b6c931ce355c81)
Update RU translation for v84 (Settings)

(cherry picked from commit 059dd3832f8508e814c1e4b67e2eff307db18384)
Merge pull request #199 from Basti1337/patch-26

Update cm_strings.xml
(cherry picked from commit 5552d9e75cee50db9c7dd1cac1258fdacebde8c4)
Revert "Fix MSIM Network Settings (1/2)"

A public intent shouldn't need additional parameters to trigger.

This reverts commit 6cf32469f14a2c0efad9da34a5f12a9d341fc762.

Requires http://review.cyanogenmod.org/63912

Change-Id: I72ea28d8760caf1965c8df0835f438a22331450e
(cherry picked from commit d0719d1c2fc7d3f5ac21f435f2bab448470c1175)
Telephony(MSIM): Disable DDS Switch in Airplane Mode.

Do not allow user to change the DDS in Airplane Mode
as modem will be in LPM state.

Change-Id: I21ceaa53df6f0acd7be5fb8f23a120f92023a152
CRs-Fixed: 594616
(cherry picked from commit db405db1731edda8a5e49dbe51c683a7458735c2)
Settings: correct y-axis brightness in preview

To answer the comment in the code, no, the min brightness should not
correspond 0, but rather to the device min supported level. The values
on the preview graph should correspond exactly to the percent values
entered in the brightness configuration dialog.

Change-Id: I4a6d19b261f33f53d24437cde99e63e03ba3fc28
(cherry picked from commit 468d53ba36c3e0a5224eb2fa18517b8260a83589)
Merge pull request #197 from prinsnmx/patch-1

Create cr_strings.xml
(cherry picked from commit 61e4344d81e84ee6db5f0e688fe612629e8d8e21)
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
(cherry picked from commit 15bae9d116774bb6b79378b36400c4a8d923723a)
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
(cherry picked from commit baedb73f60e058103fa901fd09c48297f4cd6b53)
fix quicksettings flip preference not sticking

Change-Id: I91f78f0413ebb8a7c5a1e617113dec1e54b82e8e
(cherry picked from commit ce00bfd6b4a7de7fe3ad99e25cfc8ad68a8e2a0b)
rearrange quick settings

Change-Id: I6f000440bdfd055fce86057ab74d6d6c458d1a14
(cherry picked from commit f2da4c5b507447eccbd554bde021d136636433e8)
App sidebar (2/2)

Change-Id: Ie6ad9a80da257f7aada9c5c08d516e24168cbec6
(cherry picked from commit 257331521fcc4673e79df8ac3452e9747295ef30)

Conflicts:
	res/xml/system_ui_settings.xml
[Settings] Disable LN by deafult

Also every other option enable by default

Change-Id: I41a12ac091396a10bd45236824f39f87c2e16009
(cherry picked from commit a21ecab14585ea926279e9484664d9815120a62a)
Settings: Inaccurate proximity switch (1/2)

Change-Id: I755b94d2200fb42f2f19fad20b0c9fab29eb1e69
(cherry picked from commit b475a534d65ec78b6ba586cef91927cda6297283)
Settings: Second Clock (2/2)

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

PS2: Fu Whitespace

Change-Id: Ie5ad1c877d86a5048dda6f14cf9ccef2d2819acb
(cherry picked from commit bc60ae16c59f058e029150760cf1b3dbd3a17bda)