Commit Graph

5141 Commits

Author SHA1 Message Date
Romain Guy
f01e6dbb02 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:05 -07:00
Android (Google) Code Review
156a67e55e Merge change I0d74deb6 into eclair
* changes:
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 18:33:12 -04:00
Android (Google) Code Review
d7053ee8a2 Merge change I7f97011b into eclair-mr2
* changes:
  check for native initialization before calling public function
2009-10-15 15:41:06 -04:00
Guang Zhu
f95802dd1b am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-mr2

* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
  Enable some tests that requires local http server
2009-10-15 11:59:05 -07:00
Android (Google) Code Review
9fdf27819d Merge change I1a23191b into eclair-mr2
* changes:
  fix build
2009-10-15 14:33:39 -04:00
Android (Google) Code Review
b1ba69cc4a Merge change I6719d39d into eclair-mr2
* changes:
  Fix alert dialog separator
2009-10-15 14:15:03 -04:00
Android (Google) Code Review
d666a58ff1 Merge change Ib839afc3 into eclair-mr2
* changes:
  remove the bind helper and bind directly
2009-10-15 13:16:31 -04:00
Android (Google) Code Review
0a8888f3fc Merge change I5d199964 into eclair-mr2
* changes:
  add an IPC for sync initialization
2009-10-15 12:43:23 -04:00
Scott Main
938a0a7e43 am 30a6657e: Merge change Ic9b31801 into eclair
Merge commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4' into eclair-mr2

* commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4':
  docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
2009-10-14 18:02:32 -07:00
Android (Google) Code Review
39c999a537 Merge change Ic9b31801 into eclair
* changes:
  docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0... move upgrading doc into a new guide for "updating" with the new manager tools and remove the previous updating doc from the dev guide. set up preliminary download page and guide for installing the full SDK. add the requirements doc in sdk/ for all general purposes. revise the download 'thank you' message.
2009-10-14 20:52:50 -04:00
Android (Google) Code Review
189c8e3258 Merge change I647ae75e into eclair-mr2
* changes:
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 19:53:09 -04:00
Android (Google) Code Review
b1fe50656b Merge change I170c8251 into eclair-mr2
* changes:
  Add tests and fix vCard code.
2009-10-14 19:40:25 -04:00
Android (Google) Code Review
49dee1c5f8 Merge change I52c235db into eclair-mr2
* changes:
  Return valid package info for packages that have been uninstalled with an option to retain data and resources using the flag GET_UNINSTALLED_PACKAGES These packages do not have a package setting. just check the flag and return the required info from PackageParser.generatePackageInfo
2009-10-14 19:32:47 -04:00
Nick Pelly
8d151d2c43 am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:06 -07:00
Nick Pelly
e79df1d097 am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:19 -07:00
Android (Google) Code Review
f7f46955f7 Merge change I2492bffe into eclair
* changes:
  Remove STOPSHIP comment.
2009-10-14 14:55:44 -04:00
Katarina Stenstedt
2a7e575077 am 399fc263: Merge change If30c5e20 into eclair
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-mr2

* commit '399fc2636f1332986f319df3cf8ae56344070c51':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:04:53 -07:00
Android (Google) Code Review
bf89a25446 Merge change If30c5e20 into eclair
* changes:
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial. Changed image links to use @docRoot.
2009-10-14 12:52:00 -04:00
Dmitri Plotnikov
f3df75adee am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-mr2

* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 07:38:11 -07:00
Dave Sparks
16ee0422e2 am 8c471d1d: Merge change I4ef3e82f into eclair
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-mr2

* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
  7 more ringtones. Now with more Dr. No!
2009-10-14 07:38:04 -07:00
Dianne Hackborn
c7c865dc51 am cbf77e9b: Merge change I875200fe into eclair
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-mr2

* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-14 07:37:38 -07:00
Android (Google) Code Review
136a4d0674 Merge change I4c64bb78 into eclair-mr2
* changes:
  add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
2009-10-14 10:02:11 -04:00
Android (Google) Code Review
90e1850c05 Merge change I4ef3e82f into eclair
* changes:
  7 more ringtones. Now with more Dr. No!
2009-10-14 03:13:12 -04:00
Android (Google) Code Review
d6e991e167 Merge change I875200fe into eclair
* changes:
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-14 01:51:00 -04:00
Dianne Hackborn
4e8286057d am b10e2f1a: Merge change Iac534225 into eclair
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 20:19:39 -07:00
Android (Google) Code Review
f1e8da6637 Merge change Iac534225 into eclair
* changes:
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 23:13:37 -04:00
Android (Google) Code Review
d3e70c2737 Merge change Ib3558f35 into eclair-mr2
* changes:
  Make our choice of surface explicit.
2009-10-13 22:54:58 -04:00
Android (Google) Code Review
1297164a35 Merge change I28023911 into eclair-mr2
* changes:
  Add additional error checking of EGL function calls.
2009-10-13 22:54:15 -04:00
Jack Palevich
d594fe1740 Make our choice of surface explicit. 2009-10-13 19:52:44 -07:00
Dmitri Plotnikov
93331c3d22 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:40 -07:00
Android (Google) Code Review
66bde586fb Merge change Ic52ba78c into eclair-mr2
* changes:
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 21:08:17 -04:00
Jeff Sharkey
b32cc07b61 am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Android (Google) Code Review
c63bdd1ebd Merge change I4410ec8f into eclair-mr2
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
2009-10-13 21:01:26 -04:00
Android (Google) Code Review
dea428b4e0 Merge change I69e21f5f into eclair-mr2
* changes:
  GLDual test application.
2009-10-13 17:57:50 -04:00
Jack Palevich
9bd30f05e8 GLDual test application.
Draws two images at once, one GL based, one GL2 based.
2009-10-13 14:56:00 -07:00
Android (Google) Code Review
b8bb011df8 Merge change I7fa8c508 into eclair-mr2
* changes:
  make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
Robert Greenwalt
5e657ee86b am 64d54042: Merge change I61c08260 into eclair
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2

* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
  Futher reduce the logging of EriManager.
2009-10-13 14:11:54 -07:00
Android (Google) Code Review
7f2eeca5ba Merge change I61c08260 into eclair
* changes:
  Futher reduce the logging of EriManager.
2009-10-13 17:07:10 -04:00
Android (Google) Code Review
8716c13580 Merge change I564b5b00 into eclair-mr2
* changes:
  add "junk path" -k option to aapt
2009-10-13 16:41:21 -04:00
Android (Google) Code Review
08f79ebf90 Merge change Iaa321588 into eclair-mr2
* changes:
  Add "deleted" row to Events table.
2009-10-13 16:10:32 -04:00
Android (Google) Code Review
c85ae90db0 Merge change Id5ba82a1 into eclair-mr2
* changes:
  Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04:00
Dianne Hackborn
bd351e8bfd am 2a21a77d: Merge change I1369e9ab into eclair
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2

* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 11:52:34 -07:00
Android (Google) Code Review
8ace1a7d11 Merge change I1369e9ab into eclair
* changes:
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 14:45:56 -04:00
Android (Google) Code Review
fd5d36bb78 Merge change I3dafca18 into eclair-mr2
* changes:
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Android (Google) Code Review
d84946c273 Merge change I73b00501 into eclair-mr2
* changes:
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Android (Google) Code Review
ebd103486b Merge change Ibd7b43bb into eclair-mr2
* changes:
  Separated private from public header files.
2009-10-13 13:38:28 -04:00
Android (Google) Code Review
1e3945aca8 Merge change I8d87cd98 into eclair-mr2
* changes:
  Fix various compiler warnings accumulated over time.
2009-10-13 13:31:58 -04:00
Robert Greenwalt
fa9a2ee309 am 16cb04ab: Merge change If1acb2dd into eclair
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2

* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
  Add a little logging to diagnose wifi cycle bug
2009-10-13 09:56:40 -07:00
Dave Sparks
2073967d00 am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -07:00
Android (Google) Code Review
676a3f3ca4 Merge change If1acb2dd into eclair
* changes:
  Add a little logging to diagnose wifi cycle bug
2009-10-13 12:45:30 -04:00