10290 Commits

Author SHA1 Message Date
Jim Miller
ac4bacd977 am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2

* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
  Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
2009-11-15 14:51:12 -08:00
Jim Miller
197ef85ef5 am e5608f5e: Merge change Ied958262 into eclair
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-mr2

* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 14:50:19 -08:00
Mike Lockwood
7f9fb0c4de am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
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
2009-11-15 14:49:40 -08:00
Jean-Baptiste Queru
fef18bfcb0 resolved conflicts for merge of 383aa124 to eclair-mr2 2009-11-15 14:39:53 -08:00
Jim Miller
16a9d9a736 Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Also includes a cosmetic fix to move the Digital clock down a bit.
2009-11-15 13:26:37 -08:00
Android (Google) Code Review
e5608f5ea5 Merge change Ied958262 into eclair
* changes:
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 11:41:43 -08:00
Jim Miller
ec05ece3ba Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier. 2009-11-15 11:12:39 -08:00
Android (Google) Code Review
04c585e3bc Merge changes Ia4825f54,If6f80560 into eclair
* 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
2009-11-15 05:32:03 -08:00
Android (Google) Code Review
383aa124de Merge change I60ff11dc into eclair
* changes:
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
2009-11-14 22:12:31 -08:00
Mike Lockwood
e090281428 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
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>
2009-11-14 23:12:25 -05:00
Dan Egnor
e3cfe2d928 Fix the SDK build. 2009-11-14 16:32:13 -08:00
Android (Google) Code Review
30dc8d1eeb Merge change I61343808 into eclair-mr2
* changes:
  Remove external/protobuf from the build, now that it's been moved to vendor/google/libraries.
2009-11-14 16:28:45 -08:00
Mike Lockwood
0e5bb7f1c9 PowerManagerService: Hold a wakelock while mProximityTask is queued
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>
2009-11-14 06:41:20 -05:00
Jim Miller
d1841144e4 am 7c1c4600: Merge change I425ca595 into eclair
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2

* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:43:32 -08:00
Android (Google) Code Review
7c1c46000b Merge change I425ca595 into eclair
* changes:
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:39:51 -08:00
Mathias Agopian
cc96ede29a am 20aec2dd: Merge change I830df4b1 into eclair
Merge commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca' into eclair-mr2

* commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca':
  addresses several bugs: 2206097, 2166583, 2261119, 2216759
2009-11-14 01:06:14 -08:00
Android (Google) Code Review
20aec2ddee Merge change I830df4b1 into eclair
* changes:
  addresses several bugs: 2206097, 2166583, 2261119, 2216759
2009-11-14 01:01:26 -08:00
Jim Miller
425ca595dc Fix 2261626: Don't show text on button if orientation is vertical. 2009-11-13 19:20:28 -08:00
Mathias Agopian
830df4b169 addresses several bugs: 2206097, 2166583, 2261119, 2216759
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.
2009-11-13 18:54:14 -08:00
Eric Fischer
aca29235a7 am d12ba5e0: (-s ours) Merge change Ibd5b099c into eclair
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-mr2

* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:46:31 -08:00
Android (Google) Code Review
d12ba5e04b Merge change Ibd5b099c into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-13 17:42:19 -08:00
Mathias Agopian
35ede78ede am 91e40e78: Merge change I18e02606 into eclair
Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-mr2

* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
  fix some aspects of [2258746] native crash in launcher2
2009-11-13 17:33:52 -08:00
Android (Google) Code Review
91e40e7838 Merge change I18e02606 into eclair
* changes:
  fix some aspects of [2258746] native crash in launcher2
2009-11-13 17:31:21 -08:00
Dan Egnor
613438086c Remove external/protobuf from the build, now that it's
been moved to vendor/google/libraries.
2009-11-13 17:14:26 -08:00
Eric Fischer
bd5b099c25 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-13 17:13:39 -08:00
Mike Cleron
0a27865a01 am d54261aa: Merge change Id6c0b844 into eclair
Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-mr2

* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
  Unbreak setting photos as wallpaper
2009-11-13 17:03:31 -08:00
Android (Google) Code Review
d54261aab0 Merge change Id6c0b844 into eclair
* changes:
  Unbreak setting photos as wallpaper
2009-11-13 17:00:44 -08:00
Mike Cleron
d6c0b844a0 Unbreak setting photos as wallpaper 2009-11-13 16:37:27 -08:00
Fred Quintana
60ff11dc39 fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange 2009-11-13 16:21:52 -08:00
Xavier Ducrohet
b2d7c60f12 am ae210437: Merge change I7082e366 into eclair
Merge commit 'ae2104371d84570011dbb8c1621832a132ed4584' into eclair-mr2

* commit 'ae2104371d84570011dbb8c1621832a132ed4584':
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:47:16 -08:00
Android (Google) Code Review
ae2104371d Merge change I7082e366 into eclair
* changes:
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:42:31 -08:00
Mathias Agopian
18e026066a fix some aspects of [2258746] native crash in launcher2
Surface::validate() could sometimes dereference a null pointer before checking it wasn't null.
This will prevent the application to crash when given bad parameters or used incorrectly.
However, the bug above probably has another cause.
2009-11-13 15:26:29 -08:00
Mike Lockwood
dc65633937 am 991475a2: Merge change I0e419fcf into eclair
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2

* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:21:45 -08:00
Android (Google) Code Review
991475a2e5 Merge change I0e419fcf into eclair
* changes:
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:17:59 -08:00
Eric Fischer
7d7257dd9c am 65f27f87: Merge change I98f82b9a into eclair
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-mr2

* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:57:20 -08:00
Android (Google) Code Review
65f27f8721 Merge change I98f82b9a into eclair
* changes:
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:51:00 -08:00
Mike Lockwood
746b3184bf Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)

Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-13 17:40:38 -05:00
Xavier Ducrohet
76410f1eb3 Properly implement Paint.breakText for layoutlib.
BUG 2260400

Change-Id: I7082e366b65da0b5de2a6dbb547f66e05e0b78e0
2009-11-13 14:10:20 -08:00
Android (Google) Code Review
373329d477 Merge change I736c525a into eclair-mr2
* changes:
  update dox to account for different behavior between AVOID and TARGET modes
2009-11-13 14:05:20 -08:00
Eric Fischer
66668524d4 Fix the full-weekday date format strings to actually use the full weekday.
Also fix the abbreviated weekday/month/day/year strings to use a 4-digit year.

Approver: jerryw
2009-11-13 14:04:03 -08:00
Nicolas Catania
235657dbe0 am 73f8aa67: Merge change I4898b145 into eclair
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-mr2

* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
  Removed the fixed height in the sim unlock screen's header.
2009-11-13 13:43:32 -08:00
Android (Google) Code Review
73f8aa6780 Merge change I4898b145 into eclair
* changes:
  Removed the fixed height in the sim unlock screen's header.
2009-11-13 13:39:01 -08:00
Jaikumar Ganesh
f05ec9237e Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.

Manual merge from eclair branch
2009-11-13 13:08:52 -08:00
Jaikumar Ganesh
94140b3554 Merge commit '9284dec7' into merge 2009-11-13 13:02:02 -08:00
Android (Google) Code Review
9284dec737 Merge change I4c05ba1f into eclair
* changes:
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 12:06:29 -08:00
Android (Google) Code Review
5da824210e Merge change Iac63ebc8 into eclair-mr2
* changes:
  Make WRITE_GSERVICES into system-or-signature (instead of just signature), as a temporary measure so unbundled Google components (GSF, etc.) can hold it.  (In the longer term, WRITE_GSERVICES won't be a system permission at all, but it or something like it will be defined directly by GSF.)
2009-11-13 11:21:27 -08:00
Mike Cleron
aaa8e7e633 am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2

* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
  Add support for making a LiveWallpaper the default
2009-11-13 11:11:42 -08:00
Dianne Hackborn
6e0ff0c37c am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-mr2

* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:11:24 -08:00
Scott Main
b0d2313ea4 am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2

* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:11:06 -08:00
Android (Google) Code Review
27d6e65b71 Merge change I322b6ee7 into eclair
* changes:
  Add support for making a LiveWallpaper the default
2009-11-13 11:01:57 -08:00