Commit Graph

4051 Commits

Author SHA1 Message Date
Robert Greenwalt
d2f3d6b34f am ec9fe467: Fix a race condition for data change notification
Merge commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4' into eclair-plus-aosp

* commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4':
  Fix a race condition for data change notification
2009-08-24 16:39:35 -07:00
Mike Lockwood
0de8cfb1eb am 2e951b55: Merge change 22493 into eclair
Merge commit '2e951b5511750ebfbba28263ee5384bfa7f45128' into eclair-plus-aosp

* commit '2e951b5511750ebfbba28263ee5384bfa7f45128':
  Add resources to specify display rotation when in keyboard open or docked state.
2009-08-24 15:43:29 -07:00
Android (Google) Code Review
7d22f78233 Merge change 22493 into eclair
* changes:
  Add resources to specify display rotation when in keyboard open or docked state.
2009-08-24 15:41:30 -07:00
Scott Main
f3819c4e41 am e120cfd4: am b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new
Merge commit 'e120cfd49fa27d04ed119e6922568eca2a9d6f9e' into eclair-plus-aosp

* commit 'e120cfd49fa27d04ed119e6922568eca2a9d6f9e':
  Add more code samples to the online docs.
2009-08-24 15:37:08 -07:00
Scott Main
d5729e31fc am b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new samples
Merge commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd' into eclair

* commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd':
  Add more code samples to the online docs.
2009-08-24 15:35:28 -07:00
Wei Huang
31d701929f am 5e6ad478: Merge change 22496 into eclair
Merge commit '5e6ad4786d599e17c1736cf52e5846a44e19d374' into eclair-plus-aosp

* commit '5e6ad4786d599e17c1736cf52e5846a44e19d374':
  fix typo
2009-08-24 15:07:01 -07:00
Android (Google) Code Review
73eff1bf36 Merge change 22496 into eclair
* changes:
  fix typo
2009-08-24 15:04:46 -07:00
Cynthia Wong
52cd39a900 am cb7d3838: Subscribe to subscribedfeeds whenever the accounts change, this is basically a giant hack to let the gsync server know about the subscriptions for accounts.
Merge commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b' into eclair-plus-aosp

* commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b':
  Subscribe to subscribedfeeds whenever the accounts change, this is basically a giant hack to let the gsync server know about the subscriptions for accounts.
2009-08-24 14:44:11 -07:00
Leon Scroggins
3e1865687b am 7bc08e9d: Merge change 21944 into eclair
Merge commit '7bc08e9d51d3142717a94098f897a776f7b7bd71' into eclair-plus-aosp

* commit '7bc08e9d51d3142717a94098f897a776f7b7bd71':
  Implement new title bar hiding/showing behavior.
2009-08-24 14:15:47 -07:00
Android (Google) Code Review
cce089bd4f Merge change 21944 into eclair
* changes:
  Implement new title bar hiding/showing behavior.
2009-08-24 14:13:05 -07:00
Mike Lockwood
95509769b1 am ac8ebcd1: Merge change 22478 into eclair
Merge commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620' into eclair-plus-aosp

* commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620':
  DockObserver: minor cleanup.
2009-08-24 14:01:21 -07:00
Android (Google) Code Review
32f8f6ae4c Merge change 22478 into eclair
* changes:
  DockObserver: minor cleanup.
2009-08-24 13:59:29 -07:00
Satish Roddom
ae943c8e21 am c0234a9d: Merge change 22474 into eclair
Merge commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3' into eclair-plus-aosp

* commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3':
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:47:45 -07:00
Android (Google) Code Review
1a595a3572 Merge change 22474 into eclair
* changes:
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:45:30 -07:00
Mike Lockwood
f69c5040be am 4df8dd8a: Merge change 22470 into eclair
Merge commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2' into eclair-plus-aosp

* commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2':
  Fix some Javadoc typos.
2009-08-24 13:17:23 -07:00
Romain Guy
b2b546eb84 am 40ed81ec: Merge change 22472 into eclair
Merge commit '40ed81ec98e4c221e90273a8b842b1d110d8258b' into eclair-plus-aosp

* commit '40ed81ec98e4c221e90273a8b842b1d110d8258b':
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:16:01 -07:00
Android (Google) Code Review
7c7c861f54 Merge change 22470 into eclair
* changes:
  Fix some Javadoc typos.
2009-08-24 13:15:47 -07:00
Android (Google) Code Review
646b318ba3 Merge change 22472 into eclair
* changes:
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:14:25 -07:00
Derek Sollenberger
aa8765c31d am df8a3f31: adding harness for plugin testing to be built upon
Merge commit 'df8a3f31d871db25e952972c2eb346a71186e9e3' into eclair-plus-aosp

* commit 'df8a3f31d871db25e952972c2eb346a71186e9e3':
  adding harness for plugin testing to be built upon
2009-08-24 12:19:20 -07:00
Cary Clark
949aeae147 am 840b856d: Merge change 22452 into eclair
Merge commit '840b856d2a7287e98526d3957715eba3677e872f' into eclair-plus-aosp

* commit '840b856d2a7287e98526d3957715eba3677e872f':
  don't center zoom on size change if zoom is in progress
2009-08-24 11:50:15 -07:00
Android (Google) Code Review
39920f6288 Merge change 22452 into eclair
* changes:
  don't center zoom on size change if zoom is in progress
2009-08-24 11:47:53 -07:00
Patrick Scott
2dfbbf4500 am d507ff21: Merge change 22449 into eclair
Merge commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4' into eclair-plus-aosp

* commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4':
  Check for a null history item to avoid crashing.
2009-08-24 11:02:28 -07:00
Android (Google) Code Review
f361975282 Merge change 22449 into eclair
* changes:
  Check for a null history item to avoid crashing.
2009-08-24 11:00:30 -07:00
Steve Block
155638acf8 am ba9f5f3f: Merge change 22440 into eclair
Merge commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616' into eclair-plus-aosp

* commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616':
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 10:57:54 -07:00
Android (Google) Code Review
d7bc600500 Merge change 22440 into eclair
* changes:
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 10:56:10 -07:00
Scott Su
63a2e19e95 am b321625b: Merge change 22430 into eclair
Merge commit 'b321625b859f2db4407810929ca6fa6074f65403' into eclair-plus-aosp

* commit 'b321625b859f2db4407810929ca6fa6074f65403':
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:36:49 -07:00
Yu Shan Emily Lau
fa048b4fad am b91c52f7: am 8c937a17: Merge change 22379 into donut
Merge commit 'b91c52f77387a95b4ae554b369644e0f41e401ea' into eclair-plus-aosp

* commit 'b91c52f77387a95b4ae554b369644e0f41e401ea':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:35:15 -07:00
Android (Google) Code Review
b4bd48ab37 Merge change 22430 into eclair
* changes:
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:34:32 -07:00
Yu Shan Emily Lau
6f2d58506e am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Android (Google) Code Review
e7004a70a9 Merge change 22379 into donut
* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
2009-08-24 10:11:00 -07:00
Patrick Scott
516118217f am 4e9718d6: Fix synchronous xml requests with ssl errors.
Merge commit '4e9718d6ae3433a3f78fddf158a15701101ba781' into eclair-plus-aosp

* commit '4e9718d6ae3433a3f78fddf158a15701101ba781':
  Fix synchronous xml requests with ssl errors.
2009-08-24 09:05:24 -07:00
Grace Kloba
5ca075f7b3 am 7fdab7f9: Merge change 22377 into eclair
Merge commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658' into eclair-plus-aosp

* commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658':
  The new webkit won't keep RAM cache if http header has "no-store". So remove
2009-08-24 08:47:01 -07:00
Android (Google) Code Review
c16d69317b Merge change 22377 into eclair
* changes:
  The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network  result.
2009-08-24 08:45:06 -07:00
Steve Block
e3e5c96e2a am 8a2000df: Merge change 22262 into eclair
Merge commit '8a2000df6d32f4e5df3073753055800a9363a3a5' into eclair-plus-aosp

* commit '8a2000df6d32f4e5df3073753055800a9363a3a5':
  Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
2009-08-24 03:09:07 -07:00
Android (Google) Code Review
c0c18c332d Merge change 22262 into eclair
* changes:
  Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
2009-08-24 03:07:15 -07:00
Steve Block
3d114aa9fc am 25131299: Merge change 21978 into eclair
Merge commit '25131299aaa1b8c4f44edb33f71f0241a61939e4' into eclair-plus-aosp

* commit '25131299aaa1b8c4f44edb33f71f0241a61939e4':
  Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
2009-08-24 02:30:08 -07:00
Android (Google) Code Review
a655d9cce1 Merge change 21978 into eclair
* changes:
  Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
2009-08-24 02:28:23 -07:00
Scott Su
119447dab5 Remove frameworks/base/im since these stuff are only used by IM app 2009-08-23 23:41:50 -07:00
Jeff Sharkey
8874d5eee5 am 84235ee9: Add extra to exclude specific MIME-types from Fast-Track.
Merge commit '84235ee923c13e58ce339c25c86f734b338a81e0' into eclair-plus-aosp

* commit '84235ee923c13e58ce339c25c86f734b338a81e0':
  Add extra to exclude specific MIME-types from Fast-Track.
2009-08-23 14:20:51 -07:00
Jeff Sharkey
935018c177 am 06a0323a: Add fields to pass ungrouped counts to UI.
Merge commit '06a0323a5439ba5c1c31f9adb70918b5bf5f61de' into eclair-plus-aosp

* commit '06a0323a5439ba5c1c31f9adb70918b5bf5f61de':
  Add fields to pass ungrouped counts to UI.
2009-08-23 00:20:52 -07:00
Jeff Sharkey
4ba42c8408 am f03733e7: Merge change 22160 into eclair
Merge commit 'f03733e7a1465b186acc1da11dca18f054c12734' into eclair-plus-aosp

* commit 'f03733e7a1465b186acc1da11dca18f054c12734':
  Add dither XML flag to StateListDrawable.
2009-08-22 23:00:11 -07:00
Android (Google) Code Review
bff63b58ab Merge change 22160 into eclair
* changes:
  Add dither XML flag to StateListDrawable.
2009-08-22 22:57:30 -07:00
Wink Saville
94495ee439 am 55c6f888: Fix missing break statement found by Motorola.
Merge commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d' into eclair-plus-aosp

* commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d':
  Fix missing break statement found by Motorola.
2009-08-22 22:51:45 -07:00
Scott Su
4b2988b66a am a5fa3648: Merge change 22383 into eclair
Merge commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc' into eclair-plus-aosp

* commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc':
  Remove the decleration of com.android.im.plugin.jar in platform.xml
2009-08-22 11:09:33 -07:00
Android (Google) Code Review
b65c9a3485 Merge change 22383 into eclair
* changes:
  Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
2009-08-22 11:07:20 -07:00
Eric Fischer
4958f256d5 am 688b0f12: am 36d5aaec: Merge change 22322 into donut
Merge commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d' into eclair-plus-aosp

* commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d':
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-22 07:47:46 -07:00
Ken Shirriff
8442920159 am 5f5989de: Add tests for RecurrenceSet.
Merge commit '5f5989de7cac3583a2217b03e9661d2abb1a1d70' into eclair-plus-aosp

* commit '5f5989de7cac3583a2217b03e9661d2abb1a1d70':
  Add tests for RecurrenceSet.
2009-08-22 07:45:26 -07:00
Libin Tang
65e931608d am 7b0cdc88: Merge change 22362 into eclair
Merge commit '7b0cdc8890a849283d31a15126e73edce3bdf3a6' into eclair-plus-aosp

* commit '7b0cdc8890a849283d31a15126e73edce3bdf3a6':
  Fix +NANP issue and cleanup plus code conversion.
2009-08-22 07:45:13 -07:00
Guo-Bin Zhang
c6e528e9de am 1cef2289: Disable data call in emergency call
Merge commit '1cef22890d10417977397a5dccf34956858d0803' into eclair-plus-aosp

* commit '1cef22890d10417977397a5dccf34956858d0803':
  Disable data call in emergency call
2009-08-22 07:45:05 -07:00
Romain Guy
9409506980 am 6f89172b: Merge change 22352 into eclair
Merge commit '6f89172b6e149c623fe582e4baa658299a3fc72c' into eclair-plus-aosp

* commit '6f89172b6e149c623fe582e4baa658299a3fc72c':
  Fix FallRS by keeping a reference to the mesh.
2009-08-22 07:44:42 -07:00