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

3368 Commits

Author SHA1 Message Date
Scott Main
183bf11697 docs: misc bug fixes from external issues 
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
 2012-08-13 19:12:13 -07:00
Peter Ng
55ed7e34b9 am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '3e504ac71715a1b152494c9765f41d13bc605b75':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 16:57:05 -07:00
Peter Ng
ab0b9a9e4e am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '68432f7691085b82096518f47703d59e83cb934d':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150 am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '250da641302aa98c91855f195cc881880aa69172':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:55:08 -07:00
Peter Ng
3e504ac717 Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
68432f7691 Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
250da64130 Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 2012-08-13 16:52:38 -07:00
Peter Ng
02123630ca Multiple design styleguide fixes 
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed

Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869

Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
 2012-08-13 13:22:21 -07:00
Scott Main
922e038b08 am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev 
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues
 2012-08-09 17:03:16 -07:00
Scott Main
ea31b47a72 Merge "fix misc doc bugs from external issues" into jb-dev 2012-08-09 17:00:52 -07:00
Scott Main
4b4bd1b345 am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps 
* commit '607079d8098f3bf6632913a6edd0bc6d6f9167d7':
  docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
 2012-08-09 16:43:18 -07:00
Scott Main
cb0b2df114 fix misc doc bugs from external issues 
Change-Id: I11b1d524dd2159b58c65d3ef7a76af15624ae365
 2012-08-09 16:38:12 -07:00
Scott Main
607079d809 docs: SDK r20.0.3, Support Library r10 Release Notes 
plus some OCD cleanup to the ADT install steps

Change-Id: I760ddb284da2a3f53741b75d6ff0e02af8181c9a
 2012-08-09 14:13:22 -07:00
Peter Ng
ed12067b08 updated downloads for styleguide 
-new illustrator stencil

Bug: 6548259
Bug: 6948358

Change-Id: Idd5b590426ba2234c7bcc40a5e9e75464ec10723
 2012-08-07 21:50:22 -07:00
Peter Ng
252d23d8bb Revert "Group revert of the following commits for design docs:" 
This reverts commit c9506415d533c61a9607c5b61a1993747bafb406.
 2012-08-07 20:19:10 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
 2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file 
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable 
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
 2012-08-07 13:59:12 -07:00
Scott Main
40eee61e25 docs: fix broken links 
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
 2012-08-06 18:04:23 -07:00
Scott Main
bd24f5cca5 am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page 
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
 2012-08-06 15:48:08 -07:00
Scott Main
53b0fda5fd misc doc bugs. 
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
 2012-08-06 15:43:01 -07:00
Dirk Dougherty
265eea82ae am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev 
* commit '568db47b770cbfaacdd54914540923258cd6f847':
  Doc change: add trademarks attribution.
 2012-08-02 14:57:50 -07:00
Dirk Dougherty
568db47b77 Merge "Doc change: add trademarks attribution." into jb-dev 2012-08-02 13:42:17 -07:00
Dirk Dougherty
5baafabafd Doc change: add trademarks attribution. 
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
 2012-08-02 09:21:30 -07:00
Scott Main
80adeb535f am 5ae754c9: Merge "fix markup for gl pie" into jb-dev 
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
  fix markup for gl pie
 2012-08-01 17:04:58 -07:00
Scott Main
5ae754c93a Merge "fix markup for gl pie" into jb-dev 2012-08-01 16:59:45 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:49:38 -07:00
Scott Main
a18e0b4647 fix markup for gl pie 
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
 2012-08-01 16:31:19 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
 2012-08-01 16:24:25 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb 
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
 2012-08-01 16:14:47 -07:00
Katie McCormick
a5e150c95c Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 2012-08-01 16:13:36 -07:00
Scott Main
a9a3c25a52 am c9506415: Group revert of the following commits for design docs: 
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs:
 2012-08-01 16:07:18 -07:00
Katie McCormick
ec4ec27ea6 cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1 
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
 2012-08-01 16:01:18 -07:00
Scott Main
c9506415d5 Group revert of the following commits for design docs: 
ce470e17fd4298c1b8aa9a5fd7493bde7a6be840
8874ab0473f4db10e71bf0537c0703db03bac4ee
bdd8d0fada73dabbda7f6f174c17317d1e30a79e
6443ca4cd9406ed8e9ba55461d4b2eb677aad17a
5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e
1edd4ae5c4748bd9d1e64f65dc554790063d59b8
be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff
6a681afd38d9881154207436e5e145856e9d2f75
353474c0acdad9b8ffdb86d3d5f32137885dd720
2b1584c1d53cd1070d5157c07158828b4baf8844

Had to revert these because they're not ready to be published.

Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
 2012-08-01 15:51:29 -07:00
Peter Ng
7bf1831550 am 2b1584c1: new confirming page and updates to progress and iconography 
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
  new confirming page and updates to progress and iconography
 2012-08-01 15:12:26 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
 2012-08-01 14:55:22 -07:00
Katie McCormick
613d0b1253 Doc update: Misc minor GCM updates. 
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd
 2012-08-01 13:45:15 -07:00
Peter Ng
2b1584c1d5 new confirming page and updates to progress and iconography 
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
 2012-08-01 13:16:02 -07:00
Scott Main
c82875e4c1 am e2594672: Merge "dashboard update for 8/1" into jb-dev 
* commit 'e2594672d279234459aba308c093f444b04c5e91':
  dashboard update for 8/1
 2012-08-01 12:54:29 -07:00
Scott Main
e2594672d2 Merge "dashboard update for 8/1" into jb-dev 2012-08-01 12:46:40 -07:00
Scott Main
45c159e31f dashboard update for 8/1 
Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
 2012-08-01 11:20:38 -07:00
Roman Nurik
1d17f5a917 am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 
* commit 'da5cb90b992a28c0affe0d52b3b53c1a7b839eb2':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
 2012-08-01 10:02:41 -07:00
Scott Main
bca689703d am 0d9d5831: Merge "fix more broken links" into jb-dev 
* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
  fix more broken links
 2012-08-01 10:02:24 -07:00
Roman Nurik
da5cb90b99 Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 2012-08-01 09:59:54 -07:00
Scott Main
0d9d583103 Merge "fix more broken links" into jb-dev 2012-08-01 09:58:53 -07:00
Roman Nurik
37eecc7e92 docs: Add Device Art Generator for Nexus devices to d.a.c/distribute. 
Most of this code is adapted from my code.google.com/p/android-ui-utils
project.

Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
 2012-08-01 09:05:37 -07:00