Commit Graph

2965 Commits

Author SHA1 Message Date
Derek Sollenberger
8a46f64803 am bfe76e4f: am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7'

* commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 16:01:33 -07:00
Derek Sollenberger
7e670ea545 am 96d97921: am 67dffd93: Merge change 23485 into eclair
Merge commit '96d979212f3e2548f1fcfad8208f81b895d80087'

* commit '96d979212f3e2548f1fcfad8208f81b895d80087':
  Adding classes to enable plugins to use the java view system.
2009-09-08 16:01:30 -07:00
Daisuke Miyakawa
5851d3bf92 am 71881682: am 7390c5af: Merge change 24097 into eclair
Merge commit '718816821564b61301b0ea93423f7d9d47c2d555'

* commit '718816821564b61301b0ea93423f7d9d47c2d555':
  Fix small bugs in VCardComposer.java.
2009-09-08 16:01:26 -07:00
Dianne Hackborn
3331da069c am da2e19c6: am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b'

* commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 16:01:18 -07:00
Dianne Hackborn
e8151fcbdc am 2a5006c1: am c916c044: Merge change 24099 into eclair
Merge commit '2a5006c195c9635a66158bf6b3212351ea5232dc'

* commit '2a5006c195c9635a66158bf6b3212351ea5232dc':
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-08 16:01:08 -07:00
Bjorn Bringert
41c9e2016c am 63aaa98a: am 96f8613d: Add Gservices constants for GlobalSearch settings
Merge commit '63aaa98a76064703950c5a4c24325b5ff0fa6b25'

* commit '63aaa98a76064703950c5a4c24325b5ff0fa6b25':
  Add Gservices constants for GlobalSearch settings
2009-09-08 16:01:01 -07:00
Owen Lin
16ea2b7a69 am 00453ad2: am d4344ba9: Merge change 23415 into eclair
Merge commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9'

* commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9':
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-08 16:00:57 -07:00
Bob Lee
55991c08b8 am 0dbc9317: am 88e62579: Merge change 24060 into eclair
Merge commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9'

* commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9':
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
2009-09-08 16:00:54 -07:00
Derek Sollenberger
bfe76e4f7b am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a' into eclair-plus-aosp

* commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 13:41:47 -07:00
Derek Sollenberger
96d979212f am 67dffd93: Merge change 23485 into eclair
Merge commit '67dffd93e045e08e446df11e370597a9463f010c' into eclair-plus-aosp

* commit '67dffd93e045e08e446df11e370597a9463f010c':
  Adding classes to enable plugins to use the java view system.
2009-09-08 13:41:43 -07:00
Daisuke Miyakawa
7188168215 am 7390c5af: Merge change 24097 into eclair
Merge commit '7390c5af7a0c2379fa72218ea63a714f843edf0f' into eclair-plus-aosp

* commit '7390c5af7a0c2379fa72218ea63a714f843edf0f':
  Fix small bugs in VCardComposer.java.
2009-09-08 13:41:39 -07:00
Dianne Hackborn
da2e19c6ad am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'eb034652c2037a47ebfd99779e8383bb8bb528af' into eclair-plus-aosp

* commit 'eb034652c2037a47ebfd99779e8383bb8bb528af':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 13:41:26 -07:00
Dianne Hackborn
2a5006c195 am c916c044: Merge change 24099 into eclair
Merge commit 'c916c04495292c86051a2c31e90cca26a9bd99c1' into eclair-plus-aosp

* commit 'c916c04495292c86051a2c31e90cca26a9bd99c1':
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-08 13:41:07 -07:00
Bjorn Bringert
63aaa98a76 am 96f8613d: Add Gservices constants for GlobalSearch settings
Merge commit '96f8613d95122a491a44f755f06845cc2c13e81e' into eclair-plus-aosp

* commit '96f8613d95122a491a44f755f06845cc2c13e81e':
  Add Gservices constants for GlobalSearch settings
2009-09-08 13:41:00 -07:00
Owen Lin
00453ad22a am d4344ba9: Merge change 23415 into eclair
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp

* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-08 13:40:56 -07:00
Bob Lee
0dbc931754 am 88e62579: Merge change 24060 into eclair
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp

* commit '88e625795943dea84b2e7c32f37e71303143b728':
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
2009-09-08 13:40:51 -07:00
Derek Sollenberger
377c5c15f8 Revert "Adding classes to enable plugins to use the java view system."
This reverts commit b127dc29bb.
2009-09-08 09:30:47 -04:00
Android (Google) Code Review
67dffd93e0 Merge change 23485 into eclair
* changes:
  Adding classes to enable plugins to use the java view system.
2009-09-08 05:48:06 -07:00
Android (Google) Code Review
7390c5af7a Merge change 24097 into eclair
* changes:
  Fix small bugs in VCardComposer.java.
2009-09-08 01:23:05 -07:00
Dianne Hackborn
eb034652c2 Implement all of the infrastructure for configuring wallpapers.
Actually being able to configure a wallpaper relies on additional
work in the launcher and wallpapers that will be in another change.
Also note that this breaks all existing wallpapers, since they now
need to include a meta-data item about themselves.  This also
will be fixed in another change.

Change-Id: I97d2c2bd07237abc32f92b9147c32530a2f73c71
2009-09-07 22:48:02 -07:00
Android (Google) Code Review
c916c04495 Merge change 24099 into eclair
* changes:
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-07 10:16:20 -07:00
Bjorn Bringert
96f8613d95 Add Gservices constants for GlobalSearch settings
This is part of the implementation of http://b/issue?id=2097470

Change-Id: Ife3e5edd4c7d31824d75a0f93a6dcd56a39ab524
2009-09-07 16:15:41 +01:00
Daisuke Miyakawa
718eaff0fa Fix small bugs in VCardComposer.java.
- The logic for emitting "FN" is wrong.
- FileWriter's "double close" problem should occur in the current implementation.
- Let VCardParser_V31.java ignore AGENT field instead of throwing an unkind VCardNotSupportedException.
2009-09-07 22:14:08 +09:00
Android (Google) Code Review
d4344ba9ba Merge change 23415 into eclair
* changes:
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-07 03:25:56 -07:00
Dianne Hackborn
0586a1b77a Fix issue #2095422: Some fades from opaque to transparent don't work
ViewRoot was using Surface.clear(), which has different behavior
in different processes -- in the system process it would kill the
surface, causing all windows in that process to immediately disappear
instead of animating away.

This change makes Surface.release() public and uses that instead.  It
also renames Surface.clear() to Surface.destroy().

Also fixed some issues in the window manager that were causing the
wallpaper to not get immediately resized when the orientation changes
and its target window is removed and re-added.

Change-Id: I2a992e365cf5747511f0bf1193db32dc2525b218
2009-09-07 01:01:15 -07:00
Android (Google) Code Review
88e6257959 Merge change 24060 into eclair
* changes:
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler system property is set. Saves snapshots to the SD card.
2009-09-06 16:41:35 -07:00
Bob Lee
e540833fdf Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
system property is set. Saves snapshots to the SD card.
2009-09-05 11:53:18 -07:00
Ye Wen
5690bc3e0f am 21822728: am 0b98c944: Fix code placement and comments for gtalk url scraping settings.
Merge commit '21822728feef9d1fa7dcf63463ec4dfc87b0e7f7'

* commit '21822728feef9d1fa7dcf63463ec4dfc87b0e7f7':
  Fix code placement and comments for gtalk url scraping settings.
2009-09-05 08:38:34 -07:00
Ye Wen
21822728fe am 0b98c944: Fix code placement and comments for gtalk url scraping settings.
Merge commit '0b98c944c6bac98d95c93916cde31f841b44d9aa' into eclair-plus-aosp

* commit '0b98c944c6bac98d95c93916cde31f841b44d9aa':
  Fix code placement and comments for gtalk url scraping settings.
2009-09-05 08:35:51 -07:00
Ye Wen
0b98c944c6 Fix code placement and comments for gtalk url scraping settings. 2009-09-04 23:43:47 -07:00
Ye Wen
ddbcd14ef9 am 1e31ed01: am 98187192: Merge change 24014 into eclair
Merge commit '1e31ed013abeb2d15868a57e64e4ce25746595a9'

* commit '1e31ed013abeb2d15868a57e64e4ce25746595a9':
  Gservices settings for controlling URL scraping in GTalk app.
2009-09-04 22:55:16 -07:00
Ye Wen
1e31ed013a am 98187192: Merge change 24014 into eclair
Merge commit '981871922ded799f51b7b8a3e53028d70f37e65c' into eclair-plus-aosp

* commit '981871922ded799f51b7b8a3e53028d70f37e65c':
  Gservices settings for controlling URL scraping in GTalk app.
2009-09-04 22:52:58 -07:00
Android (Google) Code Review
981871922d Merge change 24014 into eclair
* changes:
  Gservices settings for controlling URL scraping in GTalk app.
2009-09-04 22:50:49 -07:00
Ye Wen
7a0c108d8b Gservices settings for controlling URL scraping in GTalk app. 2009-09-04 22:47:18 -07:00
Dmitri Plotnikov
746ed889b7 am 542051f1: am 9cc1817d: Merge change 24039 into eclair
Merge commit '542051f19f614c06c4637e3a32ca45e6e2a4add4'

* commit '542051f19f614c06c4637e3a32ca45e6e2a4add4':
  Fixing a concurrency problem by changing the contact aggregation exception API.
2009-09-04 18:34:54 -07:00
Dmitri Plotnikov
542051f19f am 9cc1817d: Merge change 24039 into eclair
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp

* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
  Fixing a concurrency problem by changing the contact aggregation exception API.
2009-09-04 18:33:07 -07:00
Android (Google) Code Review
9cc1817d46 Merge change 24039 into eclair
* changes:
  Fixing a concurrency problem by changing the contact aggregation exception API.
2009-09-04 18:30:46 -07:00
Dmitri Plotnikov
84ba06586b Fixing a concurrency problem by changing the contact aggregation exception API.
The current API requires a contact_id and a raw_contact_id
There are at least two issues with this approach I did not recognize initially:

1. Contact_id may be changed asynchronously by aggregation or some other process.
2. A raw contacts may need to be added to an aggregate before the actual aggregation pass
has gotten to it, so the client would need to wait for the aggregation to complete
before it can set an aggregation exception.  That's backwards.
2009-09-04 15:59:05 -07:00
Dianne Hackborn
ed9f8514e1 am bdbe87d0: am 6e4b7d66: Merge change 24020 into eclair
Merge commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442'

* commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442':
  Wallpapers: new transitions, hiding when not visible, other cleanup.
2009-09-04 15:44:38 -07:00
Dianne Hackborn
bdbe87d075 am 6e4b7d66: Merge change 24020 into eclair
Merge commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5' into eclair-plus-aosp

* commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5':
  Wallpapers: new transitions, hiding when not visible, other cleanup.
2009-09-04 15:42:59 -07:00
Android (Google) Code Review
6e4b7d6699 Merge change 24020 into eclair
* changes:
  Wallpapers: new transitions, hiding when not visible, other cleanup.
2009-09-04 15:40:30 -07:00
Costin Manolache
f31d8ed3bc am 75428691: am ff86d9f9: Merge change 24002 into eclair
Merge commit '75428691eab4f331f0e3d29ea3d24fe28e7b13a4'

* commit '75428691eab4f331f0e3d29ea3d24fe28e7b13a4':
  Fix SparseArray accesses
2009-09-04 15:20:30 -07:00
Costin Manolache
75428691ea am ff86d9f9: Merge change 24002 into eclair
Merge commit 'ff86d9f9dc30d2eebe56af27c8cdb0bcd4227bf4' into eclair-plus-aosp

* commit 'ff86d9f9dc30d2eebe56af27c8cdb0bcd4227bf4':
  Fix SparseArray accesses
2009-09-04 15:18:50 -07:00
Android (Google) Code Review
ff86d9f9dc Merge change 24002 into eclair
* changes:
  Fix SparseArray accesses
2009-09-04 15:16:25 -07:00
Leon Scroggins
e74813a82b am 63aca638: am 608f9f47: When zooming, do not draw the WebTextView. Resize it when done.
Merge commit '63aca6389ce803e469624779f9e723eea00e1dfc'

* commit '63aca6389ce803e469624779f9e723eea00e1dfc':
  When zooming, do not draw the WebTextView.  Resize it when done.
2009-09-04 15:12:07 -07:00
Leon Scroggins
63aca6389c am 608f9f47: When zooming, do not draw the WebTextView. Resize it when done.
Merge commit '608f9f470fa562fc6a32449297110d4ec2953515' into eclair-plus-aosp

* commit '608f9f470fa562fc6a32449297110d4ec2953515':
  When zooming, do not draw the WebTextView.  Resize it when done.
2009-09-04 15:09:28 -07:00
Leon Scroggins
608f9f470f When zooming, do not draw the WebTextView. Resize it when done.
Fix for issue http://b/issue?id=2074429

Change-Id: Iae46df57310a360f07c9d6afef24ca3ff9d04bdc
2009-09-04 17:46:33 -04:00
Leon Scroggins
52fd7f2dfc am dce5b2ce: am 3c32474f: Merge change 24008 into eclair
Merge commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924'

* commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924':
  Clean up from earlier changes to place title bar at top of WebView
2009-09-04 14:43:14 -07:00
Leon Scroggins
dce5b2ce09 am 3c32474f: Merge change 24008 into eclair
Merge commit '3c32474f0e0df419135f1966796d277aba9ee7cb' into eclair-plus-aosp

* commit '3c32474f0e0df419135f1966796d277aba9ee7cb':
  Clean up from earlier changes to place title bar at top of WebView
2009-09-04 14:40:42 -07:00
Android (Google) Code Review
3c32474f0e Merge change 24008 into eclair
* changes:
  Clean up from earlier changes to place title bar at top of WebView
2009-09-04 14:38:20 -07:00