Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Change-Id: I3ebfa88f34b0864519c41b2f3afec3282f3891aa
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0-halo

Conflicts:
	src/com/android/settings/LockscreenSecuritySettings.java

Change-Id: I3de94e138d2baf5e006a8c97e450e5c6b895eb33
Settings: remove auto_brightness_adjustment_title string

The controls which used this string were removed.

Change-Id: Ia1b2aa93f2beea27c17546e293b9aa7c2aa62931
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: Do not disable "Brightness control" setting

It's really annoying to have to back out of this screen when disabling
auto brightness and go back in just to enable this setting.

Change-Id: Iafc217bbad52ac9e3899fb73082e1cf8d825579a
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: Add HeadsUp setting.

Change-Id: Ib7a59145843bedb16aacc87bf6d3c6da143e8d3e
Merge "Settings: remove auto_brightness_adjustment_title string" into cm-11.0
Merge "Settings: Do not disable "Brightness control" setting" into cm-11.0
Automatic translation import

Change-Id: I84df149c5fc731a578b1585b3642b3233cce2b80
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

@cristianomatos: Moved some crDroid custom features to new places matching CyanogenMod Settings re-work inroduced with this commit: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/a2b5ff1542e802f4257e7a7746ceb9e1c9cf333e

Conflicts:
	res/xml/notification_drawer.xml
	res/xml/security_settings_pin.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/LockscreenSecuritySettings.java
	src/com/android/settings/cyanogenmod/ButtonSettings.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0-halo
HOVER [2/2]
Check framework commit for description. Needs our blacklist interface,
a similar implement or a removal of blacklist interface.

Change-Id: Ie02a765e696322137d8487236d415f90f7f950c8
Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java
PT-BR translations

Change-Id: If5b6f40aece904d35cfe7aec6153973834bd49d1
Blacklist: Avoid crash when dialog dismissed via back button.
A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ia4a65e93487fedb51d284e6d08b4364e570f4887
Hover settings (2/2)

- Require full screen
- Exclude non-clearable
- Exclude low priority

Thanks @Der-Schubi for this.
Adapted to crDroid sources

Change-Id: I05584f5d090f7aa044f8b67ba09192984ce83822
Settings: Update RU translations(13.06.2014)
Hover notification timeout (2/2)

Allow user to set how much time the hover notification will stay visisible without touch the screen

Change-Id: I6a6fb5609a8dd4f97bfefdbbab38b87de8d2a11a
HOVER: Option to exclude topmost app [1/2]

Thanks to @Der-Schubi
The hole idea is from him and i just adapt to crDroid sources
Hover: exclude from insecure lockscreen (2/2)

Enable/disable hover notifications from insecure lockscreen

Change-Id: I011cfe31adae06e7ec43e08d9d8286cd9b554540
Hover master switch (2/2)

This commit remove hover button from status bar expanded and add a new option into hover settings allowing the user to enable or disable it using a checkbox
Halo master switch (2/2)

This commit remove halo button from status bar expanded and add a new option into halo settings allowing the user to enable or disable it using a checkbox