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

62767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
68eac5c187 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:07:24 -08:00
The Android Automerger
34edcd250e merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:23:56 -08:00
Scott Main
161a8dec91 docs: remove link from GP logo 
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
 2012-03-09 19:12:53 -08:00
Scott Main
8edad6f16f docs: Fix a bunch of misc doc issues from external tracker 
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
 2012-03-09 12:30:40 -08:00
Andrew Flynn
dfc87c82e4 Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop 2012-03-09 11:00:14 -08:00
The Android Automerger
82da315263 merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:45:10 -08:00
Andrew Flynn
1d9af30b74 Use a different width for nav icons in sw600dp-port. 
Change-Id: I6c4024e9f60e14c072d7c01f29fabc89fc51dfb8
 2012-03-08 15:56:10 -08:00
Megha Joshi
fa71583e15 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:24:29 -08:00
Megha Joshi
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -08:00
Megha Joshi
702d9cbc5d am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '84099f3d788974169a8ea282f9413cb399d17012':
  Adding TV related updates.
 2012-03-08 12:22:05 -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
Megha Joshi
87e32816c4 Adding TV related updates. 
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
 2012-03-07 17:19:44 -08:00
Scott Main
3e29de0ed0 am 99e790de: docs: add troido adk link 
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
  docs: add troido adk link
 2012-03-07 17:19:06 -08:00
Scott Main
99e790de9e docs: add troido adk link 
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
 2012-03-06 16:17:08 -08:00
Roman Nurik
ce8697f8d5 am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:43:38 -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
bf03ee12db 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 '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  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-06 14:24:55 -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
Scott Main
f3cbcf4396 am 97b94e78: docs: a few more Market -> Play strings 
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
 2012-03-06 13:58:04 -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
2ef5d3fd2e am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
  Update build-a-button to use new assets.
 2012-03-06 09:39:02 -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
21b45b624f am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '25c66c3a4a51617099e848a9376313c90a1ec9ae':
  Fix document.
 2012-03-06 00:57:14 -08:00
Pin Ting
25c66c3a4a Merge "Fix document." into ics-mr1 2012-03-06 00:55:49 -08:00
Scott Main
ed9651c900 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 '1c2473042236dd63774d7a2c5edfd991b4ef1b3e':
  docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
 2012-03-06 00:48:08 -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
859717ad62 am 4d7bc655: Doc change: String changes for Android Market 
* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
  Doc change: String changes for Android Market
 2012-03-05 22:55:34 -08:00
Dirk Dougherty
4d7bc65538 Doc change: String changes for Android Market 
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
 2012-03-05 22:02:35 -08:00
Junichi Monma
08f49119dd DO NOT MERGE : New version of DroidSansFallback font 
This version updates U+FE43 and U+FE44 to make them a
bit wider. Copied from master, not cherry pick due to some file dependency reason.
Copying these file from master should be simple change.

Change-Id: I5ecefdcccba04a5d3adc07d52d792bf55ef58d04
 2012-03-06 14:57:34 +09:00
Scott Main
f246facbf9 am e606cb46: docs: fix api dashboard 
* commit 'e606cb460272cd99bac05b4477a5e489827b368b':
  docs: fix api dashboard
 2012-03-05 20:20:18 -08:00
Scott Main
e606cb4602 docs: fix api dashboard 
Change-Id: Ifbd596860f3368811e31494176682571be919459
 2012-03-05 20:15:38 -08:00
Scott Main
b7ffa62c6b am 290684ac: docs: fix expansion library package name 
* commit '290684ac2eadf786d2f478d3d280eb3058627789':
  docs: fix expansion library package name
 2012-03-05 17:40:27 -08:00
Scott Main
290684ac2e docs: fix expansion library package name 
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
 2012-03-05 17:35:36 -08:00
Scott Main
8b0f688156 am a47d88a7: docs: dashboard update for march 5 
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
 2012-03-05 14:36:05 -08:00
Scott Main
a47d88a7d2 docs: dashboard update for march 5 
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
 2012-03-05 14:32:15 -08:00
Scott Main
afdf856d43 am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:26:26 -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
a7368087d6 am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:52:59 -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
bde31762f9 am 93dc642e: docs: fix misc bugs from external tracker 
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
  docs: fix misc bugs from external tracker
 2012-03-05 10:06:04 -08:00
Scott Main
93dc642eaf docs: fix misc bugs from external tracker 
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
 2012-03-02 16:55:41 -08:00
The Android Open Source Project
37d6d98fe3 Reconcile with ics-mr1-release 
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
 2012-03-02 16:43:42 -08:00
Scott Main
cc902c78e4 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 licensing 
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  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:40:21 -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
The Android Automerger
1df09612c2 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00