start devicehandler port to cm
Clean up/fix Notification Counter...its now in Candy interface
Settings: add "Show weather" toggle for status bar...And rearrange StatusBar files within Candy

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

Conflicts:
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
Merge branch 'c5' of https://github.com/CandyRoms/packages_apps_Settings into c5
Settings: : Slim heads up customizations for LP (2/2)

Basically it follows the same idea like we had on SlimKat....see here
https://github.com/SlimRoms/frameworks_base/commit/323ed77c5e5bd6d421beae1f8118eb580be5ecf1

That said there are some differences in this more or less completely recoded feature.

- Moved it into the app policy files
- Enable/Disable on every app (no system apps)  either longpress a notification and an button appears / or in notification app settings
- For now only snooze and heads up timeout configurable....other stuff will follow later.
- fix up some AOSP code for it as well fix some UX inconsitence.
- left swipe dismiss, right swipe put into background, swipe down opens notification drawer and moves the notification into it
  (aosp default behaviour is a big UX disaster....swipe up dismisses it completely and swipe down open notification drawer but heads up stays....first
   happened to me 10000 times accidentally which is really bad and second does not make sense. Hence this change of the default behaviour)

Well and a lot smaller things as usual.

Change-Id: I96c3259ad705b1776c58d2119410cd97d5f6d928

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	src/com/android/settings/notification/AppNotificationSettings.java
	src/com/android/settings/notification/NotificationSettings.java
Settings: add headsup manifest permission

Change-Id: I26f1a086c73030183488b563a31b60f43e028f69
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
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 'c5' of https://github.com/matthew0776/packages_apps_Settings into c5

Conflicts:
	res/values/candy_arrays.xml
	res/values/candy_strings.xml
Merge branch 'c5' of https://github.com/matthew0776/packages_apps_Settings into c5
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 'c5' of https://github.com/CandyRoms/packages_apps_Settings into c5
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
Clean up Dont need 2
Add: Headsup 2sec Timeout
Revert "LCD Density Changer"

This reverts commit 58c4ce818a0e4b79b1ba768a91fbbc7274daee5c.

Conflicts:
	res/values/candy_arrays.xml
	res/values/candy_strings.xml
	res/xml/candy_main_settings.xml
Finish removing DPI ... cause I PPP
Settings: Gesture Lockscreen (2/2)

Changes needed for lollipop

Change-Id: Icf2f5a5cd3474ea325097437bc2956c10e2ae9d7

@alviteri: crDroid'fy

Conflicts:
	res/values/candy_integers.xml
	res/values/candy_strings.xml