Lockscreen Blur (2/2)
Custom Navring Targets (2/2)

All credits to CyanogenMod
This allows up to 3 custom navbar targets
[2/2] settings: expandable volume panel and tweaks

Setting to disable volume adjust sounds (VOLUME_ADJUST_SOUNDS_ENABLED)
This is so annoying :)

Enhanced dialog to add checkbox for unlinking ringer and
notification volume (VOLUME_LINK_NOTIFICATION)

EDIT:
No idea why google changed the order
Media is now above ringer but in volume panel
its different. So which one to change? :)

Change-Id: Ia30bbb1c2f44d0c21cd08748bd552685810f960f

Conflicts:
	res/values/pa_strings.xml
Volume rocker: Option to control cursor in text fields (2/2)

* Added also custom pa_arrays xml.

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

PS2:

* Make it indipendent from disable full screen option, now hardcoded.

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

PS3:

* Better strings and category title, just additional settings.

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

Change-Id: I53f5f21f9d8e23a7cf256085515cf22e34d64c50

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
Custom CRT Animations (2/2)

All credits to SlimRoms for their awesome work!

Features:
- You can select different crt off animation modes if device overlay does not disable it at all
- disabled
- always horizontal (stock behaviour)
- always vertical (screen collapse from left and right to the middle)
- orientation dependent (means portrait = horizontal animation, landscape = vertical animation)
- some minor fixes/code style improvements to 4.3 implementation

Change-Id: I35fb277b8da823d50cc4db1eec32ea597fe973f2

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

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

settings: add scale down crt animation - thanks a ton to xploidwild

really nice idea...fits perfectly into our animation options
for CRT

reword the different modes

Change-Id: I07a32b4cbfe956010507f5c8eddc92c2df395815

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_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/strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/DeviceInfoSettings.java
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b

Conflicts:
	res/values/pa_strings.xml
0.75 & 0.25 animation scale

Change-Id: I1ce01ce098721ebd359bdf95111ba8bc1e6e1d48
Fix animation scale not showing

Conflicts:
	res/values-ar/arrays.xml
	res/values-fa/arrays.xml
	res/values-iw/arrays.xml
[2/3] settings: add support for adb over network

PS6:
rebased to solve merge conflict

PS7:
now its correct

Change-Id: Ibc577c36e4f3dec348da11ae5603e6406db6571c
Settings: Wi-Fi country code

Change-Id: I8a078bde0ab40818784635477eb466510a1c230e

Conflicts:
	res/values/pa_strings.xml
Settings: safe headset volume option (2 of 2)

Implemented for PA

Original commit: https://github.com/SlimRoms/packages_apps_Settings/commit/d4d016010e1ff66bbbd96d30b09ed38599b2ebcc

Thanks to kufikugel
Some minor fixes

-Remove duplicated string
-Fix a conflict due to a cherry-pick
-fix a derp
appLists: set height and width for app icon

due that the app icons on a lot apps are a mess now and not consistent
due of changes in kitkat let us set them for dialogs to our fixed
36dp value which was a good value in the past for all app icons
in settings

Change-Id: I00cab4aa4ded517ef63a193b58a03138abd355d8
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
Settings: Wi-Fi country code

Change-Id: I8a078bde0ab40818784635477eb466510a1c230e

Conflicts:
	res/values/pa_strings.xml
Display options: allow configuration of wake on plug behavior (1/2)

Adds a global setting to the Display section to enable or disable wake-on-plug.
Default is disabled.  When enabled, the device will wake when the charger
is connected or disconnected.  When disabled, the device's wake state
will be left alone.

PS 2: Change wording of setting per DvT's recommendation

PS 3: Pull default value of setting from config.xml

PS 4: Reduce scope of variable

PS 5,6: Rebase

Cherry-picked from: I779a4aa4feeca87879c932be6e1fa032e4b4afc8

Change-Id: I106b7d901a788c19e08454d6231daebf3ff4872c

	modified:   res/values/pa_strings.xml
	modified:   res/xml/tool_bar_settings.xml
	modified:   src/com/android/settings/paranoid/Toolbar.java

https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/7b5585fb371419a33d7ea52d3e39faf4ff79a9f3#L2R122

Conflicts:
	res/xml/tool_bar_settings.xml
	src/com/android/settings/paranoid/Toolbar.java

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
[2/2] Settings: Add lockscreen ring battery setting

Credits to Omnirom

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml

Conflicts:
	src/com/android/settings/SecuritySettings.java
Lockscreen: Add timeout and instant lock option to slide lock (1/2)

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d
Add back increasing ring settings.

Change-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml