Revert "Revert "settings: Fix warnings""

This reverts commit 29f58c70388857cad9f928e13881de619c1c7898.

Fixed in 2b5ad1694e849353118386ae96a8b0e5e24ea0c1

Change-Id: I79c3addc7e5c1e83b8df2033f7ee497d9f5ac4eb
Settings: Added a missing FR translation

Google did a bad job.
One french translation about the battery saver is missing into the official Lollipop.

Here's the fix !

Change-Id: Ie26a1993166604414eb4dff55902a80759a3a333
Merge branch 'cm' into HEAD
Profiles: update text style to match Settings

-CategoryTitle for headers
-Material.Subhead for titles
-Material.Body1 for summaries
-fix some padding in abstract_trigger_row
-use ic_wifi_signal_4_teal for wifi icons

https://www.dropbox.com/s/mm8aiz44gvpsdlq/Screenshot_2014-12-15-21-54-45.png?dl=0
https://www.dropbox.com/s/z89en7orfup4b55/Screenshot_2014-12-15-21-54-55.png?dl=0

Change-Id: I5e9b77ba056220f0b82a92b2ff46c0f73d0b911b
Merge branch 'cm' into HEAD
Revert "Gesture panel [1/2]"

This breaks about a 1/2 dozen builds, until fixed it will be reverted

This reverts commit bab4730e165df215e4552277f0c438a5e06ee075.

Change-Id: Ied986119a06890334c2fe1a73467414ba958a672
Signed-off-by: DHOMD <DHO@dho.im>
Revert "Settings: Gesture Lockscreen (2/2)"

This reverts commit 3c65bd54bf53ca2ccaf3d1a0498076b570cf300d.

Change-Id: Ib5ddeb154468d3eed38d14478dddb91e4e32f0b4
Signed-off-by: DHOMD <DHO@dho.im>
Settings: disable report button for system apps

This opens CMBugReport, and we don't want these reports. Disable the
button for better UX than the button doing nothing when clicking it.

Change-Id: I2563379e7ce49a246761c040edcb797cf112efce
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: Add stats collection preference to privacy.

Change-Id: I5007d4db5074bf13fc3410eb2a3f4cd2772f9263
Merge branch 'cm' into HEAD
WE DO NOT SPY ON OUR USER, even with their permission

SRevert "Settings: Add stats collection preference to privacy."

This reverts commit d4c0b5c2494f893a5c46368551db686bcd8886ac.
Merge changes Ib5ddeb15,Ied986119 into L5

* changes:
  Revert "Settings: Gesture Lockscreen (2/2)"
  Revert "Gesture panel [1/2]"
Protected Apps: Show state by component instead of by app

Change-Id: Idbe1d69b376fc3f42980404d9448152f606e7f8e
(cherry picked from commit 56e11c8640cb9e34d07eb11fb1b67f3283b2f6f6)
Settings: add "Show weather" toggle for status bar

Change-Id: I316eee4fd21f587c033f6fa90558957c3bd58c1d
Signed-off-by: Roman Birg <roman@cyngn.com>
Reenable vanir updater

PS2:fixed whitespaces

Change-Id: Ie8ceacf11cf3c56cd7ae305f5b4f65d9cb9d8fad
Merge "Reenable vanir updater" into L5
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I6496990d26a7fef60d4a0208b8ab320845c4337a
Protected Apps: Increase hit target of the launch app button

Change-Id: I38355aca37079d43975d287ee9d81c3a500c3575
(cherry picked from commit 47e8e46f53cdf4f536845d57cc383d3c5f0ca893)
Buttons: Forward port Recents button configuration

Enables the ability to assign different actions to short and long
presses on the Recents (App Switch) button.

Change-Id: I5f8835841218932789431057e0531914a29980b9
Merge remote-tracking branch 'cm/cm-12.0' into HEAD