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

2920 Commits

Author SHA1 Message Date
Megha Joshi
b6c90f03c9 am b5ef90be: am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'b5ef90bee0d8aaf61be0da705066b1f262c88873':
  A few updates for TVs.
 2012-03-08 12:31:44 -08:00
Megha Joshi
7ec22d33ac am 5c2fa5e5: am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '5c2fa5e5c94994822e8e4b139f8db5799568240f':
  Adding TV related updates.
 2012-03-08 12:26:44 -08:00
Megha Joshi
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -08:00
Megha Joshi
84099f3d78 Merge "Adding TV related updates." into ics-mr1 2012-03-08 12:20:21 -08:00
Megha Joshi
500cc4be2f A few updates for TVs. 
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
 2012-03-08 12:18:00 -08:00
Scott Main
efda0aed4f am f2c57b31: am 5e75bca9: am 99e790de: docs: add troido adk link 
* commit 'f2c57b31424c5395d0ed1d23b1f5e00f274a2774':
  docs: add troido adk link
 2012-03-08 08:08:42 -08:00
Megha Joshi
87e32816c4 Adding TV related updates. 
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
 2012-03-07 17:19:44 -08:00
Roman Nurik
8398f19f5c am f4d8fa60: am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit 'f4d8fa6090f88ad84a543feba7fc74806af47ef4':
  docs: move Android Design from static HTML to JD
 2012-03-07 17:05:19 -08:00
Scott Main
75de60c018 am 842b4e22: am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '842b4e22e31f0fd976fa1b92620d680b7c37e78a':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-07 17:05:13 -08:00
Scott Main
a56d9b9d3f am 15b7481d: am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings 
* commit '15b7481d34a2c9a154cd68811860b1f4e1d41962':
  docs: a few more Market -> Play strings
 2012-03-07 17:05:07 -08:00
Dirk Dougherty
e6c6624614 am fad7db43: am 106cdc6a: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit 'fad7db430cac4a41eba2ce0b0710d551197c63e5':
  Update build-a-button to use new assets.
 2012-03-07 17:04:49 -08:00
Pin Ting
1d62c2f810 am 98dd4870: am 3b37fe24: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '98dd4870487d69be34059e70e3e86f05347d1afa':
  Fix document.
 2012-03-07 17:04:39 -08:00
Scott Main
fd18e5624e am 9d4ea2ba: am fb825c80: am 1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push) 
* commit '9d4ea2ba00904e85c2ecd31e4e75193dfa3c6787':
  docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
 2012-03-07 17:04:36 -08:00
Dirk Dougherty
e61cad321d resolved conflicts for merge of 532679a5 to master 
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
 2012-03-07 16:58:03 -08:00
Scott Main
08a991c7cb am 0bcf5e37: am 5ab7b3d1: am e606cb46: docs: fix api dashboard 
* commit '0bcf5e37d2fcb1ef54a494dca7f218ed2009ca7a':
  docs: fix api dashboard
 2012-03-07 15:40:05 -08:00
Scott Main
c083ff092b am 5844b626: am 1054c676: am 290684ac: docs: fix expansion library package name 
* commit '5844b6265292e1e8b22d6f1179e28bacc11c057b':
  docs: fix expansion library package name
 2012-03-07 15:39:58 -08:00
Scott Main
99e790de9e docs: add troido adk link 
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
 2012-03-06 16:17:08 -08:00
Roman Nurik
96c757e557 Merge "docs: move Android Design from static HTML to JD" into ics-mr1 2012-03-06 14:39:54 -08:00
Scott Main
66895ad5f7 Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 2012-03-06 14:23:23 -08:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD 
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
 2012-03-06 12:26:15 -08:00
Scott Main
97b94e784c docs: a few more Market -> Play strings 
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
 2012-03-06 12:10:17 -08:00
Scott Main
19fa8fee25 Fix badge generator URLs and images, and update 
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.

Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
 2012-03-06 11:46:30 -08:00
Dirk Dougherty
9ad3d0ee5b Update build-a-button to use new assets. 
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
 2012-03-06 09:28:17 -08:00
Pin Ting
25c66c3a4a Merge "Fix document." into ics-mr1 2012-03-06 00:55:49 -08:00
Pin Ting
6f5b5ee321 Fix document. 
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
 2012-03-06 16:34:21 +08:00
Scott Main
1c24730422 docs: update homepage announcement for GP 
Still needs an update with proper blog link
(will probably do by hand for launch push)

Change-Id: I660082780ffd27cf591351e6b65be61a109a6d5d
 2012-03-05 23:36:26 -08:00
Dirk Dougherty
4d7bc65538 Doc change: String changes for Android Market 
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
 2012-03-05 22:02:35 -08:00
Scott Main
e606cb4602 docs: fix api dashboard 
Change-Id: Ifbd596860f3368811e31494176682571be919459
 2012-03-05 20:15:38 -08:00
Scott Main
290684ac2e docs: fix expansion library package name 
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
 2012-03-05 17:35:36 -08:00
Scott Main
74e8d6261a am 5186f094: am 8b0f6881: am a47d88a7: docs: dashboard update for march 5 
* commit '5186f094ba6d37f47ae52085e34dd87267ec41d4':
  docs: dashboard update for march 5
 2012-03-05 14:43:11 -08:00
Scott Main
a47d88a7d2 docs: dashboard update for march 5 
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
 2012-03-05 14:32:15 -08:00
Scott Main
035e7700de am 2814c8be: am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:30:15 -08:00
Scott Main
2df6ecc508 docs: add note about declaring file sizes with sample app's code 
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
 2012-03-05 13:22:56 -08:00
Scott Main
5e63175da7 am 6c4faf74: am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6c4faf74ae45ebd705620144150acfb677844523':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:56:43 -08:00
Scott Main
6f63d6fc04 Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 2012-03-05 11:51:03 -08:00
Scott Main
837a5d83f5 docs: updates to OBB guide for naming; plus other edits 
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
 2012-03-05 11:49:12 -08:00
Scott Main
b8b36b8b78 am dc022a6f: am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker 
* commit 'dc022a6f9aa30d9282c4f82c1cc4d1c8bde7e808':
  docs: fix misc bugs from external tracker
 2012-03-05 10:09:44 -08:00
Scott Main
93dc642eaf docs: fix misc bugs from external tracker 
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
 2012-03-02 16:55:41 -08:00
Scott Main
08e1ce82af am a9fae13e: am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li 
* commit 'a9fae13e81fe8211b95bd55a42f3a9b612adfe48':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
 2012-03-02 16:45:44 -08:00
Scott Main
4143781cde docs: add docs for market OBB 
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing

Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
 2012-03-02 16:29:33 -08:00
Robert Ly
861d5ecc7c am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'b962b98bef33eba634aec41cf9d84527ce9db3bb':
  docs: fixing bug 5942573
 2012-03-02 09:11:54 -08:00
Robert Ly
e5e11fd666 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
Robert Ly
24ed1b2fb5 am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445
 2012-03-01 16:46:55 -08:00
Robert Ly
dcc910ea6e Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Roman Nurik
ae9029938a am b96ad49a: am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'b96ad49a3a898b741f7c4d6854e599116546e2ac':
  docs: Android Design downloads section, linkable H2s.
 2012-03-01 09:08:33 -08:00
Roman Nurik
a53b3bfaad docs: Android Design downloads section, linkable H2s. 
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
 2012-02-29 12:15:32 -08:00
Vikram Aggarwal
04bf50c352 affect -> effect and incorrect possessive 
Change-Id: I75bcbdf35676b17a6e16b47710dddcfc99032212
 2012-02-27 11:16:14 -08:00
Robert Ly
4709a11b5d am 9dc8ea87: am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '9dc8ea87b5016ca838373ff4996e9c92247aa224':
  docs: fix bug 5990526
 2012-02-27 08:49:04 -08:00
Robert Ly
85cb9dece2 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -08:00
Nick Kralevich
1b05438ff3 projects-eclipse: fix typo 
Change-Id: I15962bd566b0375e8ca50c1b61350f06e6733389
 2012-02-24 09:05:00 -08:00