Commit Graph

7066 Commits

Author SHA1 Message Date
Mathias Agopian
f9f36b5ecd am 533a2803: Merge change I18ffb549 into eclair
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-plus-aosp

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:17:52 -08:00
Android (Google) Code Review
7462be0240 Merge change I18ffb549 into eclair
* changes:
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:13:01 -08:00
Mathias Agopian
f74573486d fix [2069023] STOPSHIP: disable DEBUG_COPYBIT 2009-11-30 12:10:53 -08:00
Mathias Agopian
f5e3830fb0 am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-plus-aosp

* commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
  fixed [2260070] display stopped updating
2009-11-30 12:00:53 -08:00
Eric Fischer
a0b4d6a06e am 926492d9: Merge change Ie8493cf1 into eclair
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-plus-aosp

* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
  Import revised translations.  DO NOT MERGE
2009-11-30 12:00:21 -08:00
Android (Google) Code Review
2688bf49c4 Merge change I5469a4ac into eclair
* changes:
  fixed [2260070] display stopped updating
2009-11-30 11:55:10 -08:00
Android (Google) Code Review
067be1dd47 Merge change Ie8493cf1 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-30 11:54:46 -08:00
Mathias Agopian
c61de17f14 fixed [2260070] display stopped updating
always check that the visible region isn't empty after all visible regions are recomputed
clear he freeze-lock if it is.
2009-11-30 11:15:41 -08:00
Eric Laurent
8eaa6313a5 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:05:52 -08:00
Android (Google) Code Review
def563c451 Merge change I524dc046 into eclair
* changes:
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:00:06 -08:00
Dima Zavin
203fe87ef9 am f817218e: dumpstate: Pick up the last kernel log from /proc
Merge commit 'f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-plus-aosp

* commit 'f817218e09a556f20efc81309ba2cdb3475a370b':
  dumpstate: Pick up the last kernel log from /proc
2009-11-29 13:50:27 -08:00
Eric Laurent
059b413e65 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
2009-11-27 05:07:55 -08:00
Joe Onorato
661f30a30e am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-plus-aosp

* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:58:28 -08:00
Android (Google) Code Review
8f80ef1135 Merge change Ic9f6bf94 into eclair
* changes:
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:52:08 -08:00
Jack Palevich
66f81abeed am ca00dee2: Merge change I5aa3adcf into eclair
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-plus-aosp

* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
  Improve the exception message text by including eglGetError().
2009-11-25 13:48:54 -08:00
Android (Google) Code Review
579c593593 Merge change I5aa3adcf into eclair
* changes:
  Improve the exception message text by including eglGetError().
2009-11-25 13:43:07 -08:00
Dianne Hackborn
daf0406bbb am 8e1985d4: Merge change Ie552036f into eclair
Merge commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9' into eclair-plus-aosp

* commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:03:39 -08:00
Brett Chabot
458de773bd am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:50 -08:00
Android (Google) Code Review
ed1f111364 Merge change Ie552036f into eclair
* changes:
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 12:55:44 -08:00
Ben Murdoch
f0a8ffa5b4 am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp

* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:43:47 -08:00
Android (Google) Code Review
e57a2362fd Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
* changes:
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:37:27 -08:00
Joe Onorato
b7036642a7 am 55896f3c: Merge change Ib71193bf into eclair
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-plus-aosp

* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:45:50 -08:00
Android (Google) Code Review
7af6912009 Merge change Ib71193bf into eclair
* changes:
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:41:32 -08:00
Dianne Hackborn
2e8866913a am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-plus-aosp

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:51:37 -08:00
Android (Google) Code Review
8b967d2fab Merge change I16925b91 into eclair
* changes:
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:43:53 -08:00
Mathias Agopian
d67728cff1 am 63851404: Merge change Ibf0c320a into eclair
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-plus-aosp

* commit '638514048141bf9f28a4bede77b83c3238f5c194':
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:43:40 -08:00
Android (Google) Code Review
6d0e906926 Merge change Ibf0c320a into eclair
* changes:
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:26:28 -08:00
Jim Miller
2ee0f6950d am 35cdb484: Merge change I6c6c166b into eclair
Merge commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-plus-aosp

* commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:05:16 -08:00
Android (Google) Code Review
978f4e5b07 Merge change I6c6c166b into eclair
* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:00:54 -08:00
Swarna Kumar
8e59864335 am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-plus-aosp

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:32:43 -08:00
Android (Google) Code Review
0467b21f5a Merge change I816428ae into eclair
* changes:
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number : 2177113
2009-11-24 13:28:45 -08:00
Jason Sams
4c13a43da1 am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-plus-aosp

* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
  Force a crash under conditions where white square bug in all apps is likely to occur.
2009-11-24 12:49:15 -08:00
Trevor Johns
c06733024f am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-plus-aosp

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:40:35 -08:00
Android (Google) Code Review
8968df6355 Merge change Iefdb6f97 into eclair
* changes:
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:35:35 -08:00
Jean-Baptiste Queru
85241edfe9 merge from open-source master 2009-11-24 09:12:34 -08:00
Mathias Agopian
2f0a0a58f6 When using MDP, we needed to use a texture for diming. 2009-11-23 22:41:36 -08:00
Dave Sparks
89a8ae724b am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-plus-aosp

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
  Fix simulator build.
2009-11-23 19:59:15 -08:00
Dave Sparks
25f233ef91 am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-plus-aosp

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
  Set metadata retriever thread group to the caller's group.
2009-11-23 19:58:37 -08:00
Android (Google) Code Review
3b70ddd2f6 Merge change I0f9a53d4 into eclair
* changes:
  Set metadata retriever thread group to the caller's group.
2009-11-23 17:58:24 -08:00
Dave Sparks
f3eb75fd1e am 9a219519: Merge change I2d32301b into eclair
Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-plus-aosp

* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
  Add 4 new notification sounds.
2009-11-23 17:46:23 -08:00
Android (Google) Code Review
75d632798a Merge change I2d32301b into eclair
* changes:
  Add 4 new notification sounds.
2009-11-23 17:42:41 -08:00
Jason Sams
5499ee6a33 am 39dbb099: Merge change I36176536 into eclair
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-plus-aosp

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:19:06 -08:00
Android (Google) Code Review
9afbb82c5e Merge change I36176536 into eclair
* changes:
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:14:13 -08:00
Dianne Hackborn
864e10f177 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-plus-aosp

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:56 -08:00
Dirk Dougherty
13c2435832 am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-plus-aosp

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 13:55:11 -08:00
Eric Olsen
0464d90c34 am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-plus-aosp

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
  Add logging of headset events to help debug issue.
2009-11-23 13:54:40 -08:00
Android (Google) Code Review
d5e377df7b Merge change Ie7096ebb into eclair
* changes:
  Add logging of headset events to help debug issue.
2009-11-23 13:20:46 -08:00
Scott Main
38b0a4c348 am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-plus-aosp

* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:08:10 -08:00
Scott Main
aba8577a07 am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair

* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:04:27 -08:00
Android (Google) Code Review
ac6da24e2c Merge change Id2ee762d into eclair-sdk
* changes:
  droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
2009-11-23 12:56:19 -08:00