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

1396 Commits

Author SHA1 Message Date
Scott Main
2e6c04b460 Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break" 2011-07-27 11:58:10 -07:00
Scott Main
20956baf92 Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build" 2011-07-27 11:58:01 -07:00
Scott Main
2c03247b90 cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 
fix doc break

Change-Id: I8bc19538145e5436128ecbe632d6ecd20ea8ab7a
 2011-07-27 11:57:15 -07:00
Scott Main
ff8ba6533e cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 
fix sdk build

Change-Id: I5095cb2413abc08fbf5c8965f3f27bff2a8b2d68
 2011-07-27 11:56:27 -07:00
Scott Main
44ec74db19 cherrypick Change-Id: Ib2decf325271c50cac3202bad8c4bbbc40d233f2 
docs: add tvdpi info
also resolve issue 5018379 with more info about how size resources are selected

Change-Id: Ib16d4ba81e4ff8ab798bcdfcfc4e086fedac5a1a
 2011-07-27 11:52:06 -07:00
Scott Main
71825f49d7 cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c 
docs: add info to plural strings about using string formats

Change-Id: Id02c3ed8215869724092ce143e71142238098358
 2011-07-27 11:50:00 -07:00
Scott Main
56def45c1e cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 
docs: fix shapedrawable doc error
issue 5030364

Change-Id: I5bc56eb659eabd7e5069d1d7b9c4884f387a61ad
 2011-07-27 11:48:22 -07:00
Scott Main
3e485d07a4 cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 
docs: add k-touch driver id

Change-Id: I78a36ead667db734a6a4ceb016176a9b1e3bd616
 2011-07-27 11:46:54 -07:00
Scott Main
db909162b2 cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 
docs: update Support Mult Screens for MR2 features

Change-Id: Ibab5e60c05c71d58f11daa6f48894011b3e31509
 2011-07-27 11:35:17 -07:00
Bill Gruber
304b8dc4e1 Merge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates" 2011-07-27 10:29:57 -07:00
Bill Gruber
2b8af620de Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 sdk doc change: updated intro to developing and removed reference to G1 Bug: 4483863" 2011-07-27 10:29:47 -07:00
Robert Ly
8191f510b5 Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51" 2011-07-27 10:27:59 -07:00
Robert Ly
0fa3d7012f Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4" 2011-07-27 10:27:53 -07:00
Robert Ly
b04d0d36cc Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b" 2011-07-27 10:27:46 -07:00
Robert Ly
d6fea51121 Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989" 2011-07-27 10:27:39 -07:00
Bill Gruber
10914d5f8b Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 
sdk doc change: updated intro to developing and removed reference to G1
Bug: 4483863

Change-Id: Ic8d342145ed909ee5592e93a3055887e478a5688
 2011-07-27 09:58:02 -07:00
Bill Gruber
32db3fc25b Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f 
IAB docs: fixes and updates

Change-Id: I0a9d782a83ca16b27c3e90f7bfc19bb9bca5e908
 2011-07-27 09:50:26 -07:00
Robert Ly
f2ccec39c2 cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60e 
Change-Id: I15aaa631796673a9e552497b2ae6d5f1d17cb6d6
 2011-07-26 14:12:24 -07:00
Robert Ly
81667e36c8 cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989 
Change-Id: Ibaa0c4bd277dbab1bc01861ebd2af16b3adf521e
 2011-07-26 14:10:58 -07:00
Robert Ly
6e7c7a2a68 cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b 
Change-Id: I37fb07126676737d16294e64ac974c0da39a3b05
 2011-07-26 14:10:04 -07:00
Robert Ly
85eedb7b14 cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4 
Change-Id: I19ed647790ed4781762f09897ec76a4348059fb2
 2011-07-26 14:09:08 -07:00
Robert Ly
c80b7ad6e0 cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51 
Change-Id: I1b027de2c5e5cf370f19d7b64807135b1d0413da
 2011-07-26 14:08:05 -07:00
Gilles Debunne
c40c65a732 Minor dash typos in documentation 
Change-Id: Ie0cbe870d4595dc566720a99f7604cb8365d8ffd
 2011-07-21 15:25:41 -07:00
Dirk Dougherty
a43c477793 Cherrypick from honeycomb-mr2: Doc change: add HC MR2 version notes and update api level info. 2011-07-20 17:53:29 -07:00
Elliott Hughes
4387335ba3 Manually merge the changes made in honeycomb-mr2 to get this on the web. 
We'd made good changes in both branches.

Change-Id: I64fb4f1ff06da8767c5a6cee9fbcc2b955d6e207
 2011-07-20 15:02:35 -07:00
Elliott Hughes
13bac60349 Fix a few things in the JNI docs. 
Change-Id: I375a2113c385d911770efec2f3172ed882c0d3c6
 2011-07-19 14:59:56 -07:00
Scott Main
605a80f3c3 am 9b446cd6: am bc047bb0: am e32c49ab: docs: de-new sidenavs 
* commit '9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
  docs: de-new sidenavs
 2011-07-13 14:55:15 -07:00
Robert Ly
a704daa8b1 docs: fix for bug 3186839 
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
 2011-07-13 14:25:52 -07:00
Scott Main
e32c49ab2c docs: de-new sidenavs 
Change-Id: I2aaafe763e4b006059222677e563963d3284d314
 2011-07-11 16:03:10 -07:00
Joe Fernandez
0fbe1dfb8d Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 2011-07-07 15:03:55 -07:00
Scott Main
b623842e28 am 33f6d634: am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps 
* commit '33f6d6347b88d239b16a6b3f28adcb7bf4a61881':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
 2011-07-07 11:23:25 -07:00
Scott Main
40afb97c32 cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 
docs: add button builder for android market apps

Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
 2011-07-07 10:08:15 -07:00
Joe Fernandez
dbad9d4e98 cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c 
Change-Id: I6401f568ec132d959d57f32caa8b45b2613229e6
 2011-07-06 15:36:45 -07:00
Jason Sams
04a3ae0d30 Merge "docs: Re-write of OpenGL Framework topic bug 4285030" 2011-07-06 13:29:29 -07:00
Chet Haase
ac8ebfccc3 Minor ADK guide doc fixes. 
Change-Id: I3e2966c6f6b1ef309dffdb6089abe69e36ec8bb2
 2011-07-06 08:59:14 -07:00
Joe Fernandez
a53afedf78 docs: Re-write of OpenGL Framework topic 
bug 4285030

Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
 2011-06-29 16:40:22 -07:00
Robert Ly
5a99645c38 am d1e78095: am 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2 
* commit 'd1e78095452379e39a354c651d6c6cab351c52d5':
  docs: fixing new superscript for rs
 2011-06-27 14:15:46 -07:00
Scott Main
0868f458cc am 7c58d671: am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 
* commit '7c58d671d542f3a9923a9ea2e63b46005d81a445':
  docs: add emphasis to adding a search button in activity UI
 2011-06-27 14:14:37 -07:00
Scott Main
4971c3c4a1 am 44b48a37: am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit '44b48a377d47bb27b667ab87347f0a88ba3fba0b':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-27 14:14:26 -07:00
Robert Ly
491a6de28d docs: fixing new superscript for rs 
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
 2011-06-27 10:33:01 -07:00
Scott Main
01ecdcc756 am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2 
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
  docs: add Lenevo driver info
 2011-06-24 17:15:53 -07:00
Scott Main
090117774a am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
  docs: add info about manifest attributes that should not change
 2011-06-23 14:30:30 -07:00
Scott Main
16d1f17675 am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title 
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
  docs: remove exclamation from media title
 2011-06-23 14:29:50 -07:00
Katie McCormick
c182bd5162 am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit '023622997d886074f7c0cf831945a466803acf5e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-23 14:29:25 -07:00
Scott Main
f8d37ab6b3 Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 2011-06-23 13:08:27 -07:00
Scott Main
72e0df6573 docs: add emphasis to adding a search button in activity UI 
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
 2011-06-23 13:07:26 -07:00
Scott Main
9a05cfe542 docs: update docs for new screen support attributes and qualifiers 
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
 2011-06-23 11:35:07 -07:00
Scott Main
1acd2a7f2b Merge "docs: add Lenevo driver info" into honeycomb-mr2 2011-06-23 09:18:22 -07:00
Robert Ly
f64d0ef991 am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-23 08:17:23 -07:00
Bruno Oliveira
f14192bc4f am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-23 08:16:55 -07:00