Update cr_strings.xml
Settings: Move home answer & power end call options

Move 'Home answers call' & 'Power ends call' options to button settings

Change-Id: I2f365a3d278b0845b7c5ffcfe70c54160a00c24e

Conflicts:
	res/xml/button_settings.xml
	src/com/android/settings/cyanogenmod/ButtonSettings.java
Merge pull request #224 from Basti1337/patch-38

Update cr_strings.xml
Merge pull request #225 from ValeraSh/cm-11.0

Update RU translation for v95 (Settings)
settings: FC on quick settings editor on tablets without a vibrator

Change-Id: Ie824c3c958120d896690f369cf77eacf1e74c735
JIRA: CYAN-4296
Issue: https://jira.cyanogenmod.org/browse/CYAN-4296
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Settings: modify AOSP RU translation

PS1: Updated a string to say "Cast screen" instead of older "Wireless display"
PS2: Brought back couple of strings that were reverted in 4.4.3 merge.

Change-Id: I7179ecde5f3d0ce829fd36115b2893913ad801ea
Settings: Fix lockscreen notification NPE
Build V96
[2/2] Prepare NotificationManagerService for new format

* Needed for blacklisting

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Apps: Add blacklist interface [2/2]

Now with 100% more hidden checkboxes

Signed-off-by: Evan Anderson <evan@thelinuxman.us>
Change-Id: Ied375cfe2ff6494c25acb9d80b19e824daed755d
Settings : Dismiss glowpad view on trigger

Change-Id: If24e67549d4286f34bff8bd7f06cc32d4c56b292
Hide "Volume adjustment sound" option on non-voice capable devices

On non-voice capable devices, there's no sound when adjusting the
notification volume. Remove the obsolete option from Settings.

Change-Id: I3fc9ef737eb55d591a4ecc7d79ee60b9151395b5
Settings: Fix isPackageInstalled logic.

    - If package is null, isPackageInstalled returned true.
    - Return false if null, always.
    - PS2: Fix codestyle
Change-Id: If2bf41e4c9520195d56e327a447d7085daab3154
Settings: Remove lockscreen options from security.

  - Create a separate fragment for Lockscreen settings
  - Move App Security up in Security Settings
  - General clean up

Change-Id: I4dc20942b87c2446c7e798e28f7e475efebaddb8

Conflicts:
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java
Settings: Fix missing preference when lockscreen disabled.

    - Introduced in security settings reshuffle.

Change-Id: I1b6b608682208396d5efc54fd985652f65e86ffc
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Build V97
Protected App [2/3]
 Protected Apps Settings -> Apps:
 - Added Receiver which can send in a call to PackageManager to toggle a components protected status.
 - Add Protected Apps activity (available from Apps fragment)
 - Reads from ApplicationInfo state
 - Requires Pattern Lock to view/modify protected apps
 - Updates Settings Secure DB with protected components
 - Support resetting protected apps pattern lock

Change-Id: If07a7b69ac963ffae855621881e1944fc8754782

Conflicts:
	src/com/android/settings/applications/ManageApplications.java
Settings: Modify AOSP JA translation

usage_type_on_time is supposed to the cell standby use time(使用時間),
but it says screen use time(点灯時間) in Japanese. It should be corrected.

Change-Id: Ic9b7f61a054d09cf7944d6d37f70c8dbb294c095
Automatic translation import

Change-Id: I2db8cb59213162e87273d86fdc5189982578a776