Lockscreen Notifications: revert all navbar changes
Revert "Swap volume buttons when the screen is rotated by 90 or 180 degrees"

This reverts commit 024871911e4851bf977751f418ea5e666337b475.
Network stats custom colors (1/2)

Change-Id: I3c95a70273b111c7776f395f7baa60a77cea95dd

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

Conflicts:
	core/java/android/provider/Settings.java
Network stats: Hide if there's no traffic (1/2)

Change-Id: I8b770c7ad803c063cf995e5f88c8f44e0eeae86a

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkStatsView.java
Lockscreen Notifications: revert back to old code.
Revert all recent app opps changes

Revert "[2/2] Framework AppOps: Forward port ops from cm-10.2"
Revert "[2/2] Framework AppOps: Add per Op allowed and ignored counters"
Revert "[2/2] Framework AppOps: Add BOOT_COMPLETED operation."
Revert "Hide additional AppOps function"
Revert "Frameworks AppOps: Enable MODE_IGNORED for OP_WAKE_LOCK"
SystemUI: ES translations thanks to @SensesXda
GlobalActions: Set the initial status of airplane mode toggle

Actually, the initial status of airplane mode toggle is set to false
when the power menu dialog is initialized.
This causes an issue if you set airplane mode and then reboot.
After the reboot, the dialog displays the wrong airplane mode status,
eg. "Airplane mode is not active", and if you toggle that option, a wrong
intent is sent again to put ON the airplane mode, instead of OFF, the
toggle (that is in transition state) will be set disabled.

This commit fixes this issue.

Change-Id: Id30355c1e090355645c437086c79ab59093c27a8
fix search textfield

Change-Id: I1255434e1e42973afd8d9907459dcd8795e96c4b
fix number picker blue line and highlight

Change-Id: I473c855a0e2cd068e62cd2ec4b807c04215b1c81

Conflicts:
	core/res/res/values/colors.xml
Vpn: Setup routes.

Change-Id: Ia00467fbc4324ca5f6dab6e0ff2609cd5de9a423
Restore ProfileGroup notification override functionality

Also clean up a little.

JIRA: CYAN-3164
Change-Id: I9b71a225996315f517b59d2d6f4074175bbf2d64

Conflicts:
	services/java/com/android/server/NotificationManagerService.java
Revert "Fix error checking in MemoryFile."

This reverts commit b199768357dbe6b6633d29a8c9230a57fa19f7ff.
ActivityManager: Fix monkey tests

Change I30e38c6c27d339d55a8f9a0f4106185356a9b9a0 (adding ordered
broadcast prioritization) adds the assumption that every broadcast
generator has a full-fledged caller app, which isn't true for
monkey-created tests. Make sure the caller is a full app before
checking if it is AID_SYSTEM to avoid an NPE

Fixes com.android.cts.monkey.*

Change-Id: Ide0dd046c6c5eb10ab4acb504237b58cbbbd8cfa
storage: Don't list removed volumes in storage list

 * Don't tell apps that USB storage or empty SD slots are available for
   use. This fixes errors about trying to create dirs in vold as well
   as the relevant CTS cases.

Change-Id: Ic763d40c19b0bb9f7497cc1515baf1661d76e9ee
Lockscreen Notifications: make dynamic width a device overlay setting

dynamic width is disabled by default, to enable it for a specific device, add
<bool name="config_lnDynamicWidth">true</bool>
to yourdevicetree/overlay/frameworks/base/packages/Keyguard/res/values/config.xml

Change-Id: I210b747838b70fb64e6f0835b1cb42b31c9a199d

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java
Lockscreen Notifications: rewrite add notification logic

There were some problems with notifications getting replaced while the user was currently dragging them.
This commit should fix that by always waiting until animations and user input are finished before replacing a notification view.

Change-Id: I6821a253e8620d1579e6e1dfa0e0d4571ae1af3d
Revert "Revert all recent app opps changes"

This reverts commit 7d20fa25936231c345650935491a8b7a6a73d3b5.
Frameworks AppOps: fix allow/reject counting

Was missing from the original counters commit:
http://review.cyanogenmod.org/#/c/57352/

Change-Id: I9c180ff132077f21426a36f2ceb7d23a054d7ae4
keyguard: fix delay lock screen sound

Change-Id: Ia4cd2c856df1573856386e1597dcc0a9600d25a5
JIRA: CYAN-3362
Issue: https://jira.cyanogenmod.org/browse/CYAN-3362
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>