Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from ↵ | Fred Quintana | 2009-08-15 | 1 | -4/+4 |
| | | | | master branch | ||||
* | am 3b5f4a84: Merge change 20806 into donut | Brett Chabot | 2009-08-12 | 2 | -10/+3 |
|\ | | | | | | | | | | | | | Merge commit '3b5f4a841e9e87442eeacd7773bd2a6ca8710019' * commit '3b5f4a841e9e87442eeacd7773bd2a6ca8710019': Remove flaky auto complete tests from continuous. | ||||
| * | Remove flaky auto complete tests from continuous. | Brett Chabot | 2009-08-11 | 2 | -10/+3 |
| | | | | | | | | BUG 2036517 | ||||
* | | New ContentProviderOperation to assert values during batch. | Jeff Sharkey | 2009-08-10 | 1 | -21/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | When performing a set of batch operations, some callers need to enforce that a query has specific values. For example, when persisting edited Contact values, we need to assert that the RawContacts.VERSION matches the version we read out through queryEntities(). This change adds a new TYPE_ASSERT that uses withValues() and withSelection(), and checks all values when applying the batch operation, bailing if any values don't match. | ||||
* | | am ff6585cb: Merge change 20144 into donut | Android (Google) Code Review | 2009-08-05 | 2 | -67/+138 |
|\ \ | |/ | | | | | | | | | | | Merge commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1' * commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1': Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make | ||||
| * | Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make | Brett Chabot | 2009-08-05 | 2 | -67/+138 |
| | | | | | | | | | | | | AutoCompletePopup tests more reliable. Bugs 2036517 and 1636810. | ||||
* | | am 1d4b87d4: Merge change 8360 into donut | Android (Google) Code Review | 2009-07-23 | 1 | -2/+4 |
|\ \ | |/ | | | | | | | | | | | Merge commit '1d4b87d492dfefb5506e9fcf358ced680322b754' * commit '1d4b87d492dfefb5506e9fcf358ced680322b754': Remove failing test AutoCompleteTextViewCallbacks.testPopupNoSelection from | ||||
| * | Remove failing test AutoCompleteTextViewCallbacks.testPopupNoSelection from | Brett Chabot | 2009-07-23 | 1 | -2/+4 |
| | | | | | | | | medium continuus suite. | ||||
* | | am 7bf9f930: Merge change 6415 into donut | Android (Google) Code Review | 2009-07-07 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | | | | | Merge commit '7bf9f930d986335cd24dc15e2ee588b851f194d4' * commit '7bf9f930d986335cd24dc15e2ee588b851f194d4': Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag. | ||||
| * | Fixes #1748951. Calling setListSelection() explicitely should cancel the ↵ | Romain Guy | 2009-07-07 | 1 | -0/+2 |
| | | | | | | | | selection hidden flag. | ||||
* | | - create a new generic ISyncAdapter implementation, SyncAdapterNew | Fred Quintana | 2009-06-01 | 1 | -48/+8 |
| | | | | | | | | | | | | - change the applyBatch to take an ArrayList rather than an [] - change Entity to be a final flass that contains ContentValues - remove the ability to update/insert Entities by a ContentProviderOperation | ||||
* | | add ipc support to batching | Fred Quintana | 2009-05-22 | 1 | -0/+508 |
| | | |||||
* | | resolved conflicts w/ 75986cf9bc57ef11ad70f36fb77fbbf5d63af6ec merge.... | svetoslavganov | 2009-05-15 | 3 | -1/+258 |
|\ \ | |/ | |||||
| * | Accessibility feature - framework changes (replacing 698, 699, 700, 701 and ↵ | svetoslavganov | 2009-05-14 | 3 | -1/+258 |
| | | | | | | | | merging with the latest Donut) | ||||
* | | manual merge d90a331 to avoid conflicts | The Android Open Source Project | 2009-05-06 | 1 | -0/+114 |
|\ \ | |/ | | | | | Merge commit 'd90a331' | ||||
| * | Add new setTag(int, Object) API to allow applications to specify several tags. | Romain Guy | 2009-05-06 | 1 | -0/+114 |
| | | |||||
* | | am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut | The Android Open Source Project | 2009-04-29 | 1 | -0/+52 |
|\ \ | |/ | |||||
| * | AI 147564: Merge back from search branch to donut. Notes: | Karl Rosaen | 2009-04-23 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | - 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 | ||||
* | | change the sync framework and users to understand Account | Fred Quintana | 2009-04-23 | 1 | -13/+22 |
|/ | |||||
* | auto import from //branches/cupcake_rel/...@140373 | The Android Open Source Project | 2009-03-18 | 1 | -1/+1 |
| | |||||
* | auto import from //branches/cupcake/...@137197 | The Android Open Source Project | 2009-03-09 | 1 | -0/+2 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 359 | -0/+28744 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 359 | -28744/+0 |
| | |||||
* | auto import from //branches/cupcake/...@132276 | The Android Open Source Project | 2009-02-19 | 4 | -5/+113 |
| | |||||
* | auto import from //branches/cupcake/...@130745 | The Android Open Source Project | 2009-02-10 | 6 | -7/+110 |
| | |||||
* | auto import from //branches/cupcake/...@127436 | The Android Open Source Project | 2009-01-22 | 2 | -0/+11 |
| | |||||
* | auto import from //branches/cupcake/...@127101 | The Android Open Source Project | 2009-01-20 | 1 | -0/+31 |
| | |||||
* | auto import from //branches/cupcake/...@126645 | The Android Open Source Project | 2009-01-15 | 3 | -0/+771 |
| | |||||
* | auto import from //branches/cupcake/...@125939 | The Android Open Source Project | 2009-01-09 | 5 | -15/+363 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 349 | -0/+27372 |