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

926 Commits

Author SHA1 Message Date
Dirk Dougherty
798dc2f518 am 6ba9e6fb: am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Merge commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e'

* commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e':
  Doc change: add notes for ndk r4b.
 2010-07-12 17:45:12 -07:00
Dirk Dougherty
6ba9e6fbef am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp

* commit '5a93032dcbe54223e03102d497d7e04370491737':
  Doc change: add notes for ndk r4b.
 2010-07-12 17:42:33 -07:00
Dirk Dougherty
5a93032dcb doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
 2010-07-12 17:30:05 -07:00
Dirk Dougherty
3c691a8d7f Doc change: add notes for ndk r4b. 
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
 2010-07-12 15:51:01 -07:00
The Android Open Source Project
2a6560bcb8 am 7b1a2079: merge from open-source master 
Merge commit '7b1a2079227cd93d1d92088fed0df2351705cbe4'

* commit '7b1a2079227cd93d1d92088fed0df2351705cbe4':
  Fixed a Documentation Error in the AsyncTask Contstructor
 2010-07-12 15:40:34 -07:00
The Android Open Source Project
7b1a207922 merge from open-source master 
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
 2010-07-12 15:35:31 -07:00
Robert Ly
8ef63e8bf0 am f9a71640: am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49'

* commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:14:32 -07:00
Robert Ly
f9a71640b8 am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:11:25 -07:00
Robert Ly
b100801069 am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:07:40 -07:00
Robert Ly
ef13d02821 docchange: fixed typo "Pacskage" to "Package" 
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
 2010-07-12 14:55:59 -07:00
Romain Guy
2594066787 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Christian Mehlmauer
b91a4c4f23 Fixed a Documentation Error in the AsyncTask Contstructor 
Change-Id: Ic5fb9c613b9e358f1ea81996ee705831a77368db
 2010-07-12 20:02:25 +02:00
The Android Open Source Project
ba7a36e1c5 am 990d9ca4: merge from open-source master 
Merge commit '990d9ca416d1410130333b7b461162c953a1f0c2'

* commit '990d9ca416d1410130333b7b461162c953a1f0c2':
  update 404'd source.android.com URLs
 2010-07-09 15:58:45 -07:00
The Android Open Source Project
990d9ca416 merge from open-source master 
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
 2010-07-09 15:56:45 -07:00
Scott Main
ac85b829f6 am 9fd45970: am 833830e0: am 286cf139: docs: add redirect for download.html 
Merge commit '9fd45970de75895c4b922b8ad5b8cab78f865c97'

* commit '9fd45970de75895c4b922b8ad5b8cab78f865c97':
  docs: add redirect for download.html
 2010-07-08 19:10:01 -07:00
Scott Main
9df613a7df am 717b517a: am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '717b517ab319b336a406d6df0926b30a1ea84bf8'

* commit '717b517ab319b336a406d6df0926b30a1ea84bf8':
  docs: add caution about adt in eclipse 3.6
 2010-07-08 19:09:23 -07:00
Jean-Baptiste Queru
cb5357c43d Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Scott Main
833830e064 am 286cf139: docs: add redirect for download.html 
Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread

* commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62':
  docs: add redirect for download.html
 2010-07-08 11:40:11 -07:00
Scott Main
286cf139c3 docs: add redirect for download.html 
Change-Id: Id54f1899c1933796524d6c2b5e991a652b354287
 2010-07-08 11:26:36 -07:00
Scott Main
1082ae033d am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread

* commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8':
  docs: add caution about adt in eclipse 3.6
 2010-07-07 18:43:10 -07:00
Scott Main
5183ae3b0f Merge "docs: add caution about adt in eclipse 3.6" into froyo 2010-07-07 18:37:48 -07:00
Scott Main
1c9bada4b4 docs: add caution about adt in eclipse 3.6 
Change-Id: I37c920f6a5290d891c4a6dea5978147a50eec807
 2010-07-07 16:47:16 -07:00
Dirk Dougherty
2651504c02 Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 2010-07-07 14:29:29 -07:00
Mathias Agopian
3038f47d1c am 3b09d64a: am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread 
Merge commit '3b09d64a20732c2f8f65f191899b991417cad51c'

* commit '3b09d64a20732c2f8f65f191899b991417cad51c':
  More improvements to the SensorManager documentation
 2010-07-07 13:33:41 -07:00
Mathias Agopian
ef52b5682d Merge "More improvements to the SensorManager documentation" into gingerbread 2010-07-07 13:06:57 -07:00
Mathias Agopian
0f791a799d More improvements to the SensorManager documentation 
Change-Id: I8ab79e8787402f0db572226029820b3cf605086f
 2010-07-02 17:57:10 -07:00
Dirk Dougherty
0b2395c193 Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc. 
Change-Id: I5522406335fbf96164a5b812ec4891c499343d1e
 2010-07-02 15:07:47 -07:00
Elliott Hughes
def4e4d39d Merge "Defer to ICU's knowledge of language-specific grammatical quantity rules." 2010-07-02 13:42:00 -07:00
Scott Main
838fd9c430 am dfbad7d3: am 125204b7: am 1c8b6ca4: docs: fix misc broken links 
Merge commit 'dfbad7d316a703f42881374b8124183d2c165bf2'

* commit 'dfbad7d316a703f42881374b8124183d2c165bf2':
  docs: fix misc broken links
 2010-07-02 13:39:33 -07:00
Scott Main
1c8b6ca4d7 docs: fix misc broken links 
Change-Id: I7294276aff0c80498215870d5d72f7a3a9b2c99a
 2010-07-02 11:11:34 -07:00
Scott Main
39cae6e02b am 1cbf9482: am 43d9b0ae: am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo 
Merge commit '1cbf9482d7d32bac60741d6e512f3ac921f3a6aa'

* commit '1cbf9482d7d32bac60741d6e512f3ac921f3a6aa':
  docs: update device dashboard; add historical chart
 2010-07-01 23:38:11 -07:00
Elliott Hughes
1ad636c315 Defer to ICU's knowledge of language-specific grammatical quantity rules. 
Also improve the documentation to make it a little less unclear what this
is all about. In particular, explain why the original submitter's complaint
about "zero" never being used in English, is expected behavior.

Bug: 2663392
Change-Id: Iade3b4f5c549ce01a95fd0e7e5c6ea394178eda3
 2010-07-01 16:51:48 -07:00
Scott Main
db3b598c93 docs: update device dashboard; add historical chart 
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
 2010-07-01 14:57:41 -07:00
Scott Main
b6643d90e6 am b2d1a71b: am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style. 
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'

* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
  docs: revise menu guide to focus more on using menu resources
 2010-06-30 15:36:02 -07:00
Scott Main
b4d2e42a85 docs: revise menu guide to focus more on using menu resources 
instead of defining menus in code.
And revise some style.

Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
 2010-06-29 17:13:02 -07:00
Scott Main
8c464e811f am 7c8ca29e: am e42b1867: am 4fb91d9f: docs: fix typo 
Merge commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79'

* commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79':
  docs: fix typo
 2010-06-29 15:52:30 -07:00
Scott Main
4fb91d9f1b docs: fix typo 
Change-Id: I39849068bb1b35a766df93ab3440829730efabaa
 2010-06-29 15:22:03 -07:00
Scott Main
ab3593956c am 0884cb5e: am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs 
Merge commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df'

* commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df':
  docs: update backup guide and bmgr tool
 2010-06-28 15:36:56 -07:00
Scott Main
337b0873f4 docs: update backup guide and bmgr tool 
elaborate the guide to testing a backup agent and add links between the docs

Change-Id: I35f815d1848c6bd7c6bfaee214f333e35a6cb23c
 2010-06-28 12:28:31 -07:00
Chris Peterson
c05df82b36 update 404'd source.android.com URLs 
Change-Id: I4d3d2ae267c9f6da9f4969b3970cfb923ce8ef2f
 2010-06-25 17:32:20 -07:00
Gilles Debunne
3eb9b66deb New XmlAdapters sample code. 
Build files modified to add the new sample. Sample screenshot images.

Change-Id: I51b9512eb7b8202a3acb482fbfbd8e5ffa100f5c
 2010-06-25 14:00:00 -07:00
Scott Main
06f36212d6 am 8ab65289: am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo 
Merge commit '8ab652896394526d8793973067b228eca34201a7'

* commit '8ab652896394526d8793973067b228eca34201a7':
  docs: Remove the TOS from download flow and remove TOS entirely because
 2010-06-24 18:18:28 -07:00
Scott Main
654d9414de docs: Remove the TOS from download flow and remove TOS entirely because 
it's no longer relevant to the SDK download package

Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
 2010-06-24 17:29:13 -07:00
Scott Main
1150dac07a am 0c837a2e: am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9'

* commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 12:41:34 -07:00
Dirk Dougherty
a58a7aecf4 am ca36e9ee: am 7c1a2dfa: am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 
Merge commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b'

* commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b':
  Doc change: Fix description of certificate matching requirement for app updates.
 2010-06-23 10:32:21 -07:00
Scott Main
753e56090e Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Scott Main
964384962d docs: update backup dev guide with Android Backup Service registration info 
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
 2010-06-22 19:26:16 -07:00
Dirk Dougherty
a767076f46 Doc change: Fix description of certificate matching requirement for app updates. 
Change-Id: I38a0b997f5cb634bfdab1c0ecaa2b0d19e68256a
 2010-06-21 16:22:06 -07:00
Scott Main
0d049e5f62 am 0b16e6a0: am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'

* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:55:19 -07:00
Scott Main
121ac1e5a2 am b8ce7bca: am 78e6622f: am 821ca518: docs: edits to resources doc 
Merge commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234'

* commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234':
  docs: edits to resources doc
 2010-06-17 12:46:03 -07:00