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

99 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Trevor Johns
ca56ffe9e8 Fix subscribe links for Developer Forums doc. 
The email-based subscribe links for the Android Developer forums do
not work for two groups (android-discuss, android-beginners) due to
recent changes in those groups. These links need to be changed to
HTML-based subscribe links instead.

For consistency, other links are being changed to use the HTML-based
subscription mechanism as well.

Internal Bug: 2908002

Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
 2010-08-10 11:41:56 -07:00
Scott Main
fa32a45af7 am f2d16bc5: am 5aa4680e: update device dashboard 
Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp

* commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
  update device dashboard
 2010-08-02 17:45:05 -07:00
Scott Main
5aa4680eb0 update device dashboard 
Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a
 2010-08-02 17:38:37 -07:00
Dirk Dougherty
68344ba8a8 am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. 
Merge commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp

* commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1':
  Doc change: Add docs for licensing service.
 2010-07-26 20:04: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
7ccdfbee63 am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 
Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp

* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
 2010-07-15 18:19:27 -07:00
Scott Main
d59f1dea17 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 2010-07-15 18:14:16 -07:00
Scott Main
c9659424cf am b8f4a84a: am 80fa5c86: docs: dashboard update 
Merge commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp

* commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e':
  docs: dashboard update
 2010-07-15 18:14:07 -07:00
Scott Main
80fa5c866e docs: dashboard update 
Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
 2010-07-15 17:56:59 -07:00
The Android Open Source Project
7b1a207922 merge from open-source master 
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
 2010-07-12 15:35:31 -07:00
Romain Guy
2594066787 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Christian Mehlmauer
b91a4c4f23 Fixed a Documentation Error in the AsyncTask Contstructor 
Change-Id: Ic5fb9c613b9e358f1ea81996ee705831a77368db
 2010-07-12 20:02:25 +02:00
The Android Open Source Project
990d9ca416 merge from open-source master 
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
 2010-07-09 15:56:45 -07:00
Scott Main
db3b598c93 docs: update device dashboard; add historical chart 
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
 2010-07-01 14:57:41 -07:00
Chris Peterson
c05df82b36 update 404'd source.android.com URLs 
Change-Id: I4d3d2ae267c9f6da9f4969b3970cfb923ce8ef2f
 2010-06-25 17:32:20 -07:00
Scott Main
a99839cad7 docs: update notepad tutorial to change EditNote activity title and update codelab zip 
bug: 2762919
Change-Id: Iad1698893b949d921d2807730041e07694c06571
 2010-06-17 10:07:25 -07:00
Scott Main
bccedb03fa docs: update dashboard again 
Change-Id: Ia3ae9149879e355d15d42ac612e6a758c83b59f6
 2010-06-16 10:22:53 -07:00
Scott Main
b102a5e8c2 docs: update dashboard 
Change-Id: If8d1ad8aa99d93f707635631a44e6c359895302a
 2010-06-15 10:42:10 -07:00
Scott Main
6a29711872 Merge "docs: a couple doc bug fixes" into froyo 2010-06-02 13:43:18 -07:00
Scott Main
20a7612504 docs: a couple doc bug fixes 
Change-Id: I37b2adf9d30249eb9c0cbb007d9172d3956421b5
 2010-06-02 13:01:49 -07:00
Dirk Dougherty
3a206bc562 Doc change: updated dashboards stats. 
Change-Id: Id86dcc432d81fa4154995211d3e65a7c3366814e
 2010-06-01 09:53:52 -07:00
Dirk Dougherty
c7c7afd7a1 Doc change: Fix incorrect adt version reference etc. 
Change-Id: I79b3f43c64f3c0cd98b245dac001fca4a1008bda
 2010-05-24 09:07:14 -07:00
Dirk Dougherty
6bb6348f2a Doc change: cherry pick from eclair ->docs: add dashboard for screens 
update platform dashboard

Conflicts:

	docs/html/resources/dashboard/platform-versions.jd

Change-Id: I6d812085c96eb61e4f6d6e76af714292fa0d38b1
 2010-05-17 16:30:29 -07:00
Scott Main
5dd0fd5c89 docs: fix broken links 
Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab
 2010-05-12 14:49:38 -07:00
Dirk Dougherty
0d1b0814be Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
 2010-05-11 20:07:32 -07:00