Merge "PatternUnlockScreen: Battery status can be shown if desired." into gingerbread
Sanity check item for being non-null.

This normally shouldn't happen, but experience has shown that there are
some rare corner cases where it indeed happens. The exact conditions are
unclear, but it's likely related to an ACTION_CANCEL event being sent
out before the ACTION_UP event.
In order to not crash in weird, hard-to-debug corner cases, just check
whether we actually have an item to process.

This fixes http://code.google.com/p/cyanogenmod/issues/detail?id=4985.
Fix wrong 'USB debugging connected' notify color

Change-Id: I8ad4ce8652325e2e10dd529a934c8928ee0b149c
Merge "Externalize symbol picker options to resources" into gingerbread
policy: fix "Skip on security" functionality

It was only working for fingerprint and pattern lockscreens.

Change-Id: Ib4d4d28f80256fbe669aeb5681ef6056b8f5f3d4
Merge "Fix wrong 'USB debugging connected' notify color" into gingerbread
Merge "policy: fix "Skip on security" functionality" into gingerbread
Revert "Fix wrong 'USB debugging connected' notify color"

This reverts commit 6d70c41047314e8753b373bc92ae675bf580b641
Merge "Revert "Fix wrong 'USB debugging connected' notify color"" into gingerbread
small corrections to NO_RGBX_8888 flag usage

Change-Id: I0d7188b92c56c381bb0d2e07335744bda0041942
Allow theming of framework UI elements.

As the theme engine works by replacing resources while loading the APK,
framework UI couldn't be themed so far. Workaround that by manually
creating a com.android.systemui package context and using that for
showing the UI. This attempt is a bit hacky, but should be safe as
a) systemui should always be present
b) if it isn't, we fall back to no theming

Change-Id: I644e2e8d7d4abf07bae639b606197d691f16adac
Quick unlock : Fix bug

There is an issue where users whose passwords are greater than 8 chars and
have quick unlock enabled will be unable to unlock their lockscreen.
This is due to the logic evaluating anything beyond 3chars as a password attempt.

This change modifies the quick unlock behavior so that when typing the password,
each character is considered an attempt, however if incorrect, is not reported as a failed attempt.
Only when the user presses enter is it considered an "explicit" attempt and a failed attempt is reported.

Change-Id: I02d436184d63c6880c7b1dc6b4b6119fba76e9a7
Merge remote branch 'upstream/gingerbread' into gingerbread

Conflicts:
	core/java/android/text/method/QwertyKeyListener.java

Change-Id: I0206dc32e4c1d245af60ed5ba883e6c402f97885
Merge remote branch 'upstream/gingerbread' into gingerbread
Merge remote-tracking branch 'nadlabak/gingerbread' into nadlabak-moto
Make ActivityManagerService.systemReady thread safe

During boot of the framework, two threads execute code in
ActivityManagerService and ActivityStack, respectively. At one point
in time, the latter thread checks the internal state of the first
thread, but if for some reason that thread has stalled for an
unexpected amount of time, the state has not been updated (yet).

An example of the above is when one of the services started from
SystemServer (eg AppWidgetService) takes unexpectedly long to start.
This causes the framework to boot without broadcasting
BOOT_COMPLETED, which in turn has ramifications for the entire
system.

Change-Id: I14b5f6fcb320be01596a2e04db3f724a43f4fbe1
Revert "Externalize symbol picker options to resources"

This reverts commit c218e2c7c9c5c8cc663e8ff18aaeafc251cc082e.

Change-Id: I3017a5ce803f1bb8e52abf2ee33df6354b729e2f
GPS Provider main thread blocked by NTP and XTRA download

currently the NTP and XTRA download is running off of GPS provider main
thread. This could potentially block the next tasks for over a minute of
time. If the upcomings task happens to AGPS, AGPS will time out.

Placed the NTP and XTRA downloads in other threads.

Change-Id: I57a6aaf5348212bc1246813f6d941da7d5b19136

Conflicts:

	services/java/com/android/server/location/GpsLocationProvider.java
we don't have hw keyboard, so use ugly workaround to build
without reverting externalize symbols
Merge remote-tracking branch 'nadlabak/gingerbread' into nadlabak-moto