Merge branch 'kitkat' of github.com:AOSPA-legacy/android_frameworks_base into clean

Conflicts:
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Change-Id: Id406c7c53b36cf0005936cc8119fc4f82553939f
Make the default value of in-call noise suppression configurable.

PS2: Fix the value type of def_noise_suppression

Change-Id: I1dc0b6085807c49370a06243689b70ea4b91732b
Framework: Allow choice of screen-off animation (1/2)

Adds a choice of alternative screen-off animations:

- Fade out
- Electron beam (default)
- Scale down

Change-Id: I8ec9bfc6248a1223037fd252b0c853db7994afe6

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/DisplayPowerController.java
zh-rCN: add translation

Change-Id: I0f10fbfaa7773c2433880d21186b48a53d2272f0
QS: Fixes for pie

  * Fix possiblely wrong value of pie mode (not pie state).
  * collapse statusbar shutting down immersive mode to fix
pie shown even if it off.

Change-Id: If757910b61cce47d35f23177ed1e53a97fac0467
QS: Fix and improve

  fix immersive mode cannot on if pie disabled
  collapse panel when off

Change-Id: I842dde63cca89b5edf7f78d1142e2c89578f1efa
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_frameworks_base into clean

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

Change-Id: Ibc8a605c2f287891371fbf22ebc0f0a707e29e7d