Commit Graph

5947 Commits

Author SHA1 Message Date
Android (Google) Code Review
6e86c8ce85 Merge change I903ce7b1 into eclair-mr2
* changes:
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:14:37 -08:00
Joe Onorato
779eec250c am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2

* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:20:18 -08:00
Android (Google) Code Review
716534ba06 Merge change I4f614c9e into eclair
* changes:
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 20:17:06 -08:00
Mathias Agopian
8386ce0d5b am 13feccf5: Merge change I39f0003e into eclair
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:07:36 -08:00
Android (Google) Code Review
1a1ce3a6a2 Merge change I39f0003e into eclair
* changes:
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:03:53 -08:00
Android (Google) Code Review
cfab3008e1 Merge change I27b1bb90 into eclair-mr2
* changes:
  Refactor vCard test code and modify unit tests.
2009-11-19 18:50:48 -08:00
Dianne Hackborn
57972134c5 am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:06:06 -08:00
Android (Google) Code Review
5855937862 Merge change I7d40ad9a into eclair
* changes:
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:01:30 -08:00
Mathias Agopian
a750fc0bf8 fix [2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
2009-11-19 17:32:05 -08:00
Mathias Agopian
4c20530387 am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
2009-11-19 16:29:30 -08:00
Mike Chan
e9389bad71 am 23b3ef82: Merge change I99194df1 into eclair
Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2

* commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:23:56 -08:00
Android (Google) Code Review
66112b114d Merge change I137dac6f into eclair
* changes:
  backout a workaround that is not needed anymore
2009-11-19 16:23:29 -08:00
Android (Google) Code Review
3250af908d Merge change I99194df1 into eclair
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:18:51 -08:00
Mathias Agopian
60f5d3694b backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
2009-11-19 15:52:28 -08:00
Mathias Agopian
b5e90e218b am 74a331b5: Merge change I4c29c948 into eclair
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2

* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:47:37 -08:00
Android (Google) Code Review
48d2c6051e Merge change I4c29c948 into eclair
* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:44:13 -08:00
Andreas Huber
8501b1dca3 am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:01:14 -08:00
Jason Sams
d16a2223ad am ddac83a5: Fix extended logging for object dumping.
Merge commit 'ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2

* commit 'ddac83a516e939b55f20b226365596760159c9df':
  Fix extended logging for object dumping.
2009-11-19 14:56:39 -08:00
Android (Google) Code Review
ae5f30aed3 Merge change I8134d6ed into eclair
* changes:
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 14:52:57 -08:00
Mathias Agopian
713795a2e0 fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
2009-11-19 14:46:26 -08:00
Android (Google) Code Review
35cc19ba12 Merge change I639b0f03 into eclair-mr2
* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
2009-11-19 14:13:31 -08:00
Android (Google) Code Review
7bcd6eaac3 Merge change I86773fbb into eclair-mr2
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
2009-11-19 13:47:24 -08:00
Fred Quintana
d00412c23d am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 11:41:48 -08:00
Dianne Hackborn
fe2c1b3efe am e4260f4e: Fix build.
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
2009-11-19 11:40:48 -08:00
Android (Google) Code Review
9232f6a971 Merge change I194f0808 into eclair-mr2
* changes:
  Add Gservices flag so that Market can turn on performance logging for specific groups.
2009-11-19 11:36:42 -08:00
Dianne Hackborn
bf1129e1b0 am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
2009-11-19 11:09:11 -08:00
Android (Google) Code Review
0ec44fdc33 Merge change I09e159ce into eclair-mr2
* changes:
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
2009-11-19 09:08:22 -08:00
Android (Google) Code Review
2b930b9351 Merge change Ifd754059 into eclair-mr2
* changes:
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
2009-11-18 18:23:21 -08:00
Android (Google) Code Review
bccac13afa Merge change I3a62e1c2 into eclair-mr2
* changes:
  Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
2009-11-18 17:23:19 -08:00
Scott Main
522c0407bd am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-mr2

* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
  docs: misc edits to samples page and intro docs
2009-11-18 17:18:16 -08:00
Scott Main
574917c87f am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65' into eclair

* commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65':
  docs: misc edits to samples page and intro docs
2009-11-18 17:12:35 -08:00
Jean-Michel Trivi
327561b2fb am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:30 -08:00
Android (Google) Code Review
8355ab6a49 Merge change I941136fd into eclair
* changes:
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
2009-11-18 17:00:16 -08:00
Mike Lockwood
2559c05abe am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:37 -08:00
Android (Google) Code Review
0e6eff4a20 Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Android (Google) Code Review
4bddbfa258 Merge change I8daabf26 into eclair-mr2
* changes:
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 16:11:35 -08:00
Dianne Hackborn
a6d7a9f498 am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-mr2

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:12:59 -08:00
Android (Google) Code Review
ba11cf6259 Merge change I5ad37324 into eclair
* changes:
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:09:18 -08:00
Dan Egnor
a2d89234c1 Solve the mutual interdependency problem between common and framework:
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).

Goes with a companion change to build/core/pathmap.mk.
2009-11-18 15:08:18 -08:00
Android (Google) Code Review
6c8d6bcdc5 Merge change Ic9e65818 into eclair-mr2
* changes:
  Attempt to fix the build server build: make the common library not depend on the framework library (for now, at least).
2009-11-18 14:15:58 -08:00
Dan Egnor
b31ecb20de Attempt to fix the build server build: make the common library
not depend on the framework library (for now, at least).
2009-11-18 14:14:10 -08:00
Android (Google) Code Review
cd109bd60d Merge change Iaae72f66 into eclair-sdk
* changes:
  docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
2009-11-18 14:08:08 -08:00
Jim Miller
41ce2db7bb am 30142f7e: Merge change I9f239766 into eclair
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2

* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
2009-11-18 13:32:01 -08:00
Android (Google) Code Review
76ca0aea4d Merge change I9f239766 into eclair
* changes:
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
2009-11-18 13:26:30 -08:00
Amith Yamasani
df5df70f64 am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2

* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 13:10:53 -08:00
Android (Google) Code Review
93c0b5cb9b Merge change Icb1674f1 into eclair-mr2
* changes:
  Create android-common static library which gets included in frameworks.jar, but can also be used by unbundled apps.  Move android.text.util.Regex there as a starting example, renamed to a more sensible (?) com.android.common.Patterns. Set up a corresponding test package, and move RegexTest (to PatternsTest). Update clients.
2009-11-18 12:40:44 -08:00
Android (Google) Code Review
a42402d05e Merge change Icfc893d2 into eclair
* changes:
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 12:38:30 -08:00
Dan Egnor
a6f4698289 Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps.  Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
2009-11-18 12:05:04 -08:00
Dianne Hackborn
1002725528 am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2

* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:51:05 -08:00
Android (Google) Code Review
526b33cda2 Merge change Ibb994bd2 into eclair-mr2
* changes:
  rename nativeFindIsDown to nativeFindIsUp; check for null webkit
2009-11-18 04:36:27 -08:00