more
FastTorch [1/2]

Long-press power button w/ screen off to enable torch

Rejiggered for the Torch app (previously vanir versions, have used an internal torch class)

Signed-off-by: nuclearmistake <nuclearmistake@gmail.com>
Change-Id: Icd7ffd2cd5774d37e1392ee6c9d0bb7d1a11703c
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Port back Edge Gesture Navigation from aokpmr1.1

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Custom OverScroll Color (1/2)

OverScroll Edge Glow Effect color customize

Dokdo Project - Gwon Hyeok

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
Overscroll effects configuration (1/2)

Smooth~ scrolling effect
You can choose the scrolling effect!

Dokdo Project - neighbors28

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/widget/AbsListView.java
Hover: exclude from insecure lockscreen (1/2)

Enable/disable hover notifications from insecure lockscreen

Change-Id: I9235d8dac32359dff692f6f9c821c715fefe9cde

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/notification/Hover.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/Hover.java
Base: make touchslop configurable [2/2]

Change-Id: I6c6be8d9308d7046c21d03407d0efd3609f67560
Signed-off-by: bart452 <bart4524@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
PhoneWindowManager: add ability to use EdgeGestureService for system gestures.

Update: Default to enabled

Change-Id: Id4e2c0d82f771cd1c20e9196fb6db347494cca69

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/gesture/EdgeGestureTracker.java

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
fb: do not block home button if incoming call is a background call

The user want to navigate ahead if it is a call in background.
So we allow it.

Change-Id: If40b8abba05b600191bfc1403f197e624fd7a360

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java