AudioPackage5 contains duplicated bad-case filenames

Conflicts:

	data/sounds/AllAudio.mk

Change-Id: Ie046a9faff5b1b71b6a09ec06aee679be909112a
Sounds: remove misplaced/duplicate file

Change-Id: I4b6cc606735b1bd56dcccc11472f42aa0e5ef76b
bootanim: Don't cache textures if they're expected to use a lot of VRAM

bootanimation cached all the textures generated until the animation
was completed.
For Hi-res animations with lots of frames (like the new CM9 anim on
xhdpi devices), this implied using large amounts of video RAM, more
than most devices actually have available, causing the animation to
stall (and in some cases, gralloc to lock up); so if an animation is
expected to use a lot of RAM (rough estimation based on frame size
and number of frames), disable cache entirely and generate the textures
on demand

Change-Id: I157e5cdde2aab1d82d980d77cbedd9f127c83a1d

Conflicts:

	cmds/bootanimation/BootAnimation.cpp
bootanimation: performance enhancements

This patch implements two simple performance enhancements, which
might benefit devices. They are completely opt-in by setting
the following variables.

  * TARGET_BOOTANIMATION_PRELOAD: will preload the bootanimation
    zip to memory; this is handy on devices where the storage
    might be slow. By preloading it, we get quick access to the
    zip file, and the animation doesn't stutter.

  * TARGET_BOOTANIMATION_TEXTURE_CACHE: allows maintainers to
    force texture cache on/off.

Also fixes the sign warnings related to int / size_t comparison

Change-Id: Ie92d1b0aa90b43ba39c368a2a33657a60c3a64b5

Conflicts:

	cmds/bootanimation/BootAnimation.cpp
bootanimation: fix usage of LOGW

Change-Id: I1d59df9f44f414d80058a532644cbbb40e22c701
add prebuilts for extra camera effects

Signed-off-by: Roman Birg <romanbirg@gmail.com>
add Settings.System boolean helper methods

Change-Id: I749d15a7c6956d938698f16ebde185b114f7f15a
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Port forward: Alternate Default App Picker / Reboot Dialog

Alternate Default App Picker
--Zaphod <mwilson@acesappraisal.com>

Reboot Dialog and subsequent fixes
--Roman <romanbirg@gmail.com>

Port to work on 4.2, apparently Google thinks it's funny to
move the ShutdownThread every rev...

Change-Id: I4ab31e6767079c3bb6a9cba0a15b36e3627e9aef
Port forward: Clock styles, carrier text, notif count

SystemUI: Clock mode. Center, Right, Hidden. AM/PM and Weekday
options.
-- syaoran12 (aka adamthecashew)

SystemUI: Notification counter
-- Stevespear426

SystemUI: Clock fix for 24 hour format
-- KhasMek

Custom Carrier Label
-- netboy3

Change-Id: Ie24eeb33b4b546586019c5f468e1a489c15bba5f
Quick Settings Mod By Kevdliu

Change-Id: Ia5989080f97c2c07d8c24e6caeec8a599bf83f48
Add README
Fix README file name
Update README content
QSM Patch #1

Date: 11/21/2012

Change Log:
- Add GPS Tile
- Add Ringer Mode Tile
- Mobile Data Tile Long Press Launches Roaming Settings Menu
- Automatically Copy Quick Settings Control Panel APK to /system/app/ During SystemUI Compile

Change-Id: I8be6691703b2541fd71ac807722764c17e21888c
Merge branch 'qsm' of https://github.com/kevdliu/JB-MR1-QuickSettings into qsm

+ fixed compile + fixed typo

Conflicts:
	packages/SystemUI/AndroidManifest.xml

Change-Id: I2d5d862458e8ea6a420fb6826fec89de9b20ceff
Merge branch 'jb-mr1' of https://github.com/roberj13/frameworks_base into aokp

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/drawable-hdpi/ic_lock_reboot.png
	core/res/res/drawable-xhdpi/ic_lock_reboot.png
	core/res/res/values/arrays.xml
	data/sounds/NewAudio.mk
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	services/java/com/android/server/power/ShutdownThread.java

Change-Id: I07489d5038c85e321c2678e76dad553a9965c6de
some clock settings changes

Change-Id: Ief8ed0ab1f09ec82ac40cf73b24be34f775d4b64
Merge branch 'mr1-staging' of git://github.com/CyanogenMod/android_frameworks_base into cm_merge
Quick Settings Mod By Kevdliu

Change-Id: Ia5989080f97c2c07d8c24e6caeec8a599bf83f48
Revert "QSM Patch #1"

This reverts commit 43297da2d61aaf923c0ec784b34000f68340d0fe.

Conflicts:
	packages/QuickSettingsControlPanel/Android.mk
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java