Merge tag 'android-4.3_r2.2' into HEAD

Android 4.3 release 2.2
Settings: Add Blacklist storage
Separate Change Encryption Password Entry (2 of 2)

This permits the use of a different (hopefully longer and more complex!) encryption password,
while using a simpler (and easier to type) lockscreen password. Resolves Android bug 29468

Requires Settings change to give a UI for this

Change-Id: I7e96024476d8eb9ebbc043853c3ed962a15e5089
SettingsProvider: Add ADB_NOTIFY key
add "Turn Wi-Fi off" action to the "open networks available" notification

Signed-off-by: Roman Birg <romanbirg@gmail.com>

Conflicts:
	core/res/res/values/strings.xml
	services/java/com/android/server/WifiService.java

PS2: Adapt to 4.3 changes
PS3: Adapt more to 4.3

Change-Id: Idaed26320a2ff2e6ada448fa6deb95a76d2b86d2
SystemUI: Pull down QS if x > 70% width

From nebkat
Adapted to apply on top of 4.3 AOSP

Change-Id: Iefcd41ac382ec850a1839d3c8a5916f440874502
Framework: Forward port Power menu config
By DvTonder

Change-Id: I4836ddf43e82e254aefa3933a1e30fd652f08f90

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java

Change-Id: I6ee1b8786df1969dd8c1dc98ea3587872a01a369
Merge "SystemUI: Pull down QS if x > 70% width" into android-4.3
Merge "Framework: Forward port Power menu config By DvTonder" into android-4.3
Framework: Add Advanced reboot (2 of 2)
By DvTonder

This commit responds to a setting in Development settings for including
options in the power menu for rebooting into recovery or bootloader. It
is defauled to off.

When enabled, the Advanced reboot options will only be available once the
device is unlocked.

Change-Id: I675f31de1f82c344c7923e953fd4a6e26dd036da
Framework: Show the Advanced reboot menu only for the primary user

Change-Id: I73f82eade26f268e2b4608fa23cabcf0bb8fc862
Forward port CM Screen Security settings (Part 2 of 2)
by Robert Burns (burnsra)

Patch Set 1:	Quick Unlock
Patch Set 2:	Lockscreen Vibrate
Patch Set 3:	Slide Lock Delay
Patch Set 4:	Menu Unlock
Patch Set 5:    Rebase
Patch Set 6:    Home Unlock

Change-Id: Ibb325b092bebc0f27f187d55c0df30f4552c8dde
QuickSettings: Invert long click and click actions

Change-Id: I49acc7d3c473debd33b2491f4dde15d185f59c52
Settings: add HEADSET_CONNECT_PLAYER key

Change-Id: I1250d44fdde7f6d508ac6e49c4c6bb85c9f66233
QS: Add loading when toggling state, and longpress brightness

Change-Id: Ifa133e15259b45da4c625ce47b3f12209bcd1b94
QS: Add flippable tiles

This commit adds support for tiles that can be flipped to reveal
more information, as well as a two flippable tiles:
 - A Wi-Fi back tile displaying the current IP address in case
   you're connected to a Wi-Fi network. Tapping the back of the
   tile opens the tethering settings, if supported.
 - A Bluetooth back tile displaying the number of paired devices,
   and tapping it toggles discoverability.

This commit also moves the loading spinner to the BasicTile, as
it is only supported in basic_tile layout.

Change-Id: Ic08b08a97c3dd999b1915c7bb108c850a2cbcd9b
SystemUI: Translucent status bar on lockscreen

Change-Id: I27e6790a7b06e2a5c1f3f12b43dde824cb616af2
Forward port Status Bar interface

By burnsra

Original commit:
Patch Set 1: Signal / Clock / Battery / Notification Count
Patch Set 2: Updated commit message

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

Changes for Omni:
Set circle percentage style by default

Change-Id: Iecd4bb06b95b14888916331f5d36327f3206aeef
Squashed commits of lockscreen targets

Various authors - from CyanogenMod

Framework : Lockscreen - Customizable shortcuts

Patchset 1 : Initial port
Patchset 2 : Disable magneticTargets
Patchset 3 : Disable firstOffset
Patchset 4-5 : Cherry pick 10.0 commits

---------------- Squashed Commits ------------------

Allow users to choose lockscreen shortcuts / icons :
	Phone - 1-5 targets
	Tablets - 1-8 targets

CM10 port
---------
Patchset 1-8: Initial port
Patchset 9  : Revert to CM9 drawables
Patchset 10 : Rebase

Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb

Fix all upscaled lockscreen drawables and add a few

Several of the original CM9 drawables were upscaled
from a lower quality source. I rescaled some from the
originals and recreated the missing ones in vector
format plus added some new ones.

Change-Id: I112c35cf087daf0679a12bdad89258121dedeb0c

Lockscreen : Update camera availability check
Make the default availability of the target dependant on the
availability of a camera rather than the presense of a predefined resource.

Also update .Camera to .CameraLauncher since that is what we default too.

Change-Id: Ib3f06cc76fb7f7df20ec632051d5dbe754a9c69e

LockscreenShortcuts : Fix minor bugs

Fixes :

      - Inability to have contacts/direct dials..etc on lockscreen (http://goo.gl/BKEJs)
      - Multiple activities of same type on stack.

Change-Id: I6c2c3e1c87239267601d78eb38778d0388f4a41c

Lockscreen : Fix blank target highlight

Mismatched file/image.

Change-Id: I7cd898646124114a855d0fc1589251cbc6fc72fa

----------------------------------------------------

Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb

Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java

Re-implement magnetic targets

This reverts commit 8d037a2ded2edafc2ecafad2a8d799cb3f82f629.

Change-Id: I26da0ab2c9d65828bf9cd16a82dad7d1c50dc891

Lockscreen Targets : Make multi-user compatible

Use getStringForUser instead of getString since the framework always run as root user (0)

Change-Id: Ibe8b69cf4c4ad123ca8e68cd8fadcb7eb467b5be

Lockscreen Targets: Icon Revamp

Adjust the size of custom app icons and resize and round the corners
of gallery icons for a more uniform look.

Before http://imgur.com/cTOqdwX

After http://imgur.com/EKAeFiw

Change-Id: Ibcca275eb0ae946775773a8c8217b6508da10e5b

LockscreenTargets : Dismiss on target select

Only dismiss prior to activity launch for lockscreen shortcuts,
camera and appwidget picker remain untouched.

Change-Id: I2770c628ce0708570aa6ea0eac9e3cd1d82287fb

keyguard: enable magnetic target if no custom targets defined

When no custom target is defined (the "reset" button is pressed
in settings), the unlock target will always be at the right
regardless of the direction the user dragged to.

Change-Id: I0a2b1cd5dc7a2840c23d83a26593513cbc880c08

Clean up lockscreen target configuration code (1/2)

Get rid of a lot of duplicated code.

Fix fetching icons from packages.

Change-Id: I857d35bb601425be56b5eb730d63344e1173e4a2

Lockscreen targets: more unification

Don't hardcode pixel sizes, and use a shared method to derive drawable
inset.

Change-Id: I2adf9230c5aa8efadddd713c435b37af24e23115

Change-Id: I80fb0b0cd9b5f7d79a5760f8fa6ae338d9ca7205
Navigation Bar: Toggle last app on recents button long press

Change-Id: I1e6d6255494991b440f3cf5854a7edad7fee2c1b