Commit Graph

5678 Commits

Author SHA1 Message Date
Android (Google) Code Review
bc5faabdd6 Merge change 26686 into eclair
* changes:
  Fix broken build.
2009-09-23 18:21:23 -04:00
Jack Palevich
29c0255a9d am 311ed019: Merge change 26679 into eclair
Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp

* commit '311ed0191d6423e41b1cf5137a38e53504494818':
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-23 15:03:46 -07:00
Android (Google) Code Review
246ea848ff Merge change 26679 into eclair
* changes:
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-23 17:53:54 -04:00
Jack Palevich
9195835537 Create samples showing how to call OpenGL from JNI libraries. 2009-09-23 14:48:07 -07:00
Dianne Hackborn
abf19a93f2 am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267' into eclair-plus-aosp

* commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-23 14:36:42 -07:00
Jason Sams
9490e95c79 am 5dd7c726: Merge change 26667 into eclair
Merge commit '5dd7c726f45fd7b7ab473471dc504c00012a6856' into eclair-plus-aosp

* commit '5dd7c726f45fd7b7ab473471dc504c00012a6856':
  Add raster object to control point and line params. Add flag to force SW rendering.
2009-09-23 14:06:46 -07:00
Android (Google) Code Review
e95f0b38cd Merge change 26667 into eclair
* changes:
  Add raster object to control point and line params. Add flag to force SW rendering.
2009-09-23 17:00:22 -04:00
Sanjay Jeyakumar
156d9e1523 am f017167f: Merge change 25794 into eclair
Merge commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f' into eclair-plus-aosp

* commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f':
  Remove the GDD Gservices setting.
2009-09-23 13:46:07 -07:00
Debajit Ghosh
97043bafb6 am 193a6261: Merge change 26537 into eclair
Merge commit '193a6261894619985866220c320017f0831d6055' into eclair-plus-aosp

* commit '193a6261894619985866220c320017f0831d6055':
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-23 13:45:55 -07:00
Android (Google) Code Review
b196cf28d7 Merge change 25794 into eclair
* changes:
  Remove the GDD Gservices setting.
2009-09-23 16:37:57 -04:00
Android (Google) Code Review
42cf067d28 Merge change 26537 into eclair
* changes:
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-23 16:17:02 -04:00
Cary Clark
d8a1324cb8 am 37703b6c: invalidate the webview after pressing the IME \'next\' button
Merge commit '37703b6c875a935e6341d8a710796bc0c87d3044' into eclair-plus-aosp

* commit '37703b6c875a935e6341d8a710796bc0c87d3044':
  invalidate the webview after pressing the IME 'next' button
2009-09-23 12:51:27 -07:00
Marco Nelissen
5f636ff46c am bdeccbba: Merge change 26623 into eclair
Merge commit 'bdeccbba6f6ed49da4e8e668d62754bc7263e9ce' into eclair-plus-aosp

* commit 'bdeccbba6f6ed49da4e8e668d62754bc7263e9ce':
  fbDev wasn't initialized of hw_get_module failed, but was then used anyway.
2009-09-23 12:51:05 -07:00
Android (Google) Code Review
953eb137bc Merge change 26623 into eclair
* changes:
  fbDev wasn't initialized of hw_get_module failed, but was then used anyway.
2009-09-23 15:02:49 -04:00
Daniel Sandler
50567b589b am 3f2c70fb: Merge change 26627 into eclair
Merge commit '3f2c70fb9e2dd503f96958db501729a20bb33c31' into eclair-plus-aosp

* commit '3f2c70fb9e2dd503f96958db501729a20bb33c31':
  Convert instances of px in default UI styles to dip.
2009-09-23 12:00:07 -07:00
Dianne Hackborn
e04a8a5741 am 7475be4b: Merge change 26636 into eclair
Merge commit '7475be4bc239929aa49235e223807d5447674efd' into eclair-plus-aosp

* commit '7475be4bc239929aa49235e223807d5447674efd':
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-09-23 11:59:55 -07:00
Android (Google) Code Review
bc53233843 Merge change 26627 into eclair
* changes:
  Convert instances of px in default UI styles to dip.
2009-09-23 14:54:44 -04:00
Android (Google) Code Review
62297352e7 Merge change 26636 into eclair
* changes:
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-09-23 14:45:17 -04:00
Ray Chen
ac20d44d6e am 830207ca: Merge change 25635 into eclair
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
2009-09-23 11:38:06 -07:00
Bob Lee
2d893a41bf am 3136d4b0: Merge change 26635 into eclair
Merge commit '3136d4b0108deaca5ab525881de47d2979911131' into eclair-plus-aosp

* commit '3136d4b0108deaca5ab525881de47d2979911131':
  Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.
2009-09-23 11:34:36 -07:00
Leon Scroggins
fa93094f5a am 6d181166: Merge change 26615 into eclair
Merge commit '6d181166a2e5c819e274397f90e33d340061750f' into eclair-plus-aosp

* commit '6d181166a2e5c819e274397f90e33d340061750f':
  Provide a getter to access the width of the HTML document.
2009-09-23 11:34:20 -07:00
Android (Google) Code Review
3b01049fd5 Merge change 25635 into eclair
* changes:
  Add new thumbnail API.
2009-09-23 14:31:04 -04:00
Android (Google) Code Review
59214667f2 Merge change 26635 into eclair
* changes:
  Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.
2009-09-23 14:28:16 -04:00
Android (Google) Code Review
6f6381ccbd Merge change 26615 into eclair
* changes:
  Provide a getter to access the width of the HTML document.
2009-09-23 14:24:07 -04:00
Daniel Sandler
0ea2c11d1b am 9d12fdb1: Merge change 26625 into eclair
Merge commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c' into eclair-plus-aosp

* commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c':
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-23 11:21:27 -07:00
Android (Google) Code Review
cff4f09868 Merge change 26625 into eclair
* changes:
  Fix http://b/2139600 (expander indicators misaligned).
2009-09-23 14:12:37 -04:00
Marco Nelissen
a455793a8d fbDev wasn't initialized of hw_get_module failed, but was then used anyway. 2009-09-23 10:56:51 -07:00
Xavier Ducrohet
017f957527 am 0acf9a5b: Merge change 26539 into eclair
Merge commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f' into eclair-plus-aosp

* commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f':
  Add density value to density enum.
2009-09-23 10:40:15 -07:00
Android (Google) Code Review
3880515d82 Merge change 26539 into eclair
* changes:
  Add density value to density enum.
2009-09-23 13:33:06 -04:00
Wei Huang
1e65af94ba am b06c9a8c: Merge change 26579 into eclair
Merge commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656' into eclair-plus-aosp

* commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656':
  add definition for Mms.TempStorage content uri and filename.
2009-09-23 10:24:21 -07:00
Cary Clark
cd63c46167 am b82665e7: don\'t allow min scale to go to infinity
Merge commit 'b82665e78f3a4f08e7b620b85246b7925097386b' into eclair-plus-aosp

* commit 'b82665e78f3a4f08e7b620b85246b7925097386b':
  don't allow min scale to go to infinity
2009-09-23 10:19:21 -07:00
Android (Google) Code Review
904ab724b4 Merge change 26579 into eclair
* changes:
  add definition for Mms.TempStorage content uri and filename.
2009-09-23 13:17:14 -04:00
Ben Murdoch
8c6b751766 am c28e3a67: Merge change 26595 into eclair
Merge commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0' into eclair-plus-aosp

* commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0':
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-23 09:59:26 -07:00
Android (Google) Code Review
f2b4976a53 Merge change 26595 into eclair
* changes:
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-23 12:53:31 -04:00
Leon Scroggins
cf1fe3c939 am d4c00a17: Merge change 26590 into eclair
Merge commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66' into eclair-plus-aosp

* commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66':
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-23 09:04:57 -07:00
Android (Google) Code Review
98d4e410a4 Merge change 26590 into eclair
* changes:
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-23 11:58:46 -04:00
Bjorn Bringert
d0c7d36192 am dbce92ab: Merge change 26587 into eclair
Merge commit 'dbce92ab0bc874420f237cc06f615470080ebc6a' into eclair-plus-aosp

* commit 'dbce92ab0bc874420f237cc06f615470080ebc6a':
  Back button in search always goes back or closes search
2009-09-23 08:29:14 -07:00
Android (Google) Code Review
adebf5ae4b Merge change 26587 into eclair
* changes:
  Back button in search always goes back or closes search
2009-09-23 11:20:03 -04:00
Dianne Hackborn
54e7389550 am c413d54c: Merge change 26573 into eclair
Merge commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3' into eclair-plus-aosp

* commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3':
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-23 01:05:01 -07:00
Android (Google) Code Review
420d010f1a Merge change 26573 into eclair
* changes:
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-23 03:57:03 -04:00
Jesse Wilson
b478619081 am ecaf00e8: DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
Merge commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333' into eclair-plus-aosp

* commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333':
  DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
2009-09-23 00:46:17 -07:00
Daisuke Miyakawa
1aa3a4ab5a am d2cd9467: Suppress warning around old vcard code.
Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp

* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
  Suppress warning around old vcard code.
2009-09-22 23:26:14 -07:00
Daisuke Miyakawa
2162904468 am c32897a6: Suppress Performance log emitted by vCard importer.
Merge commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa' into eclair-plus-aosp

* commit 'c32897a6ead7e898dd37ac8bcec72e4cf89dadfa':
  Suppress Performance log emitted by vCard importer.
2009-09-22 22:34:03 -07:00
Daisuke Miyakawa
75982b3a7e am 3559c14c: Merge change 26549 into eclair
Merge commit '3559c14c9c056b51e0def93625987e0a42c618f7' into eclair-plus-aosp

* commit '3559c14c9c056b51e0def93625987e0a42c618f7':
  Add Website.TYPE information.
2009-09-22 22:24:18 -07:00
Android (Google) Code Review
8ea1996cfe Merge change 26549 into eclair
* changes:
  Add Website.TYPE information.
2009-09-23 01:17:31 -04:00
Wei Huang
2bfb5013ca am a1dfa7f4: Merge change 26550 into eclair
Merge commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724' into eclair-plus-aosp

* commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724':
  fix bug 2134367: failing phone number compare test.
2009-09-22 22:10:22 -07:00
Android (Google) Code Review
d8dc3120ad Merge change 26550 into eclair
* changes:
  fix bug 2134367: failing phone number compare test.
2009-09-23 01:01:18 -04:00
Fred Quintana
e87d54d475 am be3bceb5: fix the logic for starting a sync after the accounts changed
Merge commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10' into eclair-plus-aosp

* commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10':
  fix the logic for starting a sync after the accounts changed
2009-09-22 21:22:47 -07:00
Fred Quintana
fcf7b71e58 am 3de07024: Merge change 26456 into eclair
Merge commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979' into eclair-plus-aosp

* commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979':
  - make an AccountManager per context, not one per process
2009-09-22 20:26:12 -07:00
Android (Google) Code Review
f72e082ce2 Merge change 26456 into eclair
* changes:
  - make an AccountManager per context, not one per process - enhance the comment for addOnAccountsUpdatedListener()
2009-09-22 23:20:25 -04:00