Commit Graph

5695 Commits

Author SHA1 Message Date
Android (Google) Code Review
1144d9de75 Merge change 27178 into eclair
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
2009-09-25 20:19:59 -04:00
Jason Sams
3c0e262d3c am 0c103af3: Merge change 27171 into eclair
Merge commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb' into eclair-plus-aosp

* commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb':
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
2009-09-25 16:56:51 -07:00
Android (Google) Code Review
d0ab8e3a37 Merge change 27171 into eclair
* changes:
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
2009-09-25 19:52:41 -04:00
Yu Shan Emily Lau
3fc95b7379 am 7756cbee: Merge change 27073 into eclair
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp

* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
  Removed the device type checking
2009-09-25 16:47:24 -07:00
Jack Palevich
e9d64c7415 am 2a5eea30: Merge change 27168 into eclair
Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp

* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
  Use EGLUtils to simplify choosing a configuration.
2009-09-25 16:47:19 -07:00
Jason Sams
7e17442679 am aafc7b54: Merge change 27169 into eclair
Merge commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a' into eclair-plus-aosp

* commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a':
  Improved object lifecycle tracking and fix leaks.
2009-09-25 16:47:09 -07:00
Android (Google) Code Review
9b7ea7e7b4 Merge change 27073 into eclair
* changes:
  Removed the device type checking
2009-09-25 19:42:24 -04:00
Android (Google) Code Review
304caada6e Merge change 27168 into eclair
* changes:
  Use EGLUtils to simplify choosing a configuration.
2009-09-25 19:41:13 -04:00
Android (Google) Code Review
b7665bca15 Merge change 27169 into eclair
* changes:
  Improved object lifecycle tracking and fix leaks.
2009-09-25 19:38:40 -04:00
Neel Parekh
00d5e25ccd am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though).
Merge commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899' into eclair-plus-aosp

* commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899':
  Center name when no status.
2009-09-25 16:33:11 -07:00
Jack Palevich
18e24f9525 Use EGLUtils to simplify choosing a configuration.
Doesn't actually select anything, possibly due to device driver errors.
2009-09-25 16:25:19 -07:00
Dianne Hackborn
dc06a1d9c6 am 48c84052: Merge change 27162 into eclair
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
2009-09-25 16:21:02 -07:00
Neel Parekh
71522c46f4 am 35468254: Merge change 26720 into eclair
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp

* commit '3546825421cab5330583633ed854134c35d1c08d':
  Allow us to set the contact uri without setting the fast track's uri
2009-09-25 16:11:46 -07:00
Android (Google) Code Review
6cd277daf3 Merge change 27162 into eclair
* changes:
  Fix Activity.overridePendingTransition().
2009-09-25 19:11:43 -04:00
Fred Quintana
6076afd82d am 6ecaff15: add a optional String to the key of notifications to allow users to scope them
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp

* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
  add a optional String to the key of notifications to allow users
2009-09-25 16:11:40 -07:00
Android (Google) Code Review
9d0d0c7f91 Merge change 26720 into eclair
* changes:
  Allow us to set the contact uri without setting the fast track's uri
2009-09-25 19:05:10 -04:00
Evan Millar
91bce74fd3 am ed7f0955: Merge change 27150 into eclair
Merge commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e' into eclair-plus-aosp

* commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e':
  Fix FasttrackBadgeWidget pressed state.
2009-09-25 15:50:40 -07:00
Android (Google) Code Review
fd805277ed Merge change 27150 into eclair
* changes:
  Fix FasttrackBadgeWidget pressed state.
2009-09-25 18:44:25 -04:00
Jason Sams
334b3a81c3 am f37b258c: Merge change 27146 into eclair
Merge commit 'f37b258c88e339b482696183def08f5c9437a0ff' into eclair-plus-aosp

* commit 'f37b258c88e339b482696183def08f5c9437a0ff':
  Reduce debugging spew and add props to selectivly re-enable it.
2009-09-25 15:35:28 -07:00
Scott Main
8cec2a276f am ba14fff7: am 12242678: docs only. fix broken links
Merge commit 'ba14fff7fd44c5174cb14b86c82c707dd03463d1' into eclair-plus-aosp

* commit 'ba14fff7fd44c5174cb14b86c82c707dd03463d1':
  docs only.
2009-09-25 15:35:22 -07:00
Android (Google) Code Review
e25be5c3f5 Merge change 27146 into eclair
* changes:
  Reduce debugging spew and add props to selectivly re-enable it.
2009-09-25 18:27:25 -04:00
Scott Main
eae7986ae7 am 12242678: docs only. fix broken links
Merge commit '122426780008b9920a15798f1a2bb210779b5a9d' into eclair

* commit '122426780008b9920a15798f1a2bb210779b5a9d':
  docs only.
2009-09-25 15:26:28 -07:00
Jason Sams
a56ca5f5a6 am 2896f7d6: Merge change 27137 into eclair
Merge commit '2896f7d67aebfc1c4f251155649e82e8490339fc' into eclair-plus-aosp

* commit '2896f7d67aebfc1c4f251155649e82e8490339fc':
  Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
2009-09-25 15:05:51 -07:00
Android (Google) Code Review
45cd046074 Merge change 27137 into eclair
* changes:
  Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
2009-09-25 18:00:08 -04:00
John Wang
08b34b9bc6 am fb2b04b7: Unhide NETWORK_TYPE_XXX.
Merge commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9' into eclair-plus-aosp

* commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9':
  Unhide NETWORK_TYPE_XXX.
2009-09-25 15:00:07 -07:00
Karl Rosaen
9a9a6be826 am 0cb901c4: Merge change 27076 into eclair
Merge commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c' into eclair-plus-aosp

* commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c':
  Optimize rotary selector widget by using bitmaps instead of drawables.
2009-09-25 14:39:44 -07:00
Wu-cheng Li
ddc07f626e am 8de57d8f: Add camera parameter key constants and documentation.
Merge commit '8de57d8fa346522404c2064a78e8f24a5aa3bf23' into eclair-plus-aosp

* commit '8de57d8fa346522404c2064a78e8f24a5aa3bf23':
  Add camera parameter key constants and documentation.
2009-09-25 14:34:58 -07:00
Android (Google) Code Review
7f63cf190b Merge change 27076 into eclair
* changes:
  Optimize rotary selector widget by using bitmaps instead of drawables.
2009-09-25 17:34:35 -04:00
Xavier Ducrohet
22fedcacc8 am bd5219f5: Merge change 27106 into eclair
Merge commit 'bd5219f5c3b3b692f7544ea5164b18a839f20155' into eclair-plus-aosp

* commit 'bd5219f5c3b3b692f7544ea5164b18a839f20155':
  Use reflection to figure out a readable string from install error code.
2009-09-25 14:24:27 -07:00
Wu-cheng Li
cc6ce203be Add camera parameter key constants and documentation. 2009-09-25 14:23:56 -07:00
Android (Google) Code Review
1a848a5fed Merge change 27106 into eclair
* changes:
  Use reflection to figure out a readable string from install error code.
2009-09-25 17:15:10 -04:00
Daisuke Miyakawa
ebb913c3e1 am 3ed05574: Merge change 27077 into eclair
Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp

* commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb':
  Two changes toward vCard composer.
2009-09-25 14:08:45 -07:00
Daniel Sandler
f366fd0149 am 228067ac: Merge change 27116 into eclair
Merge commit '228067ac6ab57aef85a34465b95e0a25c8bbc450' into eclair-plus-aosp

* commit '228067ac6ab57aef85a34465b95e0a25c8bbc450':
  Fix http://b/2131173 (gaps between Gallery tiles).
2009-09-25 14:04:10 -07:00
Android (Google) Code Review
e870b47481 Merge change 27077 into eclair
* changes:
  Two changes toward vCard composer.
2009-09-25 17:02:05 -04:00
Android (Google) Code Review
df220e89f0 Merge change 27116 into eclair
* changes:
  Fix http://b/2131173 (gaps between Gallery tiles).
2009-09-25 16:58:39 -04:00
Grace Kloba
1063e36008 am 0f5fd893: Merge change 27052 into eclair
Merge commit '0f5fd893bed202e90617a36bd4ca4211d667c320' into eclair-plus-aosp

* commit '0f5fd893bed202e90617a36bd4ca4211d667c320':
  If WebCore doesn't response touch down in time, don't
2009-09-25 13:44:48 -07:00
johnwang
4a6d1b0ff4 am 9c118c80: Update CID in NeighboringCellInfo
Merge commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f' into eclair-plus-aosp

* commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f':
  Update CID in NeighboringCellInfo
2009-09-25 13:44:42 -07:00
Android (Google) Code Review
848adf3824 Merge change 27052 into eclair
* changes:
  If WebCore doesn't response touch down in time, don't block the UI tap, pan and double tap. Added a time out (which is same as shortpress time out, 200ms) for how long we wait for WebCore's response for touch down.
2009-09-25 16:39:47 -04:00
David 'Digit' Turner
ff4d54ef98 am a0cad2f5: Merge change 27078 into eclair
Merge commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169' into eclair-plus-aosp

* commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169':
  Fix generic build boot sequence.
2009-09-25 11:47:44 -07:00
Android (Google) Code Review
f3ceb23fde Merge change 27078 into eclair
* changes:
  Fix generic build boot sequence.
2009-09-25 14:40:27 -04:00
Karl Rosaen
59578f891e am 52c37d64: Merge change 27065 into eclair
Merge commit '52c37d6402f14d180f6855cc1438ca62141205ca' into eclair-plus-aosp

* commit '52c37d6402f14d180f6855cc1438ca62141205ca':
  Remove vertical separator from landscape layout of pattern lock screen.
2009-09-25 10:49:15 -07:00
Brad Fitzpatrick
c158109bab am 3219ab4d: Fix typo in Bluetooth docs.
Merge commit '3219ab4de27cd40b2149b0dd13edd412efe40244' into eclair-plus-aosp

* commit '3219ab4de27cd40b2149b0dd13edd412efe40244':
  Fix typo in Bluetooth docs.
2009-09-25 10:49:09 -07:00
Android (Google) Code Review
1be815147f Merge change 27065 into eclair
* changes:
  Remove vertical separator from landscape layout of pattern lock screen.
2009-09-25 13:43:16 -04:00
Joe Onorato
d568e4d848 am 82768db5: Merge change 27046 into eclair
Merge commit '82768db56b8f6a6d22adba36df9539550091d411' into eclair-plus-aosp

* commit '82768db56b8f6a6d22adba36df9539550091d411':
  Add a method to destroy the RS object.
2009-09-25 09:29:17 -07:00
Scott Main
29c3ad45cb am d1cfd259: am c1828d5a: Merge change 3583 into donut
Merge commit 'd1cfd259bc0186259edb75ddf141cb8245842e46' into eclair-plus-aosp

* commit 'd1cfd259bc0186259edb75ddf141cb8245842e46':
  implement browser history for tabbed search results...
2009-09-25 09:29:12 -07:00
Android (Google) Code Review
d4f5386a47 Merge change 27046 into eclair
* changes:
  Add a method to destroy the RS object.
2009-09-25 12:21:21 -04:00
Scott Main
6ad511713d am c1828d5a: Merge change 3583 into donut
Merge commit 'c1828d5a492a14a9b15e9106684079049317313e' into eclair

* commit 'c1828d5a492a14a9b15e9106684079049317313e':
  implement browser history for tabbed search results...
2009-09-25 09:15:13 -07:00
Cary Clark
1f7eba4a47 am 96cfad5d: check for null before calling native webkit from java webview
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp

* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
  check for null before calling native webkit from java webview
2009-09-25 09:14:27 -07:00
Android (Google) Code Review
ea010c1324 Merge change 3583 into donut
* changes:
  implement browser history for tabbed search results... this adds a parameter to the URL hash on all search queries. the main motive is to allow searches from the blog to automatically open the blog tab.
2009-09-25 12:05:28 -04:00
Bryan Mawhinney
d3df3379d7 am 82e62668: Merge change 27038 into eclair
Merge commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8' into eclair-plus-aosp

* commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8':
  Redraw search autocomplete dropdown after config change.
2009-09-25 07:50:12 -07:00