summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of a06ad953 to masterChung-yih Wang2010-08-061-0/+5
|\ | | | | | | Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
| * Add SIP service into system server.Chung-yih Wang2010-08-061-0/+5
| | | | | | | | Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
| * Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-24/+5
| | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit f77cf7f0 git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113 git cherry-pick --no-commit 570bb561 git cherry-pick --no-commit e2417541 git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30 git cherry-pick --no-commit 5e8a587d Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
* | First pass at a new clipboard API.Dianne Hackborn2010-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClipboardManager was in android.text(!!) so it needed to be moved up to android.content to have access to the richer data types we now need. ClippedData is the data representation. Still needs a lot of fleshing out to allow holding more than one data type at a time and perhaps conversions between them. (MIME-oriented interrogation and conversion will be done through ContentProvider, which needs to grow an ability to report multiple MIME types and accept a desired MIME type when a stream is being opened.) Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
* | add droiddoc flag for honeycomb apis (for reference filtering)Scott Main2010-08-041-0/+1
| | | | | | | | Change-Id: I711b71cbb914cbe9b6bcf7feae55332b1f3fa1c1
* | Add new system service CountryDetectorBai Tao2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | a. The CountryDetector detects the country the user is in in order of mobile network, location, sim card or locale. It will be used by contact and contact provider. b. All added APIs are hidden at this stage. Change-Id: I4ba278571ffb6ab6ded0996d4f440a18534f8ed4
* | resolved conflicts for merge of bc54e63c to masterMathias Agopian2010-07-211-1/+0
|\ \ | |/ | | | | Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
| * new SensorServiceMathias Agopian2010-07-191-1/+0
| | | | | | | | | | | | | | remove old sensor service and implement SensorManager on top of the new (native) SensorManger API. Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
* | Initial changes to allow collections in widgets.Winson Chung2010-07-191-0/+1
| | | | | | | | Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
* | am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ↵Joe Onorato2010-07-151-7/+7
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07' * commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07': Clean up some style in the makefiles.
| * Clean up some style in the makefiles.Joe Onorato2010-07-141-7/+7
| | | | | | | | Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
* | frameworks/base updates to track merge from dalvik-devBrian Carlstrom2010-06-301-1/+2
| | | | | | | | | | | | | | | | | | - frameworks and CoreTests modules now depend on bouncycastle - update preloades classes for NativeBN package change - moved CryptoTest to libcore - updated api Change-Id: I47363a463f074af205b5bd128cd98faab70ac849
* | New XmlAdapters sample code.Gilles Debunne2010-06-251-1/+3
| | | | | | | | | | | | Build files modified to add the new sample. Sample screenshot images. Change-Id: I51b9512eb7b8202a3acb482fbfbd8e5ffa100f5c
* | Reimplement the PhoneNumberFormattingTextWatcherBai Tao2010-06-101-2/+6
| | | | | | | | | | | | | | | | a. Built the external/libphonenumberutil into the ext.jar. The file size increased 50K, the phone number meta file is 90K before the compression. b. Used the external/libphonenumberutil to format the phone number for about 200 countries. c. Beside the phone number formatting, the external/libphonenumberutil will also be used for phonenumber match and international dialing. Change-Id: Ie5165dc60d66e1eddab7134725a8d1d1c826434a
* | am 420e7ec7: am fef42db9: Add sample code.Dianne Hackborn2010-06-041-2/+4
|\ \ | |/
| * Add sample code.Dianne Hackborn2010-06-041-2/+4
| | | | | | | | Change-Id: I8f598dcbccbb0c43cedc1e1d02f6e3a46d6ebc67
* | am 12cd606d: am 0cbda99f: The status bar draws its icons now.Joe Onorato2010-06-021-2/+2
|\ \ | |/
| * The status bar draws its icons now.Joe Onorato2010-06-021-2/+2
| |
* | am 627cfa94: am 90233a1e: Add IStatusBarJoe Onorato2010-06-021-1/+1
|\ \ | |/
| * Add IStatusBarJoe Onorato2010-06-021-1/+1
| | | | | | | | Change-Id: Ie73d665085d5ce7358c285bf332ef1dc96005d0f
* | am e0b2ae11: am 25f95f92: Rename IStatusBar to IStatusBarService.Joe Onorato2010-06-021-1/+1
|\ \ | |/
| * Rename IStatusBar to IStatusBarService.Joe Onorato2010-06-021-1/+1
| | | | | | | | Change-Id: Icfec2a830f037b21f6afaa796bf49da610567e7b
* | am 2cbaf806: am 2314aab5: First pass at splitting the status bar for the ↵Joe Onorato2010-06-021-0/+1
|\ \ | |/ | | | | different devices.
| * First pass at splitting the status bar for the different devices.Joe Onorato2010-06-021-0/+1
| | | | | | | | Change-Id: I2f568df92f88dfe8de18d24dd004239f52761aa6
| * disable emma instrumentation for framework, ext and services (DO NOT MERGE)Guang Zhu2010-05-181-0/+6
| | | | | | | | | | | | | | | | When these libraries are instrumented with emma instructions, runtime keeps restarting on native crashes. To acheive a fully emma instrumented build, we need to disable emma instrumentation on these libraries. Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
* | Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2010-05-271-23/+3
| | | | | | | | | | | | Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6 Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f
* | am c4a9383d: am 626db910: Store the list of source directories for the SDK.Joe Onorato2010-05-171-0/+4
|\ \ | |/
| * Store the list of source directories for the SDK.Joe Onorato2010-05-171-0/+4
| | | | | | | | Change-Id: I3e8425c8eb7c808b60ec764ff81bcbb7aec9684c
* | am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight ↵Mike Lockwood2010-05-171-1/+2
|\ \ | |/ | | | | support in obsolete IHardwareService Binder API.
| * am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService ↵Mike Lockwood2010-05-171-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Binder API. Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp * commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f': Resurrect flashlight support in obsolete IHardwareService Binder API.
| | * Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is to avoid flashlight apps that had been using reflection to access this API after this class was removed after eclair. Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am cef60007: am aef87aa9: am c6b7a2d7: am d1e9d590: Doc change: add ↵Dirk Dougherty2010-05-171-2/+2
|\ \ \ | |/ / | | | | | | sizes/sums for sdk/ndk/adt packages.
| * | am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-141-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'd1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp * commit 'd1e9d590941303c004459f3d798b26f1bf091535': Doc change: add sizes/sums for sdk/ndk/adt packages.
| | * Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-141-2/+2
| | | | | | | | | | | | Change-Id: I9385c5b90a8f366764337adf4221fba4d7448568
* | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-121-1/+1
| | | | | | | | | | | | Change-Id: I38b585044aaa0f0ef5a243a33d942ab0e490f8f1
* | | am b796d698: am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for ↵Dirk Dougherty2010-05-121-5/+5
|\ \ \ | |/ / | | | | | | new tools, platform, adt versions. Misc other fixes updates in doc files.
| * | am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc ↵Dirk Dougherty2010-05-121-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | other fixes updates in doc files. Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp * commit '0d1b0814be24f501395bf175fba8691117f782d5': Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
| | * Doc change: updates for new tools, platform, adt versions. Misc other fixes ↵Dirk Dougherty2010-05-111-5/+5
| | | | | | | | | | | | | | | | | | updates in doc files. Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
* | | am 2ecef59c: am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc ↵Dirk Dougherty2010-05-111-0/+4
|\ \ \ | |/ / | | | | | | references to tictactoe sample apps and screen shots.
| * | am b32c2402: Doc change: add toc references to tictactoe sample apps and ↵Dirk Dougherty2010-05-111-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | screen shots. Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp * commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05': Doc change: add toc references to tictactoe sample apps and screen shots.
| | * Doc change: add toc references to tictactoe sample apps and screen shots.Dirk Dougherty2010-05-101-0/+4
| | | | | | | | | | | | Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
* | | am cd2fa84a: am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change ↵Scott Main2010-05-101-1/+1
|\ \ \ | |/ / | | | | | | SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
| * | am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old ↵Scott Main2010-05-101-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | "new" superscripts from resources toc" into froyo Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp * commit '62c28caee4a26e106134264f917bacef77438483': docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
| | * docs: change SearchableDictionary to "v2" and remove old "new" superscripts ↵Scott Main2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | from resources toc Change-Id: Ic240502b8874fdc69d1d97cbf9df0ef925fbc071
| * | am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity ↵Dirk Dougherty2010-05-101-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Testing/Hello, Testing tutorials doc files" into froyo Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp * commit '0dd3a239519369933d4efa701479c816b4b33874': Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
| | * Doc change: cherry-pick from master: Activity Testing/Hello, Testing ↵Joe Malin2010-05-071-0/+4
| | | | | | | | | | | | | | | | | | tutorials doc files Change-Id: If43ba08af00c8c9fcf6d05834f8b2a7a719b4bec
| * | Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-2/+2
| |/ | | | | | | Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
* | Add framework.aidl as prerequisite of api-stubsYing Wang2010-05-071-1/+2
| | | | | | | | | | | | | | So that aidl can pull in framework.aidl when building against current sdk. See http://b/issue?id=2666578 Change-Id: If45ff10a7ffa1f14e421ec50d6c07636236b2b8e
* | Doc Change: Activity Testing/Hello, Testing tutorials doc filesJoe Malin2010-05-041-0/+4
| | | | | | | | | | | | Change-ID: bddebe3eaaf722e2bd2a56d473b76a0a8e061053 Author: Joe Malin <jmalin@google.com> Date: Mon Mar 1 18:24:14 2010 -0800
* | Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-2/+2
| | | | | | | | Change-Id: Ia7046e7f3eace4f31ae48987712b539418d72ed1
generated by cgit v1.1 at 2025-08-07 22:18:12 +0000