Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_frameworks_base into gingerbread
Merge branch 'gingerbread' of github.com:tom3q/android_frameworks_base into gingerbread
Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_frameworks_base into gingerbread
Add simple caching to XML compilation

XML compilation stage will perform many (expensive) resource ID
lookups - for the same entries. Adding this simple cache can
dramatically improve performance of this stage (often a bottleneck)

Updated: fixed for Mac OS X (also tested on Windows, Linux)

back ported from http://review.cyanogenmod.com/#/c/24040/

Change-Id: Ib1ab82ba9bf901bc2a3f9027b47d680861d6c315
Signed-off-by: Jorrit Jongma <jorrit@jongma.org>

Conflicts:

	tools/aapt/Android.mk
	tools/aapt/ResourceTable.cpp
Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_frameworks_base into gingerbread
Increase max lines for Preference summary

This fix to display missing build date of kernel version in DeviceInfo
settings same as jellybean.

Change-Id: I0493d464b55552dac00dc595195367fa8267c98e
Work around some failures in Wrigley 3G RIL.

- The RIL sometimes forgets data connections that became inactive,
  making it return an empty list in the DATA_CALL_LIST RIL call
  instead of just marking those connections inactive. When framework
  then nevertheless tries to teardown those connections, the RIL chokes.
  Fix that by suppressing the DEACTIVATE_DATA_CALL call in those cases.

- Sometimes the RIL doesn't respond to SETUP_DATA_CALL requests. Catch
  that condition and convert it into an error so that frameworks retries
  the connection.
Fix light filter sometimes being slow when changing light conditions.

If the screen is turned off, the light filter is supposed to be reset
when the screen comes back on. On screen off, the light sensor listener
is unregistered, and the code relies on it not being called anymore.
That assumption doesn't hold true, though (verified by checking logs),
which causes the light filter to be filled while the screen is off.
Fix haptic feedback for pattern length of 1.
Update ringer audio focus if ringer volume is changed during ringing.

AudioService only grabs the audio focus for the phone if the ringer
volume is set to something audible. If e.g. ascending ringtone is
enabled and starts at 0, the audio focus wouldn't be grabbed for the
whole ring period, leading to a mixture of played music and the
ringtone. Fix that by grabbing the audio focus if the volume is set away
from 0 while ringing.

Also attenuate music during ringing even when using silent ringtone.
Makes it more obvious to the user that something is going on.
Theme some more framework notifications.
Localize screen timeout toast.

Change-Id: Ic167ead9a218ae3cb887c2b70257024e3b5bbbc5
Merge "Localize screen timeout toast." into gingerbread
Merge "Fix light filter sometimes being slow when changing light conditions." into gingerbread
Merge "Theme some more framework notifications." into gingerbread
Merge "Update ringer audio focus if ringer volume is changed during ringing." into gingerbread
Frameworks/SystemUI: Update Greek translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I25186850f606ae32474f75f7149a7ad3dd0d93bf
Merge "Work around some failures in Wrigley 3G RIL." into gingerbread
Merge "Frameworks/SystemUI: Update Greek translations" into gingerbread
frameworks_base : Updated French Translations

(Patch Set 6)

- Better visibility.
- General optimization.
- Fixed misspelling French.

- CSS optimized.
- Correction messages like "no translation found".

- Replacement "..." with "\u2026".

- Added "msgid" missing.
- Added some missing comments.
- Added several missing translations.
- Added "\u00A0" before and after hyphen.
- Added "\u00A0" before exclamation mark and question mark, then before colon.

- Adapatation compared to the original file.
- Header updated and standardized.
- Other small fixes.

Signed-off-by: Thibault LEMOINE <thibaultblizz@gmail.com>