Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Merge remote-tracking branch 'm/L5' into HEAD
Settings: Gesture Lockscreen (2/2)

Changes needed for lollipop

Change-Id: Icf2f5a5cd3474ea325097437bc2956c10e2ae9d7
Gesture panel [1/2]

This includes shortcut picker addition from cm author: Danesh
https://github.com/VanirAOSP/packages_apps_Settings/commit/ed26d12ca6c8b025810b91e4a4fd6010df2d71e0

This adds a gesture panel to launch custom actions.  The panel can be
opened from the navbar or quicksettings panel.  Hardware key binding
support will be added next

Squashed commit of the following:

commit 5c3c770ce764c81d2e8b07c5c621d58d879c88ff
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Thu Aug 28 22:32:33 2014 -0400

    hide gesture menu.. it's accessible from the gesture panel now

    Change-Id: Id39b0f7bc67ebf46c6e1c7f83c746dec327afcb2

commit 7fd93ce683b136941c6a407180d905889792b4c1
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Tue Aug 26 18:29:49 2014 -0400

    QS: add Gesture panel tile

    Change-Id: I6ecb534815198204467f0bb8020640a5727b7ba5

commit b156a65dacb9579e4d588e2f870abfe3b111e9c7
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Mon Aug 25 22:26:14 2014 -0400

    Add gesture panel support

    currently only used for the navbar, will be moved to vanir actions and
    made into a QS tile and as a bindable action for hardware button devices.

    Thanks to chameleonOS for the gesture activity creater code this is based on

    Change-Id: Iacd509fa337d67b652b13ee6bc3b26ec1686c02a

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	res/values/colors.xml
	res/values/vanir_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
	src/com/android/settings/quicksettings/QuickSettingsUtil.java

Conflicts:
	AndroidManifest.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/androidx/HomeButtonSettings.java

Change-Id: Ia4bbe4128c51768e52d94d2fd9c5db6df9884f84

Conflicts:
	AndroidManifest.xml
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
Merge branch 'L5' of https://github.com/VanirAOSP/packages_apps_Settings into EXODUS

Conflicts:
	res/layout/gesture_create_gestures.xml
	res/values/vanir_dimens.xml
	res/values/vanir_strings.xml

Change-Id: Ibdc16832059942096a5ddb5c366cbdff417545a8