drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,404 Commits 1 Branch 0 Tags
Commit Graph

161 Commits

Author SHA1 Message Date
Dirk Dougherty
a947fce312 cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo 
Conflicts:

	docs/html/sdk/ndk/1.5_r1/index.jd

Change-Id: I19f6e97bd019ac347a34db0aea157a33d0217189
 2010-03-26 16:32:02 -07:00
Scott Main
f54574a90c docs: clean docs to use consistent "sidebox" classes (eliminate sidebox-inner) 
Change-Id: I8a2a343257b055b5447bca03a98e48ad4387ff42
 2010-03-24 17:18:01 -07:00
Dirk Dougherty
1f40f174e7 am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

* commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:52:43 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features. 
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
 2010-01-28 16:26:50 -08:00
Dirk Dougherty
57853a8aec am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'

* commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
  SDK doc change: Misc small fixes.
 2010-01-28 12:37:21 -08:00
Dirk Dougherty
cf5769877b am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8'

* commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-28 12:37:10 -08:00
Xavier Ducrohet
cda4d7bea2 am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3." 
Merge commit '48edf7c00201f2bc6186e07dbc614976642682e4'

* commit '48edf7c00201f2bc6186e07dbc614976642682e4':
  Revert "SDK doc change: Add doc update for NDKr3."
 2010-01-25 18:11:20 -08:00
Xavier Ducrohet
0481170a85 am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair 
Merge commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870'

* commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870':
  SDK doc change: Add doc update for NDKr3.
 2010-01-25 18:10:42 -08:00
Dirk Dougherty
8420795633 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
c5de95bf25 Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dirk Dougherty
5bc32d3539 SDK doc change: Misc small fixes. 
Bug:2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
 2010-01-22 15:11:00 -08:00
Dirk Dougherty
83d092573e SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager. 
Bug: 2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
 2010-01-22 14:31:47 -08:00
Scott Main
dae34fa8a1 am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'

* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
  docs: some spelling typos
 2010-01-22 09:43:56 -08:00
Xavier Ducrohet
d1da5fa2da Revert "SDK doc change: Add doc update for NDKr3." 
This reverts commit 1dced50963312c5d340cbd129d0017d9cbb45f0b.
 2010-01-20 17:45:18 -08:00
Xavier Ducrohet
38f7a02a9b Merge "SDK doc change: Add doc update for NDKr3." into eclair 2010-01-20 17:30:27 -08:00
Scott Main
290cd9ab8b am 7cc57ff2: am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair 
Merge commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea'

* commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea':
  docs: remove dev guide link from download confirmation content
 2010-01-19 16:35:10 -08:00
Scott Main
88e653f665 Merge "docs: some spelling typos" into eclair 2010-01-19 11:18:39 -08:00
Scott Main
13244e52eb docs: some spelling typos 2010-01-19 11:12:07 -08:00
Scott Main
baf08994b9 docs: remove dev guide link from download confirmation content 
so we only link to the install guide and re-affirm the system reqs
bug: 2374363,2374334
 2010-01-14 12:09:08 -08:00
Dirk Dougherty
88098683b0 am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'

* commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 13:50:42 -08:00
Dirk Dougherty
cf6bbab6db SDK doc change: Miscellaneous fixes. 
Bug: 2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
 2010-01-11 11:15:22 -08:00
Dirk Dougherty
1dced50963 SDK doc change: Add doc update for NDKr3. 
Bug: 2160782
Change-Id: I20bd2b84bdab27b03c3544d8eecab2404eeb2c1c
 2010-01-11 09:33:00 -08:00
Dirk Dougherty
a6a3c6da1c am 27e13685: am 4d5a0645: doc change: add 7 diffs report. 
Merge commit '27e136854f156a7896b35c1140125568c33b4737'

* commit '27e136854f156a7896b35c1140125568c33b4737':
  doc change: add 7 diffs report.
 2009-12-19 00:20:16 -08:00
Dirk Dougherty
4d5a064553 doc change: add 7 diffs report. 
Bug: 2160782
Change-Id: Ic8444f43d21ffa0b6d7f679f80f86db88a95d189
 2009-12-18 22:52:59 -08:00
Scott Main
4c83f40bdb am 7ddb938c: am b2aab504: Merge change I354261e2 into eclair 
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'

* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
  docs: small edit to live wallpaper sentence
 2009-12-16 15:52:32 -08:00
Scott Main
354261e25a docs: small edit to live wallpaper sentence 2009-12-16 15:25:35 -08:00
Scott Main
1e5710ce6f am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair 
Merge commit '73536dda20594e4b5e83396d705127a823bfa362'

* commit '73536dda20594e4b5e83396d705127a823bfa362':
  docs: add 2.1 platform notes, win usb driver notes
 2009-12-16 11:20:22 -08:00
Scott Main
b149ee8835 docs: add 2.1 platform notes, win usb driver notes 
and fix some javadocs for PhonestateListener
 2009-12-16 09:50:53 -08:00
Dirk Dougherty
692bf86e67 am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair 
Merge commit '479a49f74f77855825ba69b105c065422c24246a'

* commit '479a49f74f77855825ba69b105c065422c24246a':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
 2009-12-15 15:04:00 -08:00
Dirk Dougherty
22558d0be8 sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes. 
Bug: 2160782
Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
 2009-12-14 11:40:02 -08:00
Dirk Dougherty
0f29956e43 am fe4e74b6: am 233c50e4: am 43810507: Merge change Ic8231560 into eclair 
Merge commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72'

* commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72':
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
 2009-12-02 20:28:55 -08:00
Android (Google) Code Review
43810507b7 Merge change Ic8231560 into eclair 
* changes:
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
 2009-12-01 22:41:22 -08:00
Dirk Dougherty
7500f341dd sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes. 
Bug: 2160782
Change-Id: Ic8231560ef1bc036cfd5d242c65f654cb110fc6b
 2009-12-01 19:27:26 -08:00
Scott Main
0421ccc294 am 1109703c: am 03828c0e: am 0bd1eeaf: Merge change I21a67b8d into eclair 
Merge commit '1109703c5928726a0f509d065286abb04dbc474a'

* commit '1109703c5928726a0f509d065286abb04dbc474a':
  docs: remove droid-specific behavior change from platform notes
 2009-12-01 18:53:54 -08:00
Scott Main
21a67b8d97 docs: remove droid-specific behavior change from platform notes 
bug: 2293281
 2009-11-30 16:20:22 -08:00
Dirk Dougherty
5a25769584 am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'

* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
 2009-11-23 16:05:56 -08:00
Dirk Dougherty
bca9f1bbb3 sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Bug: 2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
 2009-11-23 13:23:46 -08:00
Scott Main
71372be6c2 am acedb7d0: am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit 'acedb7d0c3452ff7347fec8f643034e938a55137'

* commit 'acedb7d0c3452ff7347fec8f643034e938a55137':
  docs change for ESR: add platform notes document for
 2009-11-20 17:19:51 -08:00
Scott Main
256da9fb00 am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair

* commit '160ab363d738728456d561bb80d54d3448e7580a':
  docs change for ESR: add platform notes document for
 2009-11-20 17:03:29 -08:00
Scott Main
2edbbafdd5 docs change for ESR: add platform notes document for 
Android 2.0.1. Also update the homepage sdk and adp announcements.

Bug: 2160782
Change-Id: I0c172ebf9449ac99865433b51a0a7366aa2ef020
 2009-11-20 16:53:01 -08:00
Dirk Dougherty
9aaa087c96 am b11f8a21: am d47fad27: am 055b4392: Merge change I0a17a960 into eclair 
Merge commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf'

* commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
 2009-11-20 13:22:59 -08:00
Dirk Dougherty
0a056afb71 sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives. 
Bug:2160782
Change-Id: I0a17a9603b53a46a3a434f29bcd72208af1a745b
 2009-11-20 11:17:26 -08:00
Scott Main
9c9e67aca4 resolved conflicts for merge of bc1add83 to master 2009-11-17 11:13:31 -08:00
Scott Main
8ef5a6b6ae docs: remove all content from the older sdk download, 
install, and requirements pages and redirect to the new sdk
pages. Also update the "older sdks"
doc to include all version-specific sdks.
also update the robots file to disallow indexing
of the old sdk docs.
 2009-11-16 17:39:52 -08:00
Dirk Dougherty
9ebb159c4e am bd079ec8: am aca2c4df: am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk 
Merge commit 'bd079ec854ba9200db94bffb2ed054a4f67fec4b'

* commit 'bd079ec854ba9200db94bffb2ed054a4f67fec4b':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
 2009-11-10 09:50:20 -08:00
Android (Google) Code Review
3a103a87b0 Merge change I15536f3c into eclair-sdk 
* changes:
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
 2009-11-10 09:13:29 -08:00
Dirk Dougherty
a374f51f18 doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc. 
Bug: 2246467
Change-Id: I15536f3c7f2088fff8f60963ba23a69b1be43804
 2009-11-10 08:41:20 -08:00
Scott Main
95594cce49 am 022a38a0: am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk 
Merge commit '022a38a00a460dae1f45bb532780b519048e2dd8'

* commit '022a38a00a460dae1f45bb532780b519048e2dd8':
  docs: add new document for the win usb driver;
 2009-11-06 16:22:30 -08:00
Scott Main
ad68fdd702 docs: add new document for the win usb driver; 
remove usb guide from the device document.
 2009-11-06 13:48:21 -08:00
Dirk Dougherty
3bb6baa349 am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'

* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
  doc change: misc doc fixes.
 2009-11-03 00:09:57 -08:00