Commit Graph

2831 Commits

Author SHA1 Message Date
Grace Kloba
29f2ca8096 am a297a266: am feb2b311: Merge change 22988 into eclair
Merge commit 'a297a266bdea9f64c6a548661aa4be540c69c676'

* commit 'a297a266bdea9f64c6a548661aa4be540c69c676':
  Only add model in the UA for the release build
2009-08-28 09:16:51 -07:00
Android (Google) Code Review
feb2b311c6 Merge change 22988 into eclair
* changes:
  Only add model in the UA for the release build
2009-08-28 09:12:28 -07:00
Mike LeBeau
b4758199dd am 8c0fa1a2: am e9df3cf7: resolved conflicts for merge of 1e348378 to eclair
Merge commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef'

* commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef':
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-28 00:02:41 -07:00
Mike LeBeau
e9df3cf79c resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -07:00
Dianne Hackborn
0754e1fb34 am 554f6cb1: am 49237345: Add platform infrastructure for features.
Merge commit '554f6cb1c7433449257d07d57e3d36cacb48fc70'

* commit '554f6cb1c7433449257d07d57e3d36cacb48fc70':
  Add platform infrastructure for features.
2009-08-27 22:16:13 -07:00
Fred Quintana
54313453d5 am 820232af: am 5511c669: Merge change 23067 into eclair
Merge commit '820232af1b70bc20a24afedc7533a1068d733e64'

* commit '820232af1b70bc20a24afedc7533a1068d733e64':
  allow delaying after yielding
2009-08-27 21:52:34 -07:00
Dianne Hackborn
49237345d8 Add platform infrastructure for features.
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.

Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).

Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
2009-08-27 21:51:00 -07:00
Fred Quintana
5c7aede8d6 allow delaying after yielding 2009-08-27 21:43:35 -07:00
Fred Quintana
3f64f7faa4 am 7ff4ef6a: am c298a851: add an accessor for Context for use by subclasses
Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909'

* commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909':
  add an accessor for Context for use by subclasses
2009-08-27 20:08:16 -07:00
Fred Quintana
c298a8518a add an accessor for Context for use by subclasses 2009-08-27 20:02:10 -07:00
Android (Google) Code Review
1e3483780c Merge change 23043 into donut
* changes:
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 18:32:27 -07:00
Karl Rosaen
590f63433c Revert "Remove third party support for Quick Search Box (aka global search)."
This reverts commit a647b7f29d65a7792cede74284e714b591337992.
2009-08-27 17:42:48 -07:00
Fred Quintana
4cf7ef6387 am 3aad3ae2: am a640c49e: Merge change 22984 into eclair
Merge commit '3aad3ae2f9460a17ae4a7a8099f4746e79a9502c'

* commit '3aad3ae2f9460a17ae4a7a8099f4746e79a9502c':
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:21:54 -07:00
Android (Google) Code Review
a640c49eda Merge change 22984 into eclair
* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:18:14 -07:00
Grace Kloba
ce761d3219 Only add model in the UA for the release build 2009-08-27 15:24:59 -07:00
Fred Quintana
b19b4c711f fix AbstractThreadedSyncAdapter to actually cancel syncs 2009-08-27 14:43:01 -07:00
Mike Lockwood
e684e98466 am fb8910f9: am 6391830d: Merge change 22958 into eclair
Merge commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'

* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:34:58 -07:00
Android (Google) Code Review
6391830d10 Merge change 22958 into eclair
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:31:06 -07:00
Danke Xie
1a27bfa8d8 am 18070866: am 22d1f9fb: gps: Network initiated SUPL
Merge commit '18070866622146c053a0abc5d51d116e61986b25'

* commit '18070866622146c053a0abc5d51d116e61986b25':
  gps: Network initiated SUPL
2009-08-27 14:22:24 -07:00
Danke Xie
22d1f9fb23 gps: Network initiated SUPL
Initial contribution from Qualcomm.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 14:18:30 -07:00
Mike Lockwood
ddfe879b78 Don't activate keyguard if screen is turned off while proximity sensor is active.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 13:27:08 -07:00
Dianne Hackborn
7bb023b4ce am c56a4111: am 1e0f7627: Merge change 22673 into eclair
Merge commit 'c56a411120772f17ed4fbc2f3636114cd3c48e4c'

* commit 'c56a411120772f17ed4fbc2f3636114cd3c48e4c':
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:14:37 -07:00
Dianne Hackborn
aa52f9a7c6 Make SINGLE_TOP work with CLEAR_TOP.
Change-Id: Ie98b491dc4b1a2ae5e8fc8452c6410597bc9676b
2009-08-27 13:10:09 -07:00
Dianne Hackborn
fa89b09cec am 3d937945: am b3b1ccfe: Merge change 22950 into eclair
Merge commit '3d937945a60da48a383a5a3de37583b35abf9c11'

* commit '3d937945a60da48a383a5a3de37583b35abf9c11':
  Change these string constants back to match donut.
2009-08-27 13:01:05 -07:00
Android (Google) Code Review
b3b1ccfe0e Merge change 22950 into eclair
* changes:
  Change these string constants back to match donut.
2009-08-27 12:56:40 -07:00
Dianne Hackborn
fe240ecf85 Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.

Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
2009-08-27 12:51:11 -07:00
Suchi Amalapurapu
cac1f0dff1 am c067ef5f: am 580a2921: Merge change 22945 into eclair
Merge commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c'

* commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c':
  Add a null check in PackageParser
2009-08-27 12:42:18 -07:00
Android (Google) Code Review
580a292108 Merge change 22945 into eclair
* changes:
  Add a null check in PackageParser
2009-08-27 12:37:47 -07:00
Dianne Hackborn
f2dc33b47e am eba188e2: am aa0a3b09: Merge change 22944 into eclair
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'

* commit 'eba188e21c752d98f03215eb15822bd39c462664':
  Various tweaks to try to improve low memory behavior.
2009-08-27 12:30:50 -07:00
Suchi Amalapurapu
c748541ca0 Add a null check in PackageParser 2009-08-27 12:28:09 -07:00
Android (Google) Code Review
aa0a3b09e7 Merge change 22944 into eclair
* changes:
  resolved conflicts for merge of 301b97ac to eclair
2009-08-27 12:27:51 -07:00
Dianne Hackborn
6ccd2aff3e resolved conflicts for merge of 301b97ac to eclair
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
2009-08-27 12:26:44 -07:00
Dmitri Plotnikov
413ae88b69 am e19e5261: am 763ea918: Merge change 22919 into eclair
Merge commit 'e19e5261159ac84517caf40f61f4e870f9965f6c'

* commit 'e19e5261159ac84517caf40f61f4e870f9965f6c':
  Removing "summary"-style URIs.
2009-08-27 11:41:45 -07:00
Android (Google) Code Review
763ea918fc Merge change 22919 into eclair
* changes:
  Removing "summary"-style URIs.
2009-08-27 11:36:36 -07:00
Ye Wen
900e50e43b am 0b05e730: am 4d5b4225: Merge change 22795 into eclair
Merge commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c'

* commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c':
  The Gservices settings for pruning messages/chats.
2009-08-27 11:02:59 -07:00
Android (Google) Code Review
4d5b4225e4 Merge change 22795 into eclair
* changes:
  The Gservices settings for pruning messages/chats.
2009-08-27 10:58:25 -07:00
Romain Guy
4bec2cfa25 am db978b1f: am ed48c808: Merge change 22920 into eclair
Merge commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f'

* commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f':
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:48:13 -07:00
Android (Google) Code Review
ed48c8081c Merge change 22920 into eclair
* changes:
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:43:18 -07:00
Romain Guy
e55e1a7885 Change fade to use a gradient from opaque color to transparent color.
Previously the fade was using a gradient from opaque color to transparent black.
2009-08-27 10:42:26 -07:00
Dmitri Plotnikov
b87d0e0e57 Removing "summary"-style URIs.
We will determine whether to include Presence by looking at the requested projection.
2009-08-27 10:38:14 -07:00
Ye Wen
48f886e661 The Gservices settings for pruning messages/chats. 2009-08-27 10:34:22 -07:00
Steve Block
dead6a4959 am 07a0ba4d: am 09b0ca1c: Sets default value of \'enableGeolocation\' to true. This allows WebKit\'s DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser\'s default anyway.
Merge commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab'

* commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab':
  Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
2009-08-27 08:52:47 -07:00
Steve Block
09b0ca1cee Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway. 2009-08-27 16:17:20 +01:00
Steve Block
d047734638 am 6a538f3f: am 7537e3dc: Merge change 22453 into eclair
Merge commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b'

* commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b':
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:47:59 -07:00
Android (Google) Code Review
7537e3dc91 Merge change 22453 into eclair
* changes:
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:43:36 -07:00
Fred Quintana
cfcb8d6fcc am 561aaedc: am 3cff76aa: make sure that the sync thread is protected by a consistent lock
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1'

* commit '561aaedc0220db09d660c29d8237eb937373a7c1':
  make sure that the sync thread is protected by a consistent lock
2009-08-27 02:10:50 -07:00
Fred Quintana
3cff76aaa8 make sure that the sync thread is protected by a consistent lock 2009-08-27 01:46:08 -07:00
Dianne Hackborn
fd12af4e76 Various tweaks to try to improve low memory behavior.
- Reduce the amount that we ask processes to GC after a significant
  operation occurs, but introducing a minimum time between GCs and
  using this in various ways to schedule them.

- Don't spam all of the processes with onLowMemory().  Now deliver
  these using the same gc facility, so we do the processes one at a
  time, and don't allow the same process to get this call more than
  once a minute.

- Increase the time a service must run before we will reset its
  restart delay to 30 minutes (from 10).

- Increase the restart delay multiplication factor from 2 to 4.

- Ensure that we don't restart more than one service every 10 seconds
  (unless some external event causes a service's process to be started
  for some other reason of course).

- Increase the amount of time that a service must run before we
  decide to lower it to a background process.

And some other things:

- Catch IllegalArgumentException in ViewRoot like we do for no
  resources to avoid the system process crashing.

- Fix a number of places where we were missing breaks between the
  activity manager's message dispatch func(!!).

- Fix reason printed for processes in the background.

- Print the list of processing waiting to GC.
2009-08-27 01:03:24 -07:00
Amith Yamasani
16c7d92950 am c66f5ebf: am ed5fede3: Merge change 22667 into eclair
Merge commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb'

* commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb':
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 18:03:59 -07:00
Android (Google) Code Review
ed5fede3f8 Merge change 22667 into eclair
* changes:
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 17:59:26 -07:00