Commit Graph

6212 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
5d328f26df Merge change I919c20bb into eclair-mr2
* changes:
  Code clean up.
2009-11-18 00:19:52 -08:00
Jim Miller
0e3114d929 am 30998a59: Merge change I587dd820 into eclair
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2

* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:58:23 -08:00
Android (Google) Code Review
71741ba165 Merge change I587dd820 into eclair
* changes:
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:53:44 -08:00
Android (Google) Code Review
1e9bed7caf Merge change I0629175f into eclair-mr2
* changes:
  Remove googleclient from the framework, and its classes from the preload list.
2009-11-17 21:54:59 -08:00
Android (Google) Code Review
2dc7be57b8 Merge change I24e47245 into eclair-mr2
* changes:
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox. Optimize DropBoxManagerService.dump() a bit.
2009-11-17 18:02:12 -08:00
Eric Fischer
1777ae191d am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:54:31 -08:00
Android (Google) Code Review
38fc52236a Merge change Id7c432bf into eclair
* changes:
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:51:37 -08:00
Android (Google) Code Review
1b0e0f1572 Merge change I60cfe9ce into eclair-mr2
* changes:
  Add unit tests.
2009-11-17 17:38:07 -08:00
Jason Sams
561dd7806d am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:35:44 -08:00
Jaikumar Ganesh
7c7e00fca6 am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:35:25 -08:00
Android (Google) Code Review
eab3388392 Merge change I715333b8 into eclair
* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:31:58 -08:00
Android (Google) Code Review
c620009ade Merge change I706fe6b0 into eclair
* changes:
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 16:07:58 -08:00
Evan Millar
3efad8d3bd am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:13 -08:00
Android (Google) Code Review
2ea3e7f3d2 Merge change I1b6d202b into eclair
* changes:
  Move photo querying off main thread.
2009-11-17 14:40:40 -08:00
Ray Chen
e56a482107 am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:28:18 -08:00
Android (Google) Code Review
db0438250f Merge change I86db22ef into eclair
* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:23:36 -08:00
Joe Onorato
3a060fa251 am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2

* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 14:10:12 -08:00
Android (Google) Code Review
d1c277e9b1 Merge change Icef599ec into eclair-mr2
* changes:
  null check
2009-11-17 14:09:14 -08:00
Android (Google) Code Review
2643a859b5 Merge change Iea6a38c6 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-17 10:46:41 -08:00
Android (Google) Code Review
8c655076d4 Merge change Ib64ea2dd into eclair-mr2
* changes:
  Improvements to TimedEventQueue.
2009-11-17 10:36:24 -08:00
Android (Google) Code Review
3032981be3 Merge change I11526e6c into eclair-mr2
* changes:
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 01:02:46 -08:00
Jim Miller
edb016d06d am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-mr2

* commit 'f0166e4dd0907e487531960e36f516406d265b73':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:51:24 -08:00
Android (Google) Code Review
650e20125c Merge change I4f01d4a4 into eclair
* changes:
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:48:28 -08:00
Android (Google) Code Review
c35735dabc Merge change Icaf78440 into eclair-mr2
* changes:
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:31:49 -08:00
Mike Lockwood
fd9b321901 am f8c4af65: Merge change I51b84496 into eclair
Merge commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6' into eclair-mr2

* commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:56:49 -08:00
Scott Main
33da39d8b8 am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-mr2

* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
  docs: remove all content from the older sdk download,
2009-11-16 19:56:30 -08:00
Mike Cleron
1e9866e0e8 am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-mr2

* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
  This time for sure: make wallpapers work
2009-11-16 19:56:09 -08:00
Dianne Hackborn
42c4e06770 am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-mr2

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
2009-11-16 19:55:53 -08:00
Adam Bliss
6bf6a4615d am 69e0b664: Merge change I000d3564 into eclair
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-mr2

* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 19:55:31 -08:00
Dianne Hackborn
a09e14e7a8 am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-mr2

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 19:55:13 -08:00
Dianne Hackborn
88cf64042e am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 19:53:15 -08:00
Jack Palevich
a9f88d900e resolved conflicts for merge of dc49acb0 to eclair-mr2 2009-11-17 11:39:54 +08:00
Android (Google) Code Review
0517b16c9a Merge change I51b84496 into eclair
* changes:
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:04:06 -08:00
Scott Main
50f80738b2 am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '00ecac957c4a5d2df132640ff418280d969e7d83' into eclair

* commit '00ecac957c4a5d2df132640ff418280d969e7d83':
  docs: remove all content from the older sdk download,
2009-11-16 18:25:56 -08:00
Android (Google) Code Review
033e4eb913 Merge change If556e259 into eclair-sdk
* changes:
  docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
2009-11-16 18:19:10 -08:00
Android (Google) Code Review
dd74998eab Merge change Ia428b2c2 into eclair
* changes:
  This time for sure: make wallpapers work
2009-11-16 18:02:20 -08:00