Commit Graph

12088 Commits

Author SHA1 Message Date
Dianne Hackborn
e4459d5d11 Clean up loader demo.
Change-Id: Ie7ade888389523360e930f051a2143159a7a4f06
2010-12-21 10:13:13 -08:00
The Android Automerger
2ac74d8c9e merge in gingerbread-release history after reset to gingerbread 2010-12-21 08:31:37 -08:00
The Android Automerger
d1d8b38db1 merge in honeycomb-release history after reset to master 2010-12-21 08:14:52 -08:00
Jeff Brown
7947d1aff8 Merge "Add support for multitouch pinch-zoom gesture to monkey." 2010-12-20 19:19:01 -08:00
The Android Automerger
8a6241bf47 Merge branch 'master' into honeycomb-release
* master:
  Give the app widget a background.
  Add sample for tab ordering.
  Preparing source.android.com for GB source drop. This includes a dead link to the 2.3 CDD, and that needs to be filled in before launch, but the CDD isn't done yet. The link will be filled in before this is pushed to live, when the CDD is done. I want to get this submitted now so we can test & stage it.
2010-12-20 07:38:47 -08:00
Jeff Brown
aaa542be4a Merge "Add sample for tab ordering." 2010-12-17 17:42:17 -08:00
Dan Morrill
0e5b2d1916 Merge "Preparing source.android.com for GB source drop. This includes a dead link to the 2.3 CDD, and that needs to be filled in before launch, but the CDD isn't done yet. The link will be filled in before this is pushed to live, when the CDD is done. I want to get this submitted now so we can test & stage it." 2010-12-17 14:34:43 -08:00
The Android Automerger
52d98e37f8 Merge branch 'master' into honeycomb-release
* master:
  Update fragment cursor loader sample to new New and Shiny.
  Prepare for some changes to LoaderManager/Loader.
2010-12-17 13:44:50 -08:00
Dianne Hackborn
82362ab449 Give the app widget a background.
So you can see it!

Change-Id: I6ec8a8240a231379ef1f736ed700d780c04d12f6
2010-12-17 11:18:31 -08:00
Dianne Hackborn
d08e015b7e Update fragment cursor loader sample to new New and Shiny.
Change-Id: Id7afc9adba3d29f8d3279737443cde1aee58a3bb
2010-12-16 23:00:15 -08:00
The Android Automerger
91c75a35f7 Merge branch 'master' into honeycomb-release
* master:
  cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs
  Add missing declarations to <netinet/in.h>
  ndk: Update headers and libraries for API level 9
2010-12-16 07:39:00 -08:00
Dianne Hackborn
ec04e5da4b Prepare for some changes to LoaderManager/Loader.
Sorry it is a bit ugly, it is to allow this change to be
checked in prior to the first stage of the framework change
without breaking the build.

Change-Id: Ia59181602679608e765664ecff1fbb52306d9559
2010-12-16 01:07:16 -08:00
Jeff Brown
587b6c441f Add sample for tab ordering.
Change-Id: Id704aac3796abed561c0df533e00600c76b3c31e
2010-12-15 19:38:18 -08:00
Dan Morrill
a20bb011c2 Preparing source.android.com for GB source drop. This includes a dead link to
the 2.3 CDD, and that needs to be filled in before launch, but the CDD isn't
done yet. The link will be filled in before this is pushed to live, when the
CDD is done. I want to get this submitted now so we can test & stage it.

Change-Id: I80e36a5b37627583ce09c02be4ae6762005782a3
2010-12-15 17:36:44 -08:00
Scott Main
34ce501365 am 1549d27e: am 9efea49e: cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs
* commit '1549d27e177fdcbb4c2816b993d2ed085cb4c3dc':
  cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs
2010-12-15 12:01:48 -08:00
Scott Main
1549d27e17 am 9efea49e: cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs
* commit '9efea49e40f3e3784cfa1c9fd67a6ca9ff5270e7':
  cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs
2010-12-15 11:55:53 -08:00
Scott Main
9efea49e40 cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d
docs: fix broken links in sample docs

Change-Id: Icbc2c16b9f4caee25ab2265ea5425c57f0989ab1
2010-12-15 11:45:24 -08:00
The Android Automerger
5e397375fa Merge branch 'master' into honeycomb-release 2010-12-15 07:31:23 -08:00
David 'Digit' Turner
23deba9d5b am 66e56acc: am 9ddaf219: Add missing declarations to <netinet/in.h>
* commit '66e56acc5add0e9873e11c4ab863a52e0099f642':
  Add missing declarations to <netinet/in.h>
2010-12-15 07:25:48 -08:00
David 'Digit' Turner
a2aaf8a8ac am 71856373: am 90887627: ndk: Update headers and libraries for API level 9
* commit '71856373f74c195515d8b84d1daab63efa5339e9':
  ndk: Update headers and libraries for API level 9
2010-12-15 07:25:43 -08:00
David 'Digit' Turner
66e56acc5a am 9ddaf219: Add missing declarations to <netinet/in.h>
* commit '9ddaf219fa051a1b2c1a3b713ea37a91204b378e':
  Add missing declarations to <netinet/in.h>
2010-12-15 01:31:02 -08:00
David 'Digit' Turner
71856373f7 am 90887627: ndk: Update headers and libraries for API level 9
* commit '90887627f185ea795fd8620bb916bd14a9f51041':
  ndk: Update headers and libraries for API level 9
2010-12-15 01:30:54 -08:00
Dianne Hackborn
05d297331a Quickly hack out setForeground call that is going away.
I'll come back in a bit and make this API demo work again.

Change-Id: I287dd64925e48bc934c44fb6d0b779a58a270503
2010-12-14 21:56:15 -08:00
Jeff Brown
585ab96950 Add support for multitouch pinch-zoom gesture to monkey.
Change-Id: Ib28f2ede95dbe01eae4d9c72906b6fdfeda44ce4
2010-12-14 13:42:22 -08:00
The Android Automerger
6addf58413 Merge branch 'master' into honeycomb-release 2010-12-14 07:29:34 -08:00
David 'Digit' Turner
9ddaf219fa Add missing declarations to <netinet/in.h>
These are required to properly build the Boost libraries with the
Android NDK.

Change-Id: Ice272f24b359ffce19838f5500641c4fcda8e57f
2010-12-14 14:42:52 +01:00
Ken Wakasa
892dcfe10b Merge "Move tools/makedict from platform/development to platform/packages/inputmethods/LatinIME" 2010-12-13 17:57:47 -08:00
Dianne Hackborn
11371e6d36 Update to use help APIs.
Change-Id: I11bab7b66376b34303e8e84460236a1ff7a475b2
2010-12-13 12:46:19 -08:00
The Android Automerger
2778e43839 Merge branch 'master' into honeycomb-release 2010-12-10 12:02:06 -08:00
Alexander Lucas
db7ebae50f For SipDemo sample code: Changed chosen image for "selected" state of
talk button

Change-Id: I723c5e1e468dcbbda8e268afe7d3dd619d4242f6
2010-12-10 11:34:27 -08:00
Ken Wakasa
b68c6b1cbe Move tools/makedict from platform/development to platform/packages/inputmethods/LatinIME
The corresponding change is I01ef7084

Change-Id: I559207ab75feffe5ef4678c4a85f178a024448c5
2010-12-11 02:07:56 +09:00
David 'Digit' Turner
90887627f1 ndk: Update headers and libraries for API level 9
Change-Id: I39eded0065145803b51b22cdc18abef43abe426c
2010-12-10 17:16:24 +01:00
Yu Shan Emily Lau
af2fc1a4e2 Adjusted the motionEvent time to the acutal time when then event is send out to the queue.
Change-Id: I722508829c79028a7345a4dea0517fc1117b8fa5
2010-12-09 18:36:39 -08:00
Dima Zavin
7fcb1ad8e9 Merge "monkey: trap SIGHUP in shell before launching" 2010-12-09 15:14:37 -08:00
Fred Quintana
6c6ddf1490 Merge "support the changes to the SyncAdapter definition that allow specifying allowParallelSyncs and isAlwaysSyncable" 2010-12-09 14:26:15 -08:00
Dima Zavin
9f8e7b45b2 monkey: trap SIGHUP in shell before launching
Change-Id: Ia79361858baa72970ba15d2d1ce0290d0bd38967
Signed-off-by: Dima Zavin <dima@android.com>
2010-12-09 14:22:21 -08:00
Fred Quintana
b751cd535f support the changes to the SyncAdapter definition that allow
specifying allowParallelSyncs and isAlwaysSyncable

Change-Id: Ifdeddbdd6d5a6e2edb5c340d5ebd3f75ce7d9e18
2010-12-09 13:14:48 -08:00
The Android Automerger
be6ec38e1d Merge branch 'master' into honeycomb-release 2010-12-09 07:21:46 -08:00
Raphael Moll
d905e780b8 am 70bc9a62: am 43a1de66: am 8b70d301: Merge "USB Driver INF file for rev 4."
* commit '70bc9a627b861082de891a3703c2695a78e62fa1':
  USB Driver INF file for rev 4.
2010-12-08 15:27:28 -08:00
Raphael Moll
70bc9a627b am 43a1de66: am 8b70d301: Merge "USB Driver INF file for rev 4."
* commit '43a1de66a529964f2b7901e3506417b97595ee06':
  USB Driver INF file for rev 4.
2010-12-08 15:24:19 -08:00
Raphael Moll
43a1de66a5 am 8b70d301: Merge "USB Driver INF file for rev 4."
* commit '8b70d30188f0dc42040643c13135f60c3294eae4':
  USB Driver INF file for rev 4.
2010-12-08 15:21:01 -08:00
Raphael Moll
8b70d30188 Merge "USB Driver INF file for rev 4." 2010-12-08 15:12:10 -08:00
The Android Automerger
1d6982b68a Merge branch 'master' into honeycomb-release 2010-12-08 07:21:41 -08:00
Xavier Ducrohet
037d38264b am ac57394f: am 088edcda: am a2ba6854: Merge "Specific instructions about using these Eclipse settings."
* commit 'ac57394fc48de7c6e97ac8683a3897665aebbae1':
  Specific instructions about using these Eclipse settings.
2010-12-07 23:00:30 -08:00
Xavier Ducrohet
ac57394fc4 am 088edcda: am a2ba6854: Merge "Specific instructions about using these Eclipse settings."
* commit '088edcdadeb52bc56d9ca1a14c263139885e5e39':
  Specific instructions about using these Eclipse settings.
2010-12-07 15:32:14 -08:00
Xavier Ducrohet
088edcdade am a2ba6854: Merge "Specific instructions about using these Eclipse settings."
* commit 'a2ba68544f715bb9043703e33de29ead328fe0f7':
  Specific instructions about using these Eclipse settings.
2010-12-07 15:29:52 -08:00
Xavier Ducrohet
a2ba68544f Merge "Specific instructions about using these Eclipse settings." 2010-12-07 15:16:52 -08:00
Scott Main
c717a3f6d8 Merge "This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e Which includes the following: - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources." 2010-12-07 14:14:20 -08:00
The Android Automerger
733010af2d Merge branch 'master' into honeycomb-release 2010-12-07 07:20:43 -08:00
Tim Baverstock
179141a278 Specific instructions about using these Eclipse settings.
Change-Id: I0ca386f58988b3e8f3c518438da79af0ffdf0776
2010-12-07 15:04:45 +00:00