47 Commits

Author SHA1 Message Date
Android (Google) Code Review
f4c6ae8339 am 6342d393: Merge change 1575 into donut
Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4'

* commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4':
  Change _TOKENIZE tests to test the new token_index column
2009-05-18 08:36:46 -07:00
Fred Quintana
ce31b2361d enhance ContentProvider with the ability to perform batch operations 2009-05-15 13:55:32 -07:00
Bjorn Bringert
819e3f2148 Change _TOKENIZE tests to test the new token_index column
The SQLite _TOKENIZE function has been changed to use a third
column, token_index. This commit adds tests for the
_TOKENIZE token_index column, and for the source column,
which was previously untested.
2009-05-15 12:03:32 +01:00
Android (Google) Code Review
34f97460bd am f2331a6: Merge change 1063 into donut
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Bjorn Bringert
a92041306e Refactor SearchableInfo.
- Removes the mSearchable field which was only
  for communication between the constructor and
  getActivityMetaData().
- Removes the badge and query rewriting fields,
  since their values can be efficiently computed
  on the fly.
- Makes all the other public fields private and adds getters
  for them.
- Makes all fields final, except mActionKeys.
- Removes the DBG_INHIBIT_SUGGESTIONS_CONSTANT.
  I don't see why we would every want that, and it
  complicated making the fields final.
- Makes all fields in ActionKeyInfo final.
- Makes all fields in ActionKeyInfo private and adds getters.
- Removes the use of ActioKeyInfo.mKeyCode for failure
  signalling. Uses IllegalArgumentException instead.
- Replaces the ad hoc linked list for looking up
  action keys by a HashMap. This is needed to
  make the fields in ActionkeyInfo final, and also avoids O(N)
  lookup in the (unlikely) case that an activity
  has lots of action keys.
- Don't throw exceptions when reading searchable
  meta-data, since that could crash SearchManagerService.
- Adds debug logging.
2009-05-06 13:54:42 +01:00
Tammo Spalink
84c9097d5b am d2b124f: new cdma sms unit tests (from QC on-site test)
Merge commit 'd2b124f97c52c566b68aff9fa58306f461686af0'

* commit 'd2b124f97c52c566b68aff9fa58306f461686af0':
  new cdma sms unit tests (from QC on-site test)
2009-05-06 01:31:33 -07:00
Tammo Spalink
d2b124f97c new cdma sms unit tests (from QC on-site test) 2009-05-06 15:05:45 +08:00
Android (Google) Code Review
26504548bf am ef65477: Merge change 844 into donut
Merge commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6'

* commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6':
  clean up cdma sms creation and parsing
2009-05-01 23:25:27 -07:00
Tammo Spalink
8478b59f17 clean up cdma sms creation and parsing
related to issue http://b/issue?id=1782245

- fixes 7bit ASCII encode and decode (previous completely broken)

- also consolidates encoding of user data, and changed to match
  the conventions of the new data coding -- previously likely
  broken for several cases
2009-05-01 14:11:44 -07:00
Android (Google) Code Review
e4ddb19acb am efae672: Merge change 725 into donut
Merge commit 'efae672d7303fb6682b2ae8704a62146297a0a5a'

* commit 'efae672d7303fb6682b2ae8704a62146297a0a5a':
  Add 'includeInGlobalSearch' attribute to searchable meta-data.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
cb6c7248ba am 05e4755: Merge change 724 into donut
Merge commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91'

* commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91':
  Split testSearchablesMocked into two tests.
2009-04-29 13:41:21 -07:00
Android (Google) Code Review
adf431b54a am 493b00a: Merge change 640 into donut
Merge commit '493b00afbfd4f603939ee98540a4d8df084107fd'

* commit '493b00afbfd4f603939ee98540a4d8df084107fd':
  Add GLOBAL_SEARCH intent for finding global search provider.
2009-04-29 13:35:48 -07:00
Android (Google) Code Review
c36349034a am d306052: Merge change 542 into donut
Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd'

* commit 'd30605200b8b0f10e4740a9d7266d240023e69cd':
  enable additional cdma sms fields and user data encodings
2009-04-29 13:35:37 -07:00
The Android Open Source Project
8f080ec429 am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut 2009-04-29 13:34:51 -07:00
Android (Google) Code Review
5c685a948e am 9c56513: Merge change 165 into donut
Merge commit '9c5651390056cd9c2f68d5df057739528bd4128b'

* commit '9c5651390056cd9c2f68d5df057739528bd4128b':
  Squashed commit of the following:
2009-04-29 13:11:32 -07:00
Bjorn Bringert
6d72e029cb Add 'includeInGlobalSearch' attribute to searchable meta-data.
The attribute is not yet public.
Also adds a SearchManager method for listing all
searchables that can be included in global search.
This is the framework part of http://b/issue?id=1819651
2009-04-29 20:23:04 +01:00
Bjorn Bringert
aece7c6723 Split testSearchablesMocked into two tests. 2009-04-29 14:50:46 +01:00
Android (Google) Code Review
493b00afbf Merge change 640 into donut
* changes:
  Add GLOBAL_SEARCH intent for finding global search provider.
2009-04-29 03:38:01 -07:00
Bjorn Bringert
74708bbdf8 Add GLOBAL_SEARCH intent for finding global search provider. 2009-04-28 12:15:56 +01:00
Tammo Spalink
8c49d32cb9 enable additional cdma sms fields and user data encodings
enable ia5 and octet user data encodings
properly expose parsed user data
support additional bearer data subparameter types
2009-04-28 15:49:59 +08:00
Karl Rosaen
f3ccf8a5a5 Merge branch 'readonly-p4-donut' into donut 2009-04-23 19:01:36 -07:00
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
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
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