Framework: Glowpad Torch (1/3)
(2/3 = packages/apps/Torch , 3/3 = packages/apps/Settings)

Conflicts:
	core/java/com/android/internal/util/slim/TorchConstants.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

AICP:
PS2: reuse AOKP's torch

Change-Id: I39c319b28e31470925f3b3764043c63ce9d3557b

Conflicts:

	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

Signed-off-by: aways <aways@c-rom.org>
Remove AOKP easter egg

Change-Id: Ic725e99ba616c18e8d175a14f4d3ab8d1cb58793

Conflicts:

	core/res/res/values/symbols_custom.xml

Signed-off-by: aways <aways@c-rom.org>
[3/4] core: Add Dialer suggestions and reverse lookup

Change-Id: I01b27afb075e36d8d807d2fdbf5032ddb6e10641
base: show notification count overlay only on notifications > 1

Change-Id: Ib52f7c365193f26f6ff983bd87fc7aaa9b63c46e
ExternalStorageProvider: use mount point in device list

For me its is extremely unlogical that only the volume label is used
in the device list. Even more because it can be an empty string
and for a normal android user this information is not visible
anywhere else.

Using the mount point and if available the device label
separated by "-" makes much more sense and shows the same
information as all other apps that access external storage

Change-Id: I3fc3675af6640e37aa999b03ae2de2858237c638
[1/2] base: allow disabling call end sound

Change-Id: I4e5942de5c61dab9ee59cbf3b6599af32edb1d47
Frameworks: notification drawer background (1/2)

so after keyguard is mostly done let us start notification drawer
and QS. First one custom background.....either color or picture
with custom alpha and ability to set a landscape picture seperatly
(landscape phone only)

Compared to the 4.3 included version completly recoded and better
integrated. No idea what I thought 1 year ago on the old implementation

cheeers

Change-Id: Ibde48ae432155f1a86b875a37f0132ede8f2bc40
fb: notification transparency (1/2)

this add back notification transparency...compared to 4.3
it controlls as well the notification icon backgound transparency
which felt in the past dissplaced. As well codecleanup of the old
implementation.

largeIcon support I did not add due that google does not support it
as well at current status...it is only a placeholder in
NotificationData

Change-Id: Ic5bb8998f64cac573d70005fad909104accc9e96

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
[2/2] Frameworks: HALO

Forward port from jb.
PS1:  Initial port
      Fix conficts with notification LED
      Fix derp
      Major derp
      HALO Mods
      Rebase
      Fix blackist, code clean and added some TODOs
PS2:  Fix build
PS3:  Fix bubble sometimes doesn't respond on new notification
PS4:  Align halo icon
PS5:  Keep floating app in recents and disable transparent layer temporarily
PS6:  Fix conflict after recent merges
PS7:  Cosmetic fixes:
      Fix buttons layout in status bar.
      Status bar button holders show halo + qs switch on notification and qs edit mode + notification switch on qs.
      Update new margins size.
PS8:  Rebase
      Clean white spaces
      Toggle on/off from notification shade icon (remove red X)
      Standardize behavior (remove option to reverse tap/double tap)
PS9:  Remove references to LayerActivity
PS14: Rebase
PS15: update halo strings to prevent conflict with latest changes
PS16: Wrap all things!
      Modify halo behavior
PS17: Get the correct activity stack: this makes all windows in the same stack to get the floating mode
PS18: Stop pop-out on rotation
      Catch "silent" notifications
PS19: Rebase
PS20: Rebase, fix conflicts with recent merges
PS21: Fix missing commit messages from previous undefined patchset (19) and other conflicts

AICP:
- Modified for AICP/AOKP source

Change-Id: I3e79945433d61da090ca263f4e2989be9987f11d

Conflicts:

	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java