Karl Rosaen
875d50a4b9
AI 147564: Merge back from search branch to donut. Notes:
...
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
- all new public apis are @hidden; they will still get reviewed by api council once we're in git
- other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
to the contacts provider that was reviewed by jham
Automated import of CL 147564
2009-04-23 19:00:21 -07:00
Jean-Baptiste Queru
74008f608a
Merge donut into master
2009-04-22 17:12:34 -07:00
Robert Greenwalt
96e20409af
Squashed commit of the following:
...
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com >
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com >
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
2009-04-22 14:35:11 -07:00
Fred Quintana
3326920329
adding concept of features to accounts
2009-04-20 16:06:02 -07:00
Tammo Spalink
e564b19ed2
replaced integer * and % with shift operations, for performance
2009-04-16 14:48:19 +08:00
Brett Chabot
23d1b4b21c
AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest
...
Original author: brettchabot
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146177
2009-04-14 12:38:22 -07:00
Tammo Spalink
83917db040
Initial code for cdma sms encode and decode, in java, with simple tests.
...
(direct cherry-pick of master 42/42/8)
2009-04-14 10:01:23 +08:00
Brett Chabot
5f75015fef
AI 145969: am: CL 145735 Suppress the flaky DatabaseLockTest
...
Original author: brettchabot
Merged from: //branches/cupcake/...
Automated import of CL 145969
2009-04-13 16:01:56 -07:00
Brett Chabot
732bde73f9
AI 145735: Suppress the flaky DatabaseLockTest
...
BUG=1777453
Automated import of CL 145735
2009-04-10 14:13:32 -07:00
Wink Saville
04e71b3db8
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
...
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Wink Saville
767a662ecd
AI 144185: Integrate cdma into the main code base.
...
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Daisuke Miyakawa
c9a8e0ba6c
Automated import from //branches/master/...@142673,142673
2009-03-25 15:23:27 -07:00
Daisuke Miyakawa
52fc2180fa
Automated import from //branches/donutburger/...@142509,142509
2009-03-24 22:52:27 -07:00
Fred Quintana
603073430b
Automated import from //branches/master/...@142414,142414
2009-03-24 22:48:12 -07:00
Daisuke Miyakawa
c76f908ea8
Automated import from //branches/cupcake/...@142508,142508
2009-03-24 22:31:34 -07:00
The Android Open Source Project
105925376f
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
The Android Open Source Project
c39a6e0c51
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:56 -07:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e
auto import from //branches/cupcake/...@132569
2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
The Android Open Source Project
da996f390e
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
The Android Open Source Project
f1e484acb5
auto import from //branches/cupcake/...@127436
2009-01-22 00:13:42 -08:00
The Android Open Source Project
b798689749
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:23 -08:00
The Android Open Source Project
f013e1afd1
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00