PrivacyGuard: New icons close to AOSP style
Quick Settings Pulldown: Left or Right side option (1/2)

Patch set 2 : Fix defaults from upgrading
Patch set 3 : Change percentages

Change-Id: I1f74043865e2670430da7c90ddc8aacc8e5267be

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Fix Power Shutter

Change-Id: Ifa2bc6e38821b1fd14a6dba99797c469b4b8698a
    [Framework] QS: Add Mobile data tile + fixes (1/2)

    Add mobile data tile acting like the pw tile.
    Remove mobile data function from MobileNetworkTile

    MobileNetworkTile now is acting like AOSP

    renamed internal naming to be more logic

    Patchset2:
     add longpress action to MobileNetworkTile back I removed Patchset1

Change-Id: I09c5a9d0d9d1633d537e15b7c6463e7187f9249c
[Frameworks] Add reboot tile to QS

and license change for PW reboot button
Quick Settings: Add 'OFF' text to GPS tile when off

Change-Id: I8a81e3cf8419a6c2e4305c844b5f6162ed14055d
Framework: Add Quick Settings Sync tile (2 of 2)

- Adds the QS Sync tile (drawables thanks to Björn Lundén)
- Removes deprecated, pre ICS code in Power widget

Change-Id: I4e25348a8afddf4398a0814282033b285c995c3c
Quick Settings: Cleanup Torch tile (2 of 2)

Change-Id: Iacd9e58a4e45ed2526bde406c23647e6da9b76ec
Framework: Add NFC Tile to Quick Settings (2 of 2)

Need to figure out how to instantiate a new NFC adapter after the
Tile is created.

Change-Id: I6f54dff107182e832c6da1fcb2c4f5ee785a921a
Quick Settings:  Make Lock screen drawables consistent

Credit to Björn Lundén for drawables

Change-Id: I77d1b5072484eb1c0ea0c28a2eb88ef0f75e327d
Framework: Cleanup Quick Settings Sound tiles

ChangeId: e4e7d22a6692656f898da829be4720155527c647
Framework: Add Screen timeout Quick Settings Tile (2 of 2)

ChangeId: 38388a11af3a885751a2ea8a9c3da13833867dca
Change NFC default description
[Frameworks] QS cleanup observers and fixes

this commit

clean up last observers to internal qsc handling
fix Networkmode tile
Status bar brightness control from CM10 (1/2)

Change-Id: Ida526bf19e56d549f7cc75c47466e6953295d888
"Clear all" button on recent apps

    Ported from ParanoidAndroid by zigackly:
    https://github.com/ParanoidAndroid/android_frameworks_base/commit/f8c44e6ef667a3ebe9b658f148fa78a8d4f9a8dd

    Add button to tablet layout ported from Codename Android by zigackly:
    https://github.com/CNA/android_frameworks_base/commit/8d259fe3588c261baa5a17c361255cf28cc82bfe

    Patch set 2: Make the layout consistent, with the button at the top right.

    Patch set 3: Remove the redundant use of removeTask()

    Patch set 4: Top right layout does not work in tablet mode: make it top left for tablets only.

    Patch set 5: Different implementation (No need to keep track of views) - Danesh M

    Patch set 6: Top left layout no longer works for tablet mode with new implementation.
                 Make it bottom left for tablets only.

Change-Id: Iceb86eef41160f1c17e51463b37fd97e27acfb2e

Conflicts:
	packages/SystemUI/res/layout-port/status_bar_recent_panel.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

Change-Id: I5f3827299866a951e657ce64bea7c5f31c34ef9e

Conflicts:
	packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
Port wimax support changes from CM9.

- Register WiMax service in ContextImpl (fixes 4G toggle).
- Fix misdocumented EXTRA_4G_STATE in WimaxManagerConstants.
- Share wimaxClassLoader between WimaxHelper and ConnectivityService.
- Add ACCESS_4G_RADIO_DISABLE, ACCESS_4G_STATE, and CHANGE_4G_STATE
  permissions to SystemUI.

Note that WimaxManagerConstants was previously misdocumented, confabulating
the lookup key EXTRA_4G_STATE ("4g_state") with EXTRA_WIMAX_STATUS
("wimax_status"), which no longer exists.  This is also fixed.

Change-Id: I4f5973e7bd2ff4c860036df0f38589b34ad72b49
Squashed commit of audio changes from CodeAurora

MediaFile: Add DIVX and MPEG2TS file format

Change-Id: I9f8cfbe8138c6d3d0d824bff2542b91d72a06b82

audio: Define ANC headset and proxy device

Change-Id: I681d73433d874ec66ec0b1f1f39869008d7d7d0d
(cherry picked from commit 1e6c410eadfc510a9f116bb3da142214fe761225)

audio: add support for QCOM WiFi display

- Define QCOM WFD intents
- Register and handle WFD intends in AudioSystem

Change-Id: I1e5a73d4aa5595bed44d24652647c12b7ef4ae1f

audio: add support for QCOM audio formats

- Add support for EVRC, QCELP, and WMA formats

Change-Id: If3676b88fa287b484ef8616c0a6b67177b61a720

PhoneWindowManager: Changes for WFD.

- WFD now sends WIFI_DISPLAY_VIDEO intent to set UI orientation.
- PhoneWindowManager to listen for WFD intents.
- Display on WFD should be same as seen on the HDMI, so set the
  orientation to HDMI orientation

Change-Id: I638adaa906e2151b1c6ae496343714fe828f5dbd

audio: add support for QCOM vocoders

- Add support for EVRC,QCELP and other
  QCOM vocoders

Change-Id: I9b2a18fe7d01a9198eb470e94e7176b7a6da2c7c

Conflicts:
	core/jni/android_media_AudioTrack.cpp
	media/java/android/media/AudioRecord.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Port "Framework Track Control : Switch from broadcast to audio service"

Ordered broadcast is unreliable.
Switch to using the Audio Service's dispatchMediaKeyWithWakeLockToAudioService
as it sends the event to the correct receiver.

Patchset 2 - Switch power widgets over as well
Patchset 3 - Rename handler 'what' message to be more consistent
Patchset 4 - Fix renaming mishap

Change-Id: I022720a551b94637f7b16258dfb6a22234bcb736
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