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

531 Commits

Author SHA1 Message Date
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
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
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
Scott Main
25f79d9972 am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'

* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
  docs: add information about using color resources as drawables
 2010-07-20 16:54:52 -07:00
Scott Main
2316d62608 docs: add information about using color resources as drawables 
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
 2010-07-20 10:28:09 -07:00
Scott Main
9abf2067f0 am 3dfa6ec5: am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9'

* commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:57:29 -07:00
Scott Main
955f1551b6 am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633'

* commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633':
  docs: editorial revisions to Search guide
 2010-07-16 16:25:03 -07:00
Scott Main
7e48908463 docs: add troubleshooting to eclipse guide about restarting adb 
Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce
 2010-07-16 15:04:22 -07:00
Scott Main
2a8dd4e46f Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Scott Main
5e892d8183 docs: editorial revisions to Search guide 
Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
 2010-07-16 14:33:14 -07:00
Katie McCormick
ac29089ffc am 3f50035c: am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo 
Merge commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e'

* commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e':
  Doc change: Update AVD create instructions.
 2010-07-15 23:24:16 -07:00
Katie McCormick
28da8e5e4a Merge "Doc change: Update AVD create instructions." into froyo 2010-07-15 17:25:10 -07:00
Katie McCormick
c46efe6696 Doc change: Update AVD create instructions. 
Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
 2010-07-15 16:20:41 -07:00
Scott Main
82e2b4cb51 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
 2010-07-15 11:54:15 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -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
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
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
Christian Mehlmauer
218284528b Fixed a documentation Bug (Issue 9236) 
Change-Id: I898b352f2b2f6b059ccd4a44c30e61c9dfdab9ec
http://code.google.com/p/android/issues/detail?id=9236
 2010-06-25 16:31:05 +02: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