Commit Graph

6540 Commits

Author SHA1 Message Date
Eric Fischer
9ed8aa967b am f2ee8dac: (-s ours) am 093918a6: (-s ours) Merge change 21549 into donut
Merge commit 'f2ee8dac069c5e3b62c9bde372ac657c047de965'

* commit 'f2ee8dac069c5e3b62c9bde372ac657c047de965':
  Import revised translations.  DO NOT MERGE
2009-08-18 12:09:31 -07:00
Dianne Hackborn
7f4f78d5d1 am edc5ff86: am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
Merge commit 'edc5ff862877d679578cbe9ecbbc806782620968'

* commit 'edc5ff862877d679578cbe9ecbbc806782620968':
  Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
2009-08-18 12:09:27 -07:00
Mike LeBeau
1892614200 am 93df5786: am cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.
Merge commit '93df578638418ef2f05efdf58331d847f41b17b5'

* commit '93df578638418ef2f05efdf58331d847f41b17b5':
  Correct comments for startSearch in Activity and SearchManager to explain
2009-08-18 12:09:24 -07:00
Jean-Michel Trivi
748747f7ae am 5d8cbf8d: am d5884a9b: Merge change 21358 into donut
Merge commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17'

* commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17':
  Unhide the broadcast intent that signals completion of the TTS language
2009-08-18 12:09:20 -07:00
Suchi Amalapurapu
5feac6c7eb am 6919f692: am 75c49842: Add maxSdkVersion information in dump badging option
Merge commit '6919f69281e32d0c3d4b3791b273f71f178cbb7c'

* commit '6919f69281e32d0c3d4b3791b273f71f178cbb7c':
  Add maxSdkVersion information in dump badging option
2009-08-18 12:09:16 -07:00
Eric Fischer
f2ee8dac06 am 093918a6: (-s ours) Merge change 21549 into donut
Merge commit '093918a62818c6bb176921928d2ca7a22857ec9b' into eclair

* commit '093918a62818c6bb176921928d2ca7a22857ec9b':
  Import revised translations.  DO NOT MERGE
2009-08-18 11:00:28 -07:00
Dianne Hackborn
edc5ff8628 am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
Merge commit 'c678a93a73c83e841032874bee9c202936da73c0' into eclair

* commit 'c678a93a73c83e841032874bee9c202936da73c0':
  Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
2009-08-18 11:00:16 -07:00
Mike LeBeau
93df578638 am cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.
Merge commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb' into eclair

* commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb':
  Correct comments for startSearch in Activity and SearchManager to explain
2009-08-18 10:59:53 -07:00
Jean-Michel Trivi
5d8cbf8da3 am d5884a9b: Merge change 21358 into donut
Merge commit 'd5884a9ba45e58294c09fd2747c87d761b9daee5' into eclair

* commit 'd5884a9ba45e58294c09fd2747c87d761b9daee5':
  Unhide the broadcast intent that signals completion of the TTS language
2009-08-18 10:59:20 -07:00
Suchi Amalapurapu
6919f69281 am 75c49842: Add maxSdkVersion information in dump badging option
Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair

* commit '75c498426a17b47d445711bb9e36794b05876a56':
  Add maxSdkVersion information in dump badging option
2009-08-18 10:59:08 -07:00
Grace Kloba
532b024680 am db33d4bb: Merge change 21468 into eclair
Merge commit 'db33d4bbaeedf2095968ec7795b488038cdcd015'

* commit 'db33d4bbaeedf2095968ec7795b488038cdcd015':
  Couple of fixes for viewport.
2009-08-18 10:55:36 -07:00
Android (Google) Code Review
db33d4bbae Merge change 21468 into eclair
* changes:
  Couple of fixes for viewport.
2009-08-18 10:51:49 -07:00
Ken Shirriff
bf8124b7dd am 01484957: (-s ours) Merge change 21634 into eclair
Merge commit '014849570c80ce2c7081f8477ac97dcebabc4f5c'

* commit '014849570c80ce2c7081f8477ac97dcebabc4f5c':
  Add new calendar database columns; do not merge (cherry-picked 1fa64)
2009-08-18 10:48:40 -07:00
Romain Guy
106240997f am 15df6703: Fix potential leak in ViewRoot.
Merge commit '15df6703f8bf3255eb7ba5c27e3518f60adc83f1'

* commit '15df6703f8bf3255eb7ba5c27e3518f60adc83f1':
  Fix potential leak in ViewRoot.
2009-08-18 10:48:37 -07:00
Android (Google) Code Review
014849570c Merge change 21634 into eclair
* changes:
  Add new calendar database columns; do not merge (cherry-picked 1fa64)
2009-08-18 10:29:43 -07:00
Romain Guy
15df6703f8 Fix potential leak in ViewRoot.
The way View.post() is handled can cause potential leaks in ViewRoot. For instance,
if a View calls post(Runnable) just after being detached from the window (in an
onClickListener for instance,) it will enqueue a Runnable in ViewRoot.RunQueue.
Unfortunately the RunQueue is emptied only on the very first layout of the ViewRoot.
This change prevents the leak by rxecuting the enqueued Runnables on every layout request
The latter did not happen before and to keep views in a correct state I think it
is necessary to always ensure we run the Runnables sent via View.post().
2009-08-18 10:16:41 -07:00
Grace Kloba
7a02d6e457 Couple of fixes for viewport.
http://b/issue?id=2053685. This is a tricky one. When Browser is restarted,
we may get first layout even before viewport tag is parsed. This is rare,
but it happens to Google Reader site. So we need to setup the viewport explicitly
if it happens after first layout. There is a pairing webkit change.

http://b/issue?id=2054131. When Google talk is loaded, it goes through an auth
redirect site which means first layout is called with standardLoad as false.
In this case, even the final site uses viewport tag to get mobile experience,
the intermediate one doesn't. To make sure most of the mobile sites, who
define their viewport width as device width, work correctly, we always update
the mRestoreState when we set viewport.

http://b/issue?id=2054121. When Browser is first started or restarted, the
mCurrentViewWidth is 0 as we don't know the WebView's width yet. As we can't
send VIEW_SIZE_CHANGED message directly, we reset WebView's mLastWidthSent
so that VIEW_SIZE_CHANGED will be sent from WebView when it's width is available.
2009-08-18 10:10:51 -07:00
Guang Zhu
a9d708c015 am 6a2d513a: Merge change 21221 into eclair
Merge commit '6a2d513a4ad116fc5405d4d4f1f6fdb692bdefbc'

* commit '6a2d513a4ad116fc5405d4d4f1f6fdb692bdefbc':
  Modify svc power command so it pokes the wake lock when called. This will ensure screen is not asleep if stayon is requested.
2009-08-18 10:02:51 -07:00
Android (Google) Code Review
6a2d513a4a Merge change 21221 into eclair
* changes:
  Modify svc power command so it pokes the wake lock when called. This will ensure screen is not asleep if stayon is requested.
2009-08-18 09:59:40 -07:00
krosaen
04fc2a2949 am d2d6014f: NEW API for SearchManager and Activity to \'triggerSearch\'.
Merge commit 'd2d6014f715f12f6263f61ba3eeb6f8cba6d0fa6'

* commit 'd2d6014f715f12f6263f61ba3eeb6f8cba6d0fa6':
  NEW API for SearchManager and Activity to 'triggerSearch'.
2009-08-18 09:13:58 -07:00
krosaen
d2d6014f71 NEW API for SearchManager and Activity to 'triggerSearch'.
This is pretty much the same thing as startSearch, except it also launches the
query.  We enforce that this can only be done for the package of the app that is
associated with the search mananger (e.g you can't trigger a contacts search
from anywhere).
2009-08-18 08:56:03 -07:00
Xavier Ducrohet
b45282f7b6 am 1a8c1599: am c1c432f5: Merge change 21241 into donut
Merge commit '1a8c1599de630ae4199b71cb3eca75d7db9c40d6'

* commit '1a8c1599de630ae4199b71cb3eca75d7db9c40d6':
  Layoutlib now uses the dimen status_bar_height instead of hard-coded value
2009-08-18 08:48:56 -07:00
Jean-Michel Trivi
b176f362cd am 0deb41ab: am 0950c5de: Merge change 21226 into donut
Merge commit '0deb41abc68ff05b6c2e06175982f9d22a5abd92'

* commit '0deb41abc68ff05b6c2e06175982f9d22a5abd92':
  Fix bug 2046705 where the output of the speech synthesizer is too low.
2009-08-18 08:48:53 -07:00
Jean-Baptiste Queru
dc53a3c272 am 969c2eaa: am c8ab08aa: Merge change 21124 into donut
Merge commit '969c2eaa3ac2501931b0ce67d831262e6f3d6cf6'

* commit '969c2eaa3ac2501931b0ce67d831262e6f3d6cf6':
  Add license-related files
2009-08-18 08:48:49 -07:00
Scott Main
47c5f34afc am 2685d3b8: am ba52b3e0: Merge change 21149 into donut
Merge commit '2685d3b85b3ad5fcb5362abdfb9037fc89deb714'

* commit '2685d3b85b3ad5fcb5362abdfb9037fc89deb714':
  DOCS ONLY.
2009-08-18 08:48:46 -07:00
Grace Kloba
06dbd41941 am 9befde04: Merge change 21648 into eclair
Merge commit '9befde04c3efe82317bf06cb0d841752a71de62c'

* commit '9befde04c3efe82317bf06cb0d841752a71de62c':
  Remove the hack to include Gears as it is gone now.
2009-08-18 08:48:43 -07:00
Xavier Ducrohet
1a8c1599de am c1c432f5: Merge change 21241 into donut
Merge commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839' into eclair

* commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839':
  Layoutlib now uses the dimen status_bar_height instead of hard-coded value
2009-08-18 08:44:59 -07:00
Jean-Michel Trivi
0deb41abc6 am 0950c5de: Merge change 21226 into donut
Merge commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188' into eclair

* commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188':
  Fix bug 2046705 where the output of the speech synthesizer is too low.
2009-08-18 08:44:51 -07:00
Jean-Baptiste Queru
969c2eaa3a am c8ab08aa: Merge change 21124 into donut
Merge commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd' into eclair

* commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd':
  Add license-related files
2009-08-18 08:44:43 -07:00
Scott Main
2685d3b85b am ba52b3e0: Merge change 21149 into donut
Merge commit 'ba52b3e08b33592457242944f7a89691a5b94880' into eclair

* commit 'ba52b3e08b33592457242944f7a89691a5b94880':
  DOCS ONLY.
2009-08-18 08:44:38 -07:00
Android (Google) Code Review
9befde04c3 Merge change 21648 into eclair
* changes:
  Remove the hack to include Gears as it is gone now.
2009-08-18 08:44:18 -07:00
Nick Pelly
7bb9150435 am bd022f42: Bluetooth: API change.
Merge commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c'

* commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c':
  Bluetooth: API change.
2009-08-18 08:40:51 -07:00
Nick Pelly
bd022f423a Bluetooth: API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
2009-08-18 08:24:22 -07:00
Daniel Sandler
7d010d9067 am 82e7408b: Merge change 21326 into eclair
Merge commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d'

* commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d':
  aapt now attempts to process all assets even if some are malformed.
2009-08-18 07:24:10 -07:00
Android (Google) Code Review
82e7408be2 Merge change 21326 into eclair
* changes:
  aapt now attempts to process all assets even if some are malformed.
2009-08-18 07:20:06 -07:00
Mike Lockwood
c37770cfff am 8735d553: Merge change 21601 into eclair
Merge commit '8735d553c58c2ff445798a26de78e89e34964d08'

* commit '8735d553c58c2ff445798a26de78e89e34964d08':
  BatteryService: Add support for new standard battery voltage and temperature attributes.
2009-08-18 06:07:33 -07:00
Android (Google) Code Review
8735d553c5 Merge change 21601 into eclair
* changes:
  BatteryService: Add support for new standard battery voltage and temperature attributes.
2009-08-18 06:03:47 -07:00
Mathias Agopian
d7716266f9 am 6e6c7bbc: Merge change 21646 into eclair
Merge commit '6e6c7bbce01a7c7feabeab7b77632515a54e79d9'

* commit '6e6c7bbce01a7c7feabeab7b77632515a54e79d9':
  fix bug [2021677] egl driver unloaded after eglTerminate() is called
2009-08-18 00:31:38 -07:00
Android (Google) Code Review
6e6c7bbce0 Merge change 21646 into eclair
* changes:
  fix bug [2021677] egl driver unloaded after eglTerminate() is called
2009-08-18 00:27:16 -07:00
Dianne Hackborn
0bd6723652 am 8df8b2b4: Allow wallpapers to get touch events.
Merge commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd'

* commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd':
  Allow wallpapers to get touch events.
2009-08-17 22:37:47 -07:00
Romain Guy
aa7c305624 am 948ee251: Merge change 21660 into eclair
Merge commit '948ee251276e1ce7f5c5517b24bf88a75e99f160'

* commit '948ee251276e1ce7f5c5517b24bf88a75e99f160':
  Optimized Galaxy
2009-08-17 22:37:44 -07:00
Dianne Hackborn
8df8b2b405 Allow wallpapers to get touch events. 2009-08-17 21:23:05 -07:00
Android (Google) Code Review
948ee25127 Merge change 21660 into eclair
* changes:
  Optimized Galaxy
2009-08-17 20:00:32 -07:00
Romain Guy
4f7136c659 Optimized Galaxy 2009-08-17 19:59:27 -07:00
johnwang
d80afe63d2 am e5a07e65: Merge change 21655 into eclair
Merge commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b'

* commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b':
  Use dataRoaming in dataConnectionTracker.
2009-08-17 19:26:43 -07:00
Android (Google) Code Review
e5a07e65c5 Merge change 21655 into eclair
* changes:
  resolved conflicts for merge of 696b912e to eclair
2009-08-17 19:21:49 -07:00
johnwang
01ae863611 resolved conflicts for merge of 696b912e to eclair
modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

	modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
2009-08-17 19:20:07 -07:00
Jason Sams
7b26ce8c15 am 9fb956db: Merge change 21653 into eclair
Merge commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0'

* commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0':
  Remove global IO context and integrate it into the RS context.
2009-08-17 18:45:15 -07:00
Android (Google) Code Review
9fb956dbdc Merge change 21653 into eclair
* changes:
  Remove global IO context and integrate it into the RS context.
2009-08-17 18:40:38 -07:00
Jason Sams
bc948dedce Remove global IO context and integrate it into the RS context. 2009-08-17 18:35:48 -07:00