Heads up: option to disable in lockscreen (2/2)

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/liquid/HeadsUp.java

Change-Id: If1311256b57d47fcdd627cadd6349627dc6507ad
Hover: exclude from lock screen (2/2)

Enable/disable hover notifications from lock screen

Change-Id: I011cfe31adae06e7ec43e08d9d8286cd9b554540
HOVER: touch to hide (2/2)

- Allow users to configure touching outside to instant hide HOVER notifications

Change-Id: I04cce2e5f2fe8b66e725471baf027f7ca9838468
Disable settings search on all subactivities.

This leaves the search in place in multi-pane configurations, and keeps
it only in the main settings screen for single-pane configurations.

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

Change-Id: I94d861453a1017731fbdc6d853e448e369358734
Settings: Don't show protected apps options in restricted profiles.

Change-Id: I38c2e8fd3508d360f0e23703ce6c939f02f3714e
JIRA: 4668
Issue: https://jira.cyanogenmod.org/browse/CYAN-4668
Settings: Only show clear button when search field has text.

Change-Id: I69bf6a31a933459be2c652434aec412105395dcc
Revert "Remove borked custom font size option"

This reverts commit cba0b549a588e3e89914fb4805cf9ab18d075aed.

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: Ia26f7c146c7a0feea5a7759913f4158a5474a85e
Revert "[2/2] settings: Change density on the fly"

This reverts commit b663c788e4b48dea4d742a03bd5bc6e872ccfd63.

Conflicts:
	AndroidManifest.xml
	res/values/config.xml
	res/values/liquid_strings.xml

[2/3] settings: Change density on the fly

Conflicts:
	AndroidManifest.xml
	res/values/slim_strings.xml
	res/xml/appgroup_list.xml
	src/com/android/settings/liquid/InterfaceSettings.java

Change-Id: Ia2b60b0e7738388dce4a809a25ecb482ea374cf6
Hover touch to hide: Add dependency

Change-Id: I765e08dc9a5cba43e496d878fbf67046c4e26177
MIUI Style carrier text in the statusbar [2/2]

Change-Id: Ic053615e86401972a15053142191d561fd82e89b
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.
Show a preview of the selected font size immediately

Ported from CM 10.2, squashed commits 46678 and 49167.
Credit to Veeti Paaananen for the latter commit.

CM change id: I754d7fdcaf27c23dfccf9d56291956e70b23f63e

=======================================================

My tester says for people with bad vision it is easier to set up more
comfortable font size with this scroller, than with usual AOSP selector,
that's why I've taken liberty to fetch this

Conflicts:
	res/values-ru/slim_strings.xml
	res/values/attrs.xml
	res/values/slim_strings.xml

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I9bca7bddb66c3d291c0725b9689be8578f77beb5