[2/2] Settings: added config for menu unlock

Allow to define if menu unlock is enabled or not

Change-Id: I1037d2b797be671dec5cc48700e42a3109224c7b
Settings: add translatable option

Change-Id: Ie8673320d4a840972a105025e08b89715eb98e1d
Merge "[2/2] Settings: added config for menu unlock" into android-4.4
Settings: Toggle Stylus Pointer Icon

For devices with s-pen, this adds an option to disable
the mouse pointer when using s-pen

Change-Id: I8e752a8c8fd6a276eaf9b6bf20ad89d5ce3459ba
[2/2]Settings: Option to hide Adb notification icon

Base: https://gerrit.omnirom.org/#/c/2934/

Change-Id: I3ac5f08a077e04dade4bdeed58442043a8fb5d23

Conflicts:

	res/values/custom_strings.xml
Port "Option to control cursor in text fields using volume keys (2/2)"

Change-Id: I20109c880ed3ac27783f825557f6830d83e3dd5d
Add LockClock to Settings menu

Change-Id: Ie9d10e7c8186354f01e29e1aaeb23b580ebd04aa
Revert "[2/3] Settings: Add ActiveDisplay options via OmniGears"

This reverts commit b9a18a85996044bf27698e95fffd21dcf37a7316.

Conflicts:

	AndroidManifest.xml
	res/xml/settings_headers.xml

Change-Id: I18fdeb6cc8b457f5b65dd97cec51c2608e04b244
[2/2] Settings: Optional statusbar battery icons

    * Circle battery and circle battery percent (from CM <Sven Dawitz>)
    * Battery bar percent from Google
    * Quicksetting battery tile reflects status icon (from SlimROM <kufikugel>)

    - Option appears under Settings -> Battery -> Status Icon (ActionBar)

Part 1: frameworks_base

Patch set 1: clean white spaces
Patch set 2: fix conflicts
Patch set 3: rebase + why do some weird actionbar menu?

Signed-off-by: Anu6is <curtis.mayers@gmail.com>

Change-Id: Iae497e495045ca68522ab0b5bd342e044d4000f3

Conflicts:

	res/values/custom_strings.xml
Settings: Added cpu info and memory info to About Phone Settings

This is pulled from gingerbread. No code looked like it needed to
be re-done. This contains code from the following two commits.

shafty023<gameboy45@gmail.com>:
http://review.cyanogenmod.com/#change,1774

Keyan Mobli<persiansown@gmail.com>:
http://review.cyanogenmod.com/#change,1820

Patchset 2: Fix string constants
Patchset 3:
- Moved file paths to string constants
- Check for meminfo and cpuinfo files, if bad don't show preference
Patchset 4:
- Created variables for each operation.
- Wrote Long to print -1.
Patchset 5:
- Simplified and refactored
Patchset 6:
- Fix authorship herp derp
Patchset 7:
- Show only total memory, available memory would probably cause users to
  kill apps en masse.

Change-Id: Ib0550a5af515ae3a48481412c5c9c504cd80b743

Conflicts:

	res/values/custom_strings.xml