Quiet hours
use black for panel_bg_holo_dark.
black panels
Navigation bar Quick launch shortcuts

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/symbols.xml

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Fix build
Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.

Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
Improve the Resource.getQuantityString/getQuantityText documentation.

Natural languages differ so much and in such odd ways that you can't
use getQuantityString as an "if" statement. It's really just for grammaticality.
This is explained well in
http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
but we need to make more of an effort to motivate people to read that, and to
at least get the most important point across if they don't read it.

Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
update preloaded-classes

Remove some preloaded-classes and fix typo for deleting log messages
as the followings during booting.

W/Zygote  (  163): Class not found for preloading: android.bluetooth.
BluetoothAudioGateway
W/Zygote  (  163): Class not found for preloading: android.bluetooth.
HeadsetBase
W/Zygote  (  163): Class not found for preloading: undroid.content.Ab
stractThreadedSyncAdapter$SyncThread

Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c
LockscreenPattern : Toggle dots/error pattern visibility (1/2)

Give user ability to hide error pattern / dots.

Part 2 : http://review.cyanogenmod.org/#/c/33004/

Patchset 2 : Minor formatting
Patchset 3 : Cleanup commit msg

Change-Id: I2af7403b0f72c72e13dd1dec73f8d335ff4029bf
LockscreenPattern : missing public @hide

Change-Id: Ia2a22154352fc080db6e96666a4a0bef241c787b
Revert "Remove dock home support."

This reverts commit 7c135205f2f4c192299ad0215276e9e481bccaa5.

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I9b2c4eebaab87a669b42681e70ec5324dadf7f6d
Performance increase in thumbnail handling

Allow for 160*120 thumbnails which is what cameras commonly
generates. The constants for the micro thumbnail were set to other
values, resulting in recalculations of the thumbnais, which
takes time.

This change only affects the maximum size of the temporary image,
when choosing whether to use the EXIF thumbnail or decoding and
downsampling the full image. Without this change, it will choose
an x16 downsampling of the full image over an x2 downsampling of
the EXIF thumbnail, after the change it will prefer the EXIF
thumbnail.

Cf the DCF specifications at http://www.exif.org/dcf.PDF,
"3.3.6. DCF basic thumbnail data structure, (C) Pixel count"

Tested by running DDMS and measuring the time required to create
a thumbnail. This was 220-280 ms prior to change, < 20 ms after.

Change-Id: I59c753493f947e920bad3fde5eeed5d49d509863
Revert "LockscreenPattern : missing public @hide"

This reverts commit 4544cac8b3dd748aeccba7e2c92e9d25187ec70c.
Revert "LockscreenPattern : Toggle dots/error pattern visibility (1/2)"

This reverts commit 23ee0b17aa88a72e0599efb097e13e156e7f0aa8.
Forward port CM Screen Security settings (Part 2 of 2)

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: Ie1ccaec43ca75474e92f96c60e15d7b75796ac5f

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

Signed-off-by: Paul Beeler <sparksco@gmail.com>