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

6551 Commits

Author SHA1 Message Date
Scott Main
212075889e am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-11 17:43:42 +00:00
Scott Main
2ada4e310d am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-11 17:43:38 +00:00
Katie McCormick
07c0ad973a Merge "Doc update: new doc studio layout editor" into klp-docs 2014-03-10 21:51:32 +00:00
Scott Main
29de506333 Merge "fix some typos for GoogleApiClient doc" into klp-docs 2014-03-10 16:21:10 +00:00
Scott Main
69e49a819a Merge "fix typos" into klp-docs 2014-03-10 16:20:45 +00:00
Katie McCormick
88b5384969 Doc update: new doc studio layout editor 
Change-Id: Iaeb99dca97086540e7d10f9de9e2978439ddebd9
 2014-03-05 14:44:17 -08:00
David Friedman
afe2f2a65d am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 
* commit '4c4160a041643072f0bcfbdcfbcc904796dd0a5c':
  NDK r9d: Incorporates all review comments, final file sizes.
 2014-03-04 08:25:29 +00:00
David Friedman
b0a6241b4d am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 
* commit '58d4906bbf9095c375bffa65d4249eba60cd49b4':
  NDK r9d: Incorporates all review comments, final file sizes.
 2014-03-04 08:18:51 +00:00
David Friedman
663d7753ea am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 
* commit '6aa6219aebc2a73c63e2f0e5f82d3dc55f0a6f9f':
  NDK r9d: Incorporates all review comments, final file sizes.
 2014-03-04 08:13:06 +00:00
David Friedman
9182e5f848 DO NOT MERGE 
Moving change to release branch

NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
(cherry picked from commit 0cdefe09695651e4a56dd980219710af8e1039a3)
 2014-03-04 04:38:06 +00:00
David Friedman
6aa6219aeb Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 2014-03-04 04:25:39 +00:00
Scott Main
0f6fa5dbd1 am 4cd08e44: am 031020a7: am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2. 
* commit '4cd08e4445afae142e656ccd5bc6d4fa9bbf816e':
  update google play badge AI files, v2.
 2014-03-04 03:24:50 +00:00
Scott Main
031020a7bf am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2. 
* commit 'b8881542c4e49c1d38eede36a018690a322c6b63':
  update google play badge AI files, v2.
 2014-03-04 03:17:58 +00:00
Scott Main
1f8bd43378 am 2970654a: am 0109047d: update google play badge AI files, v2. 
* commit '2970654a6ad2ebcfaabcb58d120b28987111602a':
  update google play badge AI files, v2.
 2014-03-04 03:11:40 +00:00
Scott Main
0109047de1 update google play badge AI files, v2. 
Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7
 2014-03-03 19:04:20 -08:00
Scott Main
a5d75a93a5 am 653bd16a: am b6efa7a3: am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '653bd16a0caad1e096ce981985f0617f49742a07':
  dashboard update for march '14
 2014-03-04 03:04:07 +00:00
Scott Main
b6efa7a3fa am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '290fec2e2e4a588d6b2fc48ec4aa25ebf83acf31':
  dashboard update for march '14
 2014-03-04 02:57:43 +00:00
Scott Main
b436b93d98 am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '318c73a0df694bb82821bfc4e2cd874bb09b2fab':
  dashboard update for march '14
 2014-03-04 02:50:53 +00:00
Scott Main
4a5a23920e Merge "dashboard update for march '14" into klp-docs 2014-03-04 02:45:26 +00:00
David Friedman
0cdefe0969 NDK r9d: Incorporates all review comments, final file sizes. 
Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
 2014-03-03 18:31:13 -08:00
Ricardo Cervera
f207051ae4 am bd443abc: am 07993d1d: am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit 'bd443abc0d6b90cff54c89454e19f86889455edd':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:30:53 +00:00
Ricardo Cervera
07993d1d80 am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '13a14ac43b8184b082d5107d1e746fe4e16ce563':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:22:55 +00:00
Ricardo Cervera
a61e74e164 am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '7e4db882c55b5f5d46a3b6da1c66f5dd31b601ca':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:13:47 +00:00
Ricardo Cervera
ea40a2642b docs: Changes to release notes for the Android SDK 22.6.0 release. 
Updated relese notes for 22.6.0:

Stage:
http://quixote.mtv.corp.google.com:8001/sdk/index.html
http://quixote.mtv.corp.google.com:8001/sdk/installing/installing-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/eclipse-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/tools-notes.html
http://quixote.mtv.corp.google.com:8001/tools/revisions/build-tools.html

(Patch: Cleared md5 and ZIP entries. To be updated with values for
 the final build when available.)
(Patch: Added emulator bugfixes from Xav.)
(Patch: Addressed Joe's comments. Added filenames and checksums for the
 rc7 build)
(Patch: Replaced sizes and hashes with values for rc8)
(Patch: Added lint categories, addressed Joe's comments)
(Patch: Added note on the lint issue)
(Patch: Addressed Joe's comments, reverted adt-bundle-* to 20131030 files.)

Change-Id: I508d47959c4f478a3ed6b927fd460139cd5cfe36
 2014-03-03 16:41:10 -08:00
Scott Main
22a9fb31a4 dashboard update for march '14 
Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
 2014-03-03 14:00:59 -08:00
Scott Main
52d5190052 fix typos 
Change-Id: I28bcbf5ae5fade081d9b71701f5568145d700e9c
 2014-02-26 10:34:54 -08:00
Scott Main
3196d811d0 am a0e30c4b: am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'a0e30c4b9dc1b0acb019f07c0d124d97740c93a2':
  add android studio to launch procedures
 2014-02-22 04:10:11 +00:00
Scott Main
5670ddea3b am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'f8a68404c767cf4e5f3e63ab53737472066a90c1':
  add android studio to launch procedures
 2014-02-22 00:57:36 +00:00
Scott Main
271f85399b am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'b26117aca0daadeb51369c8da617d5b7ba9b05b6':
  add android studio to launch procedures
 2014-02-22 00:50:08 +00:00
Scott Main
25b44ae684 Merge "add android studio to launch procedures" into klp-docs 2014-02-22 00:43:26 +00:00
Elliott Hughes
449e46600f am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '0047d3e025b43fd2dc05734f7ea6229291445046':
  Miscellaneous small documentation fixes.
 2014-02-21 17:37:54 +00:00
Elliott Hughes
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
 2014-02-21 17:28:51 +00:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Scott Main
83b6e4b937 am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 21:27:47 +00:00
Scott Main
72eff55b2c am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'd43ad2f35abcc647f7985abd09ed9de5899faf18':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:25:57 +00:00
Scott Main
4c68c4ed46 am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '24a8e1d0e9a32c571403bfc730ce18dd138a529c':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:20:30 +00:00
Scott Main
8ad4275640 update intent examples for maps 
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
 2014-02-19 18:08:33 -08:00
Dirk Dougherty
5da502a5b2 am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit 'b9378d8108555c920880d7ec7ec4122b04fb2960':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 11:27:30 +00:00
Dirk Dougherty
321cd18ab2 am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '820bb4bdd358bfaac446b8ce4af5474dcfc77613':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:53:48 +00:00
Dirk Dougherty
9c50271dc3 am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '257f67249afb017c9a3d0a79e545da567aa5bd02':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:47:02 +00:00
Dirk Dougherty
35cb4e4936 Doc change: add new samples TOC groups and landing pages. 
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
 2014-02-12 19:38:51 -08:00
Dirk Dougherty
a97e177857 Merge commit '47d3eaf6' into manualmerge 
Conflicts:
	docs/html/design/patterns/accessibility.jd
	docs/html/design/patterns/actionbar.jd
	docs/html/design/patterns/compatibility.jd
	docs/html/design/patterns/multi-pane-layouts.jd
	docs/html/design/style/iconography.jd

Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
 2014-02-12 19:31:15 -08:00
Scott Main
d5251a387e add android studio to launch procedures 
Change-Id: Ic0d923478babf3de2b0cb31b26d57884ea886d7b
 2014-02-12 17:14:42 -08:00
Joe Fernandez
c462073b24 am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '8853b9c4b478df6ac8286d3dc825aa821f375afa':
  MediaRouter Developer Guide
 2014-02-13 01:11:51 +00:00
Dirk Dougherty
958a7f725d am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:43:56 +00:00
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
 2014-02-12 23:33:43 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
 2014-02-12 23:19:10 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00