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

286 Commits

Author SHA1 Message Date
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
0b0eb1ac11 am 178d5005: am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit '178d500551c1d88a2e8ec9425d9cbfbb7d998113':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:26:32 -08:00
Scott Main
178d500551 am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit 'b94df620959de658990c1ed1263e2e1c42df7f6b':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:22:56 -08:00
Scott Main
b94df62095 cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: edit manifest samples to indicate <application> element is always last

Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
 2010-12-14 16:11:02 -08:00
Megha Joshi
87c03b58a9 am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread 
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
 2010-12-10 12:33:59 -08:00
Megha Joshi
7a1f15b149 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Megha Joshi
cc0c9daa91 Integrating webinar hosting with developer.android.com 
Change-Id: I320378560bbb09efade14f583dbcf2d66f34a9d8
 2010-12-09 11:42:12 -08:00
Scott Main
63635c6903 am 5f9d8ecd: am 83df6ead: am a45d6937: docs: dashboard update 
* commit '5f9d8ecd2040ab3958ba3251fa12f3505dc85c34':
  docs: dashboard update
 2010-12-01 14:02:26 -08:00
Scott Main
5f9d8ecd20 am 83df6ead: am a45d6937: docs: dashboard update 
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
  docs: dashboard update
 2010-12-01 13:59:08 -08:00
Scott Main
83df6ead8d am a45d6937: docs: dashboard update 
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
  docs: dashboard update
 2010-12-01 12:59:42 -08:00
Scott Main
a45d693757 docs: dashboard update 
Change-Id: Ia96a015dea41e32d1d2c892dddfd9a4fed5d49d0
 2010-12-01 12:48:39 -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
183ecbc229 docs: de-'new' samples and tutorials 
Change-Id: I49cbabcb1f3a915259588bc98b05a9d702f5eb2d
 2010-11-19 10:20:45 -08:00
Megha Joshi
7e05971692 am 48c698fc: Adding NFC sample resources (DO NOT MERGE) 
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
 2010-11-12 18:46:38 -08:00
Megha Joshi
48c698fc14 Adding NFC sample resources (DO NOT MERGE) 
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
 2010-11-12 18:35:49 -08:00
Scott Main
d4b5d85e2c am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread 
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
 2010-11-10 14:55:48 -08:00
Scott Main
77f5c9542e resolved conflicts for merge of 5a726729 to gingerbread 
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
 2010-11-10 14:46:44 -08:00
Scott Main
5a72672977 docs: remove "new" tags from sample apps 
Change-Id: I74dafa69f3638e2fe13c5edc7a54096943ffa164
 2010-11-10 14:16:09 -08:00
Jason Chen
15d18efddd resolved conflicts for merge of f0452c25 to master 
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
 2010-11-04 09:29:55 -07:00
Alexander Lucas
f0452c2507 am 6f4a084e: Merge "Added SIP Demo" into gingerbread 
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
  Added SIP Demo
 2010-11-03 15:35:29 -07:00
Alexander Lucas
a11c9e1506 Added SIP Demo 
Change-Id: I418bd272b42b82b9048934071322013f62ac0635
 2010-11-03 13:11:14 -07:00
Scott Main
6034ae6b97 am e06bdead: am fea07c60: am eda78cea: docs: update dashboard 
* commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274':
  docs: update dashboard
 2010-11-01 16:03:14 -07:00
Scott Main
e06bdead5d am fea07c60: am eda78cea: docs: update dashboard 
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
  docs: update dashboard
 2010-11-01 16:00:43 -07:00
Scott Main
fea07c6096 am eda78cea: docs: update dashboard 
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
  docs: update dashboard
 2010-11-01 15:57:38 -07:00
Scott Main
eda78ceaff docs: update dashboard 
Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
 2010-11-01 15:10:06 -07: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
024127c11f resolved conflicts for merge of f0b3fa60 to master 
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
 2010-10-25 17:54:33 -07:00
Scott Main
f0b3fa60db am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos
 2010-10-25 17:23:10 -07:00
Scott Main
c9ac107969 update featured videos 
also remove "new" tags from SDK and Resources nav items

Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
 2010-10-25 15:42:03 -07:00
Dirk Dougherty
ba944ccda3 Doc change: update screens support table and remove outdated density/size metrics. 
Change-Id: I05895b09e2198379a078c12489a2098f84865f58
 2010-10-04 09:48:48 -07:00
Scott Main
7091f66fc2 am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 
Merge commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6'

* commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6':
  docs: device dashboard update for 10/1
 2010-10-01 17:07:53 -07:00
Scott Main
de5e6afb01 am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 
Merge commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3' into gingerbread-plus-aosp

* commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3':
  docs: device dashboard update for 10/1
 2010-10-01 15:56:08 -07:00
Scott Main
32441bbe61 docs: device dashboard update for 10/1 
Change-Id: Ic2f712aed325f04cc94d137d42dc16a2e5845f75
 2010-10-01 11:31: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
Scott Main
8ca8ff106a am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '4cf0f45d6589d671be443471ea706bc7f299fbf1'

* commit '4cf0f45d6589d671be443471ea706bc7f299fbf1':
  docs: update platform dashboard
 2010-09-10 14:51:23 -07:00
Scott Main
4cf0f45d65 am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64' into gingerbread-plus-aosp

* commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64':
  docs: update platform dashboard
 2010-09-10 12:39:57 -07:00
Scott Main
51c18989cf docs: update platform dashboard 
Change-Id: Id4acf3ca425b278e534f83511fb10dfdbdceb03b
 2010-09-10 11:46:17 -07:00
Joe Malin
edb6566e62 Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12" 2010-08-24 18:07:33 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo 
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
 2010-08-21 09:44:53 -07:00
Scott Main
bb8d314b6c am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo 
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
 2010-08-19 17:40:10 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials 
Change-Id: I817e885524951853182b0458df4a32dea1614243
 2010-08-19 17:07:13 -07:00
Trevor Johns
c3deee13a2 am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15'

* commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:36:35 -07:00
Trevor Johns
1ef758b817 am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp

* commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:33:33 -07:00