Frameworks : Incorporate AICP weather panel into AOKP weather panel (1/2)
- Seperate into 5 views
    1. AOKP info
    2. AOKP panel
    3. AICP simple info
    4. AICP Notification
    5. AICP both views
FWB: Option to hide weather icon in statusbar (1/2)

Change-Id: Id376f3a3d5aba06cd5ad8dcbefea9f612de14dd3

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Fix possible NPE in SyncHandler.onBootCompleted()

If onBootCompleted() was called a second time, it would have throw a
NullPointerException since the queue object would have already been
set to null by the previous call. This commit just makes such an
object behave as an empty queue instead of throwing the exception.

Change-Id: I7ef82ba1e2504ceb0a2c11694d32f0588db7d0af
quiethours: do not play screenshot sound

If we are in quiet hours do not play any sound when we take a screenshot.

Change-Id: Ideaa5c11611b7e3c9d6ca4d27e801cd2fb4eadac
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
improve a calculation method for LTE antenna reception level

This proposal will fix a problem that Android devices could
show different levels of antenna bars under the same radio
environment if each device uses different modem.
This behavior makes confusion toward users and others.

That behavior comes from using RSSNR as a metric for
determining antenna bars. Unfortunately, RSSNR does NOT define
performance requirements and error tolerance level in 3GPP.
Therefore, accuracy of RSSNR measurement could be inconsistent
among Android devices or modems.

The patch we would like to contribute here will be offering
Android device to use RSRQ for antenna bar metric instead of RSSNR.

1.)RSRQ, like RSSNR, takes interference into account
   when measuring the radio quality.
   Android already supports measurement of RSRQ.

2.)The performance requirement for RSRQ is already defined in 3GPP.

3.)DOCOMO and other many mobile operators use RSRP and RSRQ
   when designing LTE coverage areas, and alignment here will
   be very beneficial for both users and operators.

Hope this patch helps to improve Android antenna bar accuracy and consistency today.

Change-Id: Id1c3339764294ef51365ab133a1c7b42e14e1800
Signed-off-by: Kensuke Ueda <uedake@nttdocomo.co.jp>

Conflicts:
	core/res/res/values/config.xml

Conflicts:
	core/res/res/values/symbols.xml
Base: make touchslop configurable [2/2]

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

Conflicts:
	core/java/android/provider/Settings.java
Selected libs/androidfw/ResourceTypes reconciliationationation

Change-Id: Ie96e10182febe1d3ff4600e620c32b06a9e8c268
quiet hours: add back the option to disable system sounds (1/2)

Change-Id: Ie494c441c3e0e48a5394fce3f5e0ef671c3d085f
Signed-off-by: Dan Trifan <jimsth@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/view/VolumePanel.java
fb: translation - RU

If5fb11c354ea0144cdae1434de4c536302dda5b3

Change-Id: I1a69f0941f2435fb6b2dc2a8551a74b90f3a60bd
Framework: Quiet Hours Extra Daily Times (1/2)

Change-Id: I38301d53b57f6b0525edd2a7e13a2bd5022e7a65

Conflicts:
	core/java/android/provider/Settings.java
Telephony: Add support for NETWORK_TYPE_GSM

Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: I5e971c625532696776b9555ad8cfd85eba4fc423
CRs-Fixed: 526435
(cherry picked from commit 3e01fcec13725955f0ca3fb20730ff21f4edc128)
(cherry picked from commit c70f5687965908cd585e52901cf6cd88bd405140)
(cherry picked from commit 8e3c2300729ecb3cd3e6b640b0174f49e2189f0c)

Conflicts:
	telephony/java/android/telephony/TelephonyManager.java
Lockscreen Notification : Squash update
Active Notification : rework active interface (1/2)
- use ListPreference to switch between AD, LN & Peek
please don't die

Change-Id: Id5d1ec1c1646fd72655aa290823fac174a79c76c
disable some debugging

Change-Id: Ice23f47354cdb0e419ef8b4c056da6073c77fc5c
Disable Immersive Messages [2/2]

Based off Xposed module by GermainZ

https://github.com/GermainZ/ImmersiveModeDontPanic

Change-Id: I4835cac08a9e525ec15aa4d1ee84329970ec6a72

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

Conflicts:
	core/java/android/provider/Settings.java
ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java
NavBar IME Cursor: Option to use Home / End instead of Up / Down on longpress [1/2]

Change-Id: I775a1ae75823ba49f3bcb1c4ab9c3d958918ac08

Conflicts:
	core/java/com/android/internal/util/slim/ButtonsConstants.java
	core/java/com/android/internal/util/slim/SlimActions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
Revert "Fix crash when clicking a file from recents or downloads"

This reverts commit 61dfa05a7b7b8c44925d852cb2ab1de7d0ea34c2.
base: DocumentUI: fix a few issues handling remote content

http://jira.omnirom.org/browse/OMNI-956
http://jira.omnirom.org/browse/OMNI-950

Change-Id: I8d50d71a9c91486dfc9e5da01538c6b5a626f054