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

63701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
842b4e22e3 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 'fff19ee88baff16e144d1bfc23c25a4b7f2cb191':
  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:28:37 -08:00
Scott Main
fff19ee88b 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:25:27 -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
3f6912e5e8 am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings 
* commit 'f3cbcf439692b180ec5081cc68ed67c8f2a9d16d':
 2012-03-06 14:01:48 -08:00
Scott Main
15b7481d34 am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings 
* commit '40dbc3db62006f81656043e174e9019c89686e9b':
  docs: a few more Market -> Play strings
 2012-03-06 13:59:34 -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
Scott Main
40dbc3db62 am 97b94e78: docs: a few more Market -> Play strings 
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
 2012-03-06 13:57:32 -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
20d28a8265 am 2ef5d3fd: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '2ef5d3fd2e4114a141676dad94f9b0352392290a':
 2012-03-06 09:43:18 -08:00
Dirk Dougherty
fad7db430c am 106cdc6a: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '106cdc6aba5af0d544da3042e2e8d2f8b6b1ead1':
  Update build-a-button to use new assets.
 2012-03-06 09:40:46 -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
106cdc6aba am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
  Update build-a-button to use new assets.
 2012-03-06 09:38:31 -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
5d37e4d7e7 am 21b45b62: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '21b45b624f5b5f888d0bfa89da7ecb58a0398dbe':
 2012-03-06 01:21:27 -08:00
Android Git Automerger
3e22047d1c Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-06 01:21:24 -08:00
Pin Ting
98dd487048 am 3b37fe24: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '3b37fe24072ec4f176896e852eeca4d3a44dc05f':
  Fix document.
 2012-03-06 00:59:57 -08:00
Pin Ting
3b37fe2407 am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '25c66c3a4a51617099e848a9376313c90a1ec9ae':
  Fix document.
 2012-03-06 00:57:55 -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
73a7859b87 am ed9651c9: 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 'ed9651c900ea2f0d67d3256080a7e7386a758d21':
  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:50:58 -08:00
Scott Main
9d4ea2ba00 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 'fb825c80ac0170fc2e5996a4fbc8f5bc8563ccae':
  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:50:46 -08:00
Scott Main
fb825c80ac 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:44 -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
391bb52201 am 859717ad: am 4d7bc655: Doc change: String changes for Android Market 
* commit '859717ad627374c6e6ceae9f7cccf73084cb5fae':
 2012-03-05 23:15:38 -08:00
Dirk Dougherty
532679a5ed am 56bab8bd: am 4d7bc655: Doc change: String changes for Android Market 
* commit '56bab8bd83c4f54f876fdd76fc241197920129db':
  Doc change: String changes for Android Market
 2012-03-05 23:14:22 -08:00
Dirk Dougherty
56bab8bd83 am 4d7bc655: Doc change: String changes for Android Market 
* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
  Doc change: String changes for Android Market
 2012-03-05 22:55:49 -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
Scott Main
a38efc8d74 am f246facb: am e606cb46: docs: fix api dashboard 
* commit 'f246facbf9c8c1ba5394e3ddb06569dd9914e543':
 2012-03-05 20:23:33 -08:00
Scott Main
0bcf5e37d2 am 5ab7b3d1: am e606cb46: docs: fix api dashboard 
* commit '5ab7b3d111feb28def87b3ed40b3e877c5f977e2':
  docs: fix api dashboard
 2012-03-05 20:21:48 -08: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
5ab7b3d111 am e606cb46: docs: fix api dashboard 
* commit 'e606cb460272cd99bac05b4477a5e489827b368b':
  docs: fix api dashboard
 2012-03-05 20:19:53 -08:00
Scott Main
e606cb4602 docs: fix api dashboard 
Change-Id: Ifbd596860f3368811e31494176682571be919459
 2012-03-05 20:15:38 -08:00
Scott Main
3f584a0523 am b7ffa62c: am 290684ac: docs: fix expansion library package name 
* commit 'b7ffa62c6b0e5dd8850933ed6c60698c5f4ca109':
 2012-03-05 17:44:22 -08:00
Scott Main
5844b62652 am 1054c676: am 290684ac: docs: fix expansion library package name 
* commit '1054c676ff7f7742b5b1cfafaaf9cb198fd291f1':
  docs: fix expansion library package name
 2012-03-05 17:43:04 -08:00
Scott Main
1054c676ff am 290684ac: docs: fix expansion library package name 
* commit '290684ac2eadf786d2f478d3d280eb3058627789':
  docs: fix expansion library package name
 2012-03-05 17:40:43 -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
caa8d28790 am a216ff33: am a47d88a7: docs: dashboard update for march 5 
* commit 'a216ff330bd1e869939ef0ed7b400f76564b2793':
 2012-03-05 14:53:02 -08:00
Andrew Flynn
6087dfcce1 DO NOT MERGE Return 1.5 * density as default for large screens. 
Change-Id: Ib2d390803f08812636364ceb3849eddf80044072
 2012-03-05 14:51:36 -08:00
Ramanan Rajeswaran
4ec961d575 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-03-05 14:51:36 -08:00
Dianne Hackborn
b663a4b7da Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-03-05 14:51:35 -08:00
Ramanan Rajeswaran
5e7bb1e675 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-03-05 14:51:35 -08:00
Dianne Hackborn
e6a0ec6060 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-03-05 14:51:35 -08:00
Scott Main
5186f094ba am 8b0f6881: am a47d88a7: docs: dashboard update for march 5 
* commit '8b0f688156919cec527bc60df43c527d2dd940dc':
  docs: dashboard update for march 5
 2012-03-05 14:39:46 -08:00
Scott Main
a216ff330b am a47d88a7: docs: dashboard update for march 5 
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
 2012-03-05 14:36:47 -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