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

2012 Commits

Author SHA1 Message Date
Scott Kennedy
aebeea4cf3 am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '5d6d6aab255aa17fde979d954c839402837b4243':
  docs: Fix a bunch of issues
 2013-01-14 11:15:55 -08:00
Christopher Tate
af77f071ff am c4802638: am c8074612: Merge "Fix the spelling of "retrieves"" 
* commit 'c4802638d85b563df8218873504c9f9100f67e2c':
  Fix the spelling of "retrieves"
 2013-01-14 11:02:33 -08:00
Christopher Tate
c4802638d8 am c8074612: Merge "Fix the spelling of "retrieves"" 
* commit 'c80746125ef5bcb44e6b2f459abd2dfdc67f4f61':
  Fix the spelling of "retrieves"
 2013-01-14 10:59:57 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Scott Kennedy
13b8449515 Fix the spelling of "retrieves" 
Change-Id: I33360c573a6ca7b88d0cac834caad547d66b0b2a
 2013-01-11 21:50:31 -08:00
Scott Main
8a05d13ef6 am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '5b56d43237d959403bb8a32de25376deee2dab22':
  docs: resolve bugs from external tracker
 2013-01-08 12:52:38 -08:00
Scott Main
6aad995042 docs: resolve bugs from external tracker 
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
 2013-01-08 12:02:38 -08:00
Scott Main
aa516b10dd am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker 
* commit '76c28e54b876207d468309aecb2ff2f4708a6ca4':
  docs: misc bugs from external tracker
 2013-01-07 16:06:40 -08:00
Scott Main
e30d31c4e8 docs: misc bugs from external tracker 
Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b
 2013-01-07 15:54:30 -08:00
Scott Main
a6d6fbfc8a am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit 'ff9414235a4d9052bd3003464be4649607447c9a':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:26:14 -08:00
Scott Main
f8daf19971 docs: misc bug fixes. including important versioning fixes for first app class 
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
 2013-01-04 18:09:29 -08:00
Scott Main
c41db6c9ba am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '834b0f3cd90679655ac1549cb427fc9475ac4a4b':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:44:22 -08:00
Scott Main
3e2479dd20 Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b docs: fix broken links and add new sitemap text file 
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
 2013-01-03 18:02:21 -08:00
Scott Main
1a9c5a5f82 am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '96f0e00825cf1bf0f14c358b87394b426020a77b':
  docs: add class on keyboards
 2012-12-21 16:40:25 -08:00
Scott Main
51627153b9 am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '8c8fd247a6a7f49031251ba11036779a41d9a2bf':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:33:40 -08:00
Scott Main
0dae634b06 Merge "docs: add class on keyboards" into jb-mr1-dev 2012-12-21 16:25:50 -08:00
Scott Main
c8a6f8a041 docs: add class on keyboards 
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
 2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80 docs: add explanation of default permissions to Permission guide 
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930
 2012-12-21 16:19:52 -08:00
Elliott Hughes
84303f5cd6 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623

(cherry picked from commit 965da34de94cdb845b64bd676e45b260000cd09d)

Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771
 2012-12-19 11:09:16 -08:00
Elliott Hughes
a8d7b52c88 am 171a9906: Merge "Update the JNI spec link, and remove a dead link." 
* commit '171a9906996675e3e9eb49fe3b3c1589417d70fb':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 09:46:36 -08:00
Elliott Hughes
965da34de9 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623
Change-Id: I521b640fdef17c98582171d97214486d16e774e4
 2012-12-18 17:24:36 -08:00
Scott Main
1a10de0f6b am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit '23d8835dc112ef0c65fac41cf1a1a00cb6bc776d':
  docs: remove minsdkversion for clarity
 2012-12-06 18:58:31 -08:00
Scott Main
40f7a513bd docs: remove minsdkversion for clarity 
Change-Id: I4ae06f447436ef8170a66a075cc08f1667387133
 2012-12-05 12:25:42 -08:00
Scott Main
8b93e77c9d am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '1e94db6ef9a43a6468bf7f4e64e3536cb87fbf5c':
  docs: update webview guide with javascript interface info
 2012-12-04 17:33:30 -08:00
Scott Main
cc91d6b7c8 docs: update webview guide with javascript interface info 
Change-Id: I328d36bf54261ac7d10121424102308159d79f6f
 2012-12-04 16:17:18 -08:00
Scott Main
bd3b1ca82c am 97fab2ca: am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api 
* commit '97fab2ca0213696fa140c4ecc7fcb61d0d75e804':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:18:18 -08:00
Scott Main
b00e37de18 docs: update location/maps doc with info for maps api 
Change-Id: I793f47791883efe88ff0d6c8effe0787d9654a88
 2012-12-02 19:00:48 -08:00
Dirk Dougherty
fa4596131d am 6875b438: am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit '6875b4385c1d1e4c1160ba6cd9128a461565338b':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:20:00 -08:00
Dirk Dougherty
2b286bb26b Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved. 
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
 2012-11-29 21:07:41 -08:00
Robert Ly
14d580850d am e03a213e: am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit 'e03a213e123d9a055b5f43469842ebf644bb6fb7':
  docs: add new GMS landing and reference
 2012-11-27 16:38:15 -08:00
Robert Ly
6519ca0c5f docs: add new GMS landing and reference 
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
 2012-11-27 16:09:58 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
kmccormick@google.com
836118184c am 0e2c9ee7: am a711d1ee: am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '0e2c9ee7df465a529fce81cb5016b43bb6423167':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-20 08:43:43 -08:00
kmccormick@google.com
55340e5134 am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '7112cd4687687203b35013f197089cb66508a14e':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:58:10 -08:00
kmccormick@google.com
2f9947e9aa am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:53:11 -08:00
&& repo sync -j8
ddf10d44c1 Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 2012-11-19 16:51:09 -08:00
Scott Main
14120b9ce3 am 68395a61: am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 
* commit '68395a61489c560e68a9f8321df96ccdf776d1b6':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
 2012-11-19 11:54:29 -08:00
Jaewan Kim
ff5941399e cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 
Fix typo

Change-Id: Idd09f7fea890dbc290589b1ebe4a1a139f98c740
 2012-11-19 11:43:56 -08:00
kmccormick@google.com
9fd5f0940b am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'afbf515be3ed51cf7db228b52fcc15440310877e':
  Doc Update: Fixing images
 2012-11-15 10:00:12 -08:00
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
 2012-11-15 09:51:56 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
 2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
Scott Main
b80d578c8f am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev 
* commit '2da041f09d5d68d79b1455aedce6527ea6c5dd89':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-14 19:17:27 -08:00
Scott Main
0034beab72 resolved conflicts for merge of 783e115b to jb-mr1-dev 
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
 2012-11-14 19:10:18 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images 
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
 2012-11-14 18:27:36 -08:00
&& repo sync -j8
91cd7a7d52 Doc Update: Removed "no guaranteed delivery" line. 
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
 2012-11-14 18:15:53 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis 
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes 
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
 2012-11-14 17:30:24 -08:00
Scott Main
1286316939 am 1190b77d: am 46ba7860: am 65bd44fe: Merge "docs: add jb mr1 api overview" into jb-mr1-dev 
* commit '1190b77dfa16502117b9c80e4fe4c1a64f4acb28':
  docs: add jb mr1 api overview
 2012-11-13 02:34:10 -08:00