Jeff Sharkey
2d5b9e861e
am 11f6d90a: am cfff8f22: Merge change 23244 into eclair
...
Merge commit '11f6d90a4ece4fe9994819b8646e10168d3ff2c0'
* commit '11f6d90a4ece4fe9994819b8646e10168d3ff2c0':
Add mobile Email type.
2009-08-29 15:59:04 -07:00
Jeff Sharkey
14fb153866
Add mobile Email type.
2009-08-29 15:54:26 -07:00
Jaikumar Ganesh
efa33676ca
Fix property being cleared when DeviceFound signal is received.
2009-08-28 17:49:11 -07:00
Fred Quintana
598ec41b37
am 9b52ad61: am 56f67d21: add the ability to specify yieldpoints in a ContentProviderOperation
...
Merge commit '9b52ad61642c84f74c89627eeb28d03ebb44386c'
* commit '9b52ad61642c84f74c89627eeb28d03ebb44386c':
add the ability to specify yieldpoints in a ContentProviderOperation
2009-08-28 17:06:18 -07:00
Fred Quintana
56f67d2145
add the ability to specify yieldpoints in a ContentProviderOperation
2009-08-28 17:01:16 -07:00
Mike LeBeau
efe2689081
am 779bdc38: am cc927375: am af0b780a: Merge change 23198 into donut
...
Merge commit '779bdc3850f656e34a5783f3db02ab40361a22b9'
* commit '779bdc3850f656e34a5783f3db02ab40361a22b9':
Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:20:57 -07:00
Mike LeBeau
cc927375ce
am af0b780a: Merge change 23198 into donut
...
Merge commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff' into eclair
* commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff':
Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:15:58 -07:00
Mike LeBeau
05b775e0b7
Update SearchManager documentation to reflect latest behavior.
2009-08-28 15:52:56 -07:00
Charles Chen
db7fcd49ac
am 932cb550: am e8e4c7e4: Merge change 23127 into eclair
...
Merge commit '932cb5507ec2e4249bafb9fa792e37dfa7629412'
* commit '932cb5507ec2e4249bafb9fa792e37dfa7629412':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
2009-08-28 13:38:57 -07:00
Android (Google) Code Review
e8e4c7e4fa
Merge change 23127 into eclair
...
* changes:
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
2009-08-28 13:34:38 -07:00
Charles Chen
85f6fb713f
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
...
exception if multiple accessibility services are running and there are
several events all happening within a short period of time.
2009-08-28 11:32:23 -07:00
Cary Clark
aca20da4a9
am a3811e1b: am 6d45accc: don\'t layout when setting size from zoom if only height changed
...
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c'
* commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c':
don't layout when setting size from zoom if only height changed
2009-08-28 09:52:31 -07:00
Cary Clark
6d45accc71
don't layout when setting size from zoom if only height changed
...
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
2009-08-28 12:46:10 -04:00
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
fae7ff106b
- don't schedule syncs that we will never dispatch
...
- expedite the INITIALIZATION sync
2009-08-27 21:32:08 -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