Merge commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea'
* commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
always preserve rows for accounts with type of localhost even if the account manager doesn't know about them
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
eclair snapshot
Merge commit 'f9b97e6941d5162f676631ffda15eff3d20f3b18'
* commit 'f9b97e6941d5162f676631ffda15eff3d20f3b18':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-mr2
* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-mr2
* commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404':
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
Merge commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2' into eclair-mr2-plus-aosp
* commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-plus-aosp
* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-plus-aosp
* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Merge commit '8a4e470fc2c1351d58a6ab2d99eb12d01c5c2656'
* commit '8a4e470fc2c1351d58a6ab2d99eb12d01c5c2656':
Fix build
Typo fix in javadoc
Correction of an error in the setRotate method of the ColorMatrix class.
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-plus-aosp
* commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404':
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
* changes:
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp
* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Do not cancel screen brightness animation in forceUserActivityLocked unless screen is turning off.
Also not turn the screen on if PowerManager.preventScreenOn(false) is called while proximity sensor is active.
Fixes b/2254818 (dim display) where due to a race condition the screen is stuck in a dim state.
Change-Id: If6f805609c8d463631b9e22805e5242714ce34c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3230ef9c0661f6ee65370ca0f11dafb723d97bf5'
* commit '3230ef9c0661f6ee65370ca0f11dafb723d97bf5':
Remove external/protobuf from the build, now that it's
Merge commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea' into eclair-mr2-plus-aosp
* commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea':
Remove external/protobuf from the build, now that it's
This prevents the device from sleeping while a deferred proximity sensor
event is pending.
Fixes b/2260005 (Proximity sensor can fail due to missing wakelock)
Change-Id: Ia4825f548b5b7d8a0b184f720b32c2f21b77b96e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '17831dd428419686ec0e6da9b25fd593bdee7ac0'
* commit '17831dd428419686ec0e6da9b25fd593bdee7ac0':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit 'd1841144e4d592724001018f427806edb9c72ae0' into eclair-mr2-plus-aosp
* commit 'd1841144e4d592724001018f427806edb9c72ae0':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-plus-aosp
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
2206097: Broken suggestions while composing message
2166583: Color artifacts with MDP dithering
2261119: Passion transition animations are rough
2216759: Screen flicker when dropdown list in background window shows or hides
This is part of enabling GPU composition instead of using the MDP. This change
is dependent on another change in the vendor project.
Specifically this change disables the use of EGLImageKHR for s/w buffers
for cache coherency reasons. memcpy is used instead.
Merge commit 'aca29235a75bde8baf121b7e54b058d29f286003' into eclair-mr2-plus-aosp
* commit 'aca29235a75bde8baf121b7e54b058d29f286003':
Import revised translations. DO NOT MERGE
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-mr2
* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
Import revised translations. DO NOT MERGE
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-plus-aosp
* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
Import revised translations. DO NOT MERGE
