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

92 Commits

Author SHA1 Message Date
Scott Main
b1ddc7ec5c resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp 
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
 2011-02-07 21:17:09 -08:00
Scott Main
9bf45a0075 Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide 
Also move the app fundamentals document back to fundamentals.jd
TODO: resolve links in the javadocs

Change-Id: Ia3c81a83bf7fe75f7942fd41bfb1d626ee72d5d9
 2011-02-07 21:03:04 -08:00
Scott Main
be779cb745 am 4fe3e53e: update menu dev guide with more info about action bar 
* commit '4fe3e53e854b0056b774bfe25e3d1a2d4841aa32':
  update menu dev guide with more info about action bar
 2011-02-03 18:06:55 -08:00
Scott Main
4fe3e53e85 update menu dev guide with more info about action bar 
Change-Id: I5b0b052c96b23a395a669b1c3da11dc87f625f25
 2011-02-03 18:02:55 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:23:43 -08:00
Dianne Hackborn
15efe4cb4c am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit 'a8069f34f65bee858d87fd232a872a62e85a502b':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-21 09:55:16 -08:00
Keiji Ariyama
a84e088211 Fixes Keyboard availability in "Providing Resources" documentation page. 
Added keyshidden value.

Change-Id: I9fb1a06971488f446ccafdfa3b0db17786b33f97
 2011-01-22 01:58:25 +09:00
Robert Ly
293b850da6 Doc change: fixing links set 2 
Change-Id: I8752cc7c732812a5f11f8b5f5ac83c3a87305f22
 2011-01-07 18:56:10 -08:00
Scott Main
a4a0e5ee59 am cdd76cf5: am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference 
* commit 'cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba':
  cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
 2010-12-20 11:33:04 -08:00
Scott Main
cdd76cf587 am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference 
* commit '0d1e38ef99252cb14e6bcc4b3135021da025330f':
  cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
 2010-12-20 11:29:32 -08:00
Scott Main
0d1e38ef99 cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c 
docs: misc fixes to the drawable reference

Change-Id: I8b867234250ca18d5b6ee78a22b6150e1ba3e588
 2010-12-16 15:48:36 -08:00
Scott Main
9742148fb2 Merge "docs: updates to menu resource doc for new attributes" 2010-12-15 12:11:10 -08:00
Scott Main
14711b2b42 docs: updates to menu resource doc for new attributes 
Change-Id: I6dd0553da6153839b54e4429db5e87d071e91e49
 2010-12-15 12:08:25 -08:00
Scott Main
ccc15650e4 am 9278d321: am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642 
* commit '9278d3216837ad45eae13b87f04f050acb4ddafa':
  cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
 2010-12-15 12:01:58 -08:00
Scott Main
9278d32168 am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642 
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
  cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
 2010-12-15 11:56:04 -08:00
Scott Main
52078255da cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd 
docs: fix bug 3216642

Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
 2010-12-15 11:49:42 -08:00
Scott Main
bb3e4cf973 am 3354f4dc: am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes 
* commit '3354f4dc3de531cf5e5039c0b9f40de4fbdac255':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
 2010-12-14 17:45:39 -08:00
Scott Main
3354f4dc3d am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes 
* commit '369c1c1fa22802b6504c5cde533d797841700a66':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
 2010-12-14 17:42:28 -08:00
Scott Main
369c1c1fa2 cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e 
docs: anchor link fixes

Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1
 2010-12-14 17:34:00 -08:00
Scott Main
dc76b1c3ff am a925b6a6: am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit 'a925b6a64c8137804547d5cfcd97415392d667b1':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:46:56 -08:00
Scott Main
a925b6a64c am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit '93d204ed98019322e434b714c7c0a619d69f24f5':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:43:28 -08:00
Scott Main
93d204ed98 cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df 
docs: fix misc broken links; update some screenshots using windows
bug: 3258882

Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
 2010-12-14 16:39:22 -08:00
Scott Main
d4fbcfa220 am 9e3d14c4: am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '9e3d14c4aad7e41406f633734973b191c21b5c5c':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 16:23:04 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties 
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
 2010-11-24 11:24:33 -08:00
Scott Main
1385d89d5e am 55ff5708: am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread 
* commit '55ff5708bb166ab985ffd89e62ddcb13927d6403':
  docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
 2010-11-19 16:56:53 -08:00
Scott Main
55ff5708bb am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread 
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
  docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
 2010-11-19 16:51:57 -08:00
Scott Main
0f6f51879c docs: revise menu resources to account for action bar 
Change-Id: I40d61653e02735f6a0b47449191b71c233b36fa3
 2010-11-17 19:34:28 -08:00
Scott Main
ae5335b673 docs: add docs for xhdpi and xlarge screen support 
update screen ranges figure
bug: 3099462

Change-Id: I4667f105df2ddc04a8e2b6c3ad06ec0ded2dccd2
 2010-11-10 15:27:40 -08:00
Dianne Hackborn
4f405ecee9 am ce0f9e4e: am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 
* commit 'ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba':
  Fix issue #3152415: Various confusions in docs about Application
 2010-11-01 12:52:36 -07:00
Dianne Hackborn
ce0f9e4e4f am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
  Fix issue #3152415: Various confusions in docs about Application
 2010-11-01 12:49:51 -07:00
Dianne Hackborn
7025d8e4b9 Fix issue #3152415: Various confusions in docs about Application 
Change-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83
 2010-11-01 09:49:37 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 13:10:22 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:41:48 -07:00
Scott Main
6ec3d4f0dc docs: add more info about state list drawable and onclick attribute to Button 
bug:1062898

Change-Id: I633c38fc20a2ebf894237f86648cc0fdc9488b1a
 2010-09-22 18:55:31 -07:00
Dirk Dougherty
40da25a26e am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:32:30 -07:00
Dirk Dougherty
8ee9ecc145 am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:19:54 -07:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -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
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
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