When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Hardcode double tap to sleep gesture.

I love it. :P
BluetoothManagerService: fix enabling/disabling BT from Quictsettings under second user,

Change-Id: I8173559b2c734968ef4a8d86fddaa3a73d5c2b1e
SystemUI: apply alpha value to all layouts.

Change-Id: I27d5a69eac50053ca34679bf7f6aed821245e132
WifiController: fix high perf lock sometimes not respected

When the device screen is turned off, the state is DeviceActive for
15 minutes. In this time, high perf lock is not respected and
Wi-Fi power-saving mode will be turned on because screen is off.

Fix by adding a new DeviceActiveHighPerfState.

Change-Id: I71074beec4d41286dea0861107d7931da205aca2
JIRA: CYAN-2860
SystemUI: fix SearchPanel gesture in landscape mode.

Change-Id: I8f98b30e9f66f1ae96c85363a8a4af679e1173d6
Make the lock screen camera widget configurable (1/2)

Change-Id: Ia349c39937a56ee53c2c8ec2441d71ad081572e3

Conflicts:

	core/java/com/android/internal/widget/LockPatternUtils.java
Add touch feedback to the clear all recents button

5 minutes of Photoshop™.

Change-Id: Idf8c97cf08a192605208cbee6f2ae41e0798e8d1
Fix derp
Prevent MediaScanner infinite loop with invalid path

including double slash  "/storage/sdcard0/xx//xxx/xxxx"

Change-Id: I112a70c88b5ec662482b79c3151310b9b9b52e40
Improve AOSP Download/Upload animation

This increases the number of png required for a full download/upload animation cycle.
These new png makes the animations much smoother.

Change-Id: I7120d757782e797809bc97747127c6a0cc36f2fe
Revert "Fix for Concurrency issue reported in  525529"

This reverts commit 7eb1fcb76989f11aaa9ca0a78e0361239ff5317d.

Change-Id: I37815b93bf2b25caff171888dc13788479a9c8c4
CRs-Fixed: 585504
Use highp precision for scaled coordination

If scaled coordination is closer to zero than what
the medium precision can store, distance becomes
zero and it causes divided by zero.

Change-Id: I8ee921dd1f57564a442e685266b12d95fc08e165
base: Check for homeAsUp status when collapse actionbar widget

mHomeLayout should be visible if one of DISPLAY_SHOW_HOME or DISPLAY_HOME_AS_UP are set.
collapseItemActionView only checks for DISPLAY_SHOW_HOME, so applications that only uses
DISPLAY_HOME_AS_UP and uses an expandable/collapsible widget (like SearchView) doesn't
properly restore the home layout.
One sample of this behaviour is the DeskClock app. The CitiesActivity doesn't show the homeasup
indicator after collapse the searchview.

aosp change-id: https://android-review.googlesource.com/#/c/71093/

Change-Id: I2f225138771da6bd6b2a468ad616b90c2c0a9d35
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "Added Expanded Desktop Tile and qs clean up"

This reverts commit fc1d25078bcc804266d6d781ab21f9091fc8ede6.
QS: Cleanup
QS: Expanded desktop tile
base: Add dock battery support

Dock battery patchset chain:
base: http://review.cyanogenmod.org/#/c/55349/
native: http://review.cyanogenmod.org/#/c/55028/
healthd: http://review.cyanogenmod.org/#/c/55029/
settings: http://review.cyanogenmod.org/#/c/55212/
tf700t: http://review.cyanogenmod.org/#/c/55030/

Video (battery styles): https://www.dropbox.com/s/a7dp3glb7lv1zcg/dock_sdcard01.mp4
Screenshots:
 * No dock: https://www.dropbox.com/s/2yvngdaqok32xiz/dock_sdcard01.png?m=
 * No charging: https://www.dropbox.com/s/ezghtgoedei17oj/dock_sdcard02.png?m=
 * Docked no charging: https://www.dropbox.com/s/7fasc05fw5ylfxi/dock_sdcard03.png?m=
 * Docked charging: https://www.dropbox.com/s/x37vrhxzd075f7p/dock_sdcard04.png?m=

Fix landscape battery:
https://www.dropbox.com/s/nlufek6gmwrjvyn/dock_fix1.png
https://www.dropbox.com/s/yo5y026o9piwil8/dock_fix2.png

Fix: battery history graph
https://www.dropbox.com/s/jkf7uioupyl05x7/Screenshot_2013-12-12-04-03-38.png

Change-Id: Ia36dbc5c76bf5e256d660e4594ca1169eeb3f00b
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/values/cm_arrays.xml
	packages/SystemUI/res/values/purity_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	services/java/com/android/server/BatteryService.java
Unbreak the public API again...

Change-Id: I899142cec4084cead1d730328132a49e1dafe6f9
systemui: Fix hidden battery icon style

Change-Id: I52a13f4945e2ea654221f73ca1357dc72b4f4cf9
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>