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

906 Commits

Author SHA1 Message Date
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -07:00
Bill Napier
8b0b7af010 Fix up some issues with the onCreateContextMenu example in the Notepad tutorial. 
Change-Id: I8e9329d3b9da507effafb886a33a0a7e6574a7c7
 2010-09-15 14:37:58 -07:00
Joe Malin
2c1723ef56 Doc Change: add screenshots to Testing in Eclipse topic 
Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692
 2010-09-10 13:27:23 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Gilles Debunne
6e1df0e981 Progress Dialog documentation example uses onPrepareDialog 
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
 2010-09-09 09:21:53 -07:00
Dirk Dougherty
54ceb6e68e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'

* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:22:33 -07:00
Dirk Dougherty
eed5d17d78 am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp

* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:14:04 -07:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
Dirk Dougherty
3eb07ea483 Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
Dirk Dougherty
022171be9d Doc change: Add notes for SDK Tools r7 and ADT 0.9.8. 
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
 2010-09-08 15:59:56 -07:00
Elliott Hughes
da2d18a055 am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77'

* commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77':
  Be brief.
 2010-09-07 18:51:16 -07:00
Elliott Hughes
c50a4f374a am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
 2010-09-07 14:46:15 -07:00
Elliott Hughes
45cda90bdc Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Scott Main
8ae409f501 am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error 
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error
 2010-09-03 13:28:18 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error 
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
 2010-09-03 13:18:28 -07:00
Scott Main
c4367e54e4 fix code snippet error 
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
 2010-09-03 11:03:42 -07:00
Scott Main
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
 2010-09-02 18:53:32 -07:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
 2010-09-02 18:44:11 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Joe Malin
3e3fcf985f Testing Documentation in the Dev Guide tab 
Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
 2010-08-27 17:59:38 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
 2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
e339c0968e am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
 2010-08-27 12:23:30 -07:00
Brad Fitzpatrick
f52870948d Fix closing tag in docs. 
BUG=2956223

Change-Id: I0772d0b5386a783762319064c13d567c124da394
 2010-08-27 11:22:50 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page. 
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
 2010-08-25 10:31:57 -07:00
Dirk Dougherty
91047d3b2c am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
 2010-08-24 11:54:39 -07:00
Scott Main
9ac16d2dc4 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo 
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
 2010-08-24 11:21:04 -07:00
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
 2010-08-23 17:52:41 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes. 
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
 2010-08-23 17:38:35 -07:00
Scott Main
32b07fc6ca am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo 
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
 2010-08-23 12:44:18 -07:00
Scott Main
fa4596ec80 docs: add dev guide for getting user location 
Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
 2010-08-20 14:21:26 -07:00
Scott Main
87dfc3d0f9 clarify dp dimension description 
Change-Id: I85152f8ab668984ca9db3a4f56c4f8a5ab6ebacd
 2010-08-16 14:46:23 -07:00
Scott Main
ab847c44d0 am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8'

* commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8':
  fix some doc errors in the resources;
 2010-08-05 12:08:02 -07:00
Scott Main
c9de8c34a3 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
 2010-08-04 18:05:26 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources; 
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
 2010-08-04 17:33:33 -07:00
Dirk Dougherty
cb2d4c2771 am bd502940: am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit 'bd5029403e0f9d93086604df6dbb1b989e58e964'

* commit 'bd5029403e0f9d93086604df6dbb1b989e58e964':
  Doc change: Cleanup for licensing doc.
 2010-07-31 12:19:18 -07:00
Dirk Dougherty
bd5029403e am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:40:28 -07:00
Dirk Dougherty
2ff1ba012c Doc change: Cleanup for licensing doc. 
Change-Id: Iff046768d70adf0489f5241212061045cef2572f
 2010-07-30 16:00:18 -07:00
Gilles Debunne
c943e174f6 am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp

* commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 11:56:36 -07:00
Gilles Debunne
c09a6977ae Fixes regarding densities in "Providing Resources" documentation page. 
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Cherry-picked from master CL 59188.

Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
 2010-07-29 16:54:03 -07:00
Romain Guy
8fb007e6d9 am 0f0b7160: am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)" 
Merge commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30'

* commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30':
  Fixed a documentation Bug (Issue 9236)
 2010-07-29 14:36:22 -07:00
Romain Guy
0f0b71600b am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)" 
Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp

* commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5':
  Fixed a documentation Bug (Issue 9236)
 2010-07-29 14:32:29 -07:00
Romain Guy
e53fe4a465 Merge "Fixed a documentation Bug (Issue 9236)" 2010-07-29 14:00:02 -07:00
Gilles Debunne
aa6d39218b Merge "Fixes regarding densities in "Providing Resources" documentation page." 2010-07-28 18:38:56 -07:00
Gilles Debunne
3e0a3d5b48 Fixes regarding densities in "Providing Resources" documentation page. 
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Change-Id: Icf7494c23f7e3af7d3c6aab770d0ba3c1fea2ebf
 2010-07-28 17:08:15 -07:00
Elliott Hughes
44860da2be Be brief. 
Excise much of the non-Android blurb so we don't distract from our primary
messages of "allocate less stuff" and "do less work".

Change-Id: Ifc2c12bc953dbfbaf4078d4f7b77aa75d1d942d7
 2010-07-28 16:50:16 -07:00
Scott Main
ffdfd992e5 am 4e235622: am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo 
Merge commit '4e235622bc37e54208b88a18251f3682495af41f'

* commit '4e235622bc37e54208b88a18251f3682495af41f':
  fix markup error
 2010-07-28 14:30:21 -07:00
Scott Main
8a52f3d683 fix markup error 
bug:2871538

Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f
 2010-07-28 14:15:26 -07:00
Dirk Dougherty
84aa506685 am 68344ba8: am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. 
Merge commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f'

* commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f':
  Doc change: Add docs for licensing service.
 2010-07-26 20:06:28 -07:00
Dirk Dougherty
0ac8ac301d Doc change: Add docs for licensing service. 
Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d
 2010-07-26 11:07:24 -07:00