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

4218 Commits

Author SHA1 Message Date
Scott Main
8a4e3fd2ab am c41db6c9: am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit 'c41db6c9ba298c8fac5068ad2843b4aa58ecf1c5':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:47:12 -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
Katie McCormick
6d2b3fb397 am 0f7cc697: am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit '0f7cc697ed55f9b9587633c912b9bd9b8f41db31':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:22:29 -08:00
Katie McCormick
0f7cc697ed am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit 'f420b800b8813aee636f955012da6fb87e631827':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:20:07 -08:00
Katie McCormick
ed2a05bc5b Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 2013-01-03 16:07:45 -08:00
Katie McCormick
e06b0838e3 Doc change: minor fixes to support lib lesson. 
Bug # 7633596

Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
 2013-01-03 16:01:33 -08:00
Scott Main
0b8b0deba9 am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '3668703021cc2f010d90d6194ca57456c9e11dbc':
  docs: dashboard update for 1/3/13
 2013-01-03 11:56:57 -08:00
Scott Main
3668703021 am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit 'cd7b6a947060dfa3da58acbba039274103077757':
  docs: dashboard update for 1/3/13
 2013-01-03 11:54:51 -08:00
Scott Main
b318318e0a docs: dashboard update for 1/3/13 
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
 2013-01-03 11:39:34 -08:00
Amith Yamasani
4c7f809dd5 am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit 'ff0cb3737b2f4f2e0762468f8424bba8a5681faf':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:08:41 -08:00
Amith Yamasani
ff0cb3737b am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit '554ed0f0347acc568ab1e73621789423c953f693':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:03:21 -08:00
Scott Main
704cbbcd1d am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '1a9c5a5f82786825937c0a4d46457f336cba8f97':
  docs: add class on keyboards
 2012-12-28 09:48:14 -08:00
Scott Main
e3d1258082 am 51627153: 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 '51627153b9e6c26d5d2d87ee14ca0676968578e5':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-28 09:48:09 -08:00
kmccormick@google.com
8d3a44bcb0 am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '12f2f8dcd79fc1952b3d606829857b0df4398fa8':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:47:28 -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
Gulshan Singh
870d2a2988 Fixed typo in Recreating an Activity documentation 
The word although was spelled as althought. This is now fixed.
Signed-off-by: Gulshan Singh <gsingh2011@gmail.com>

Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
 2012-12-21 17:13:43 -05:00
kmccormick@google.com
12f2f8dcd7 am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '87d852a84de0d691bce127f65bc7c4ba75883e2e':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:52:28 -08:00
&& repo sync -j8
5b03460fcb Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 2012-12-21 12:43:20 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
Dirk Dougherty
9ed5fd4cb7 am b7f4bf36: am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'b7f4bf3604df8f3181931835a5dfc414c3072749':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 13:29:38 -08:00
Scott Main
b23955be38 am d1ecaf39: am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit 'd1ecaf399d60395c4af4f53edba6de348004b6d3':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 13:29:33 -08:00
Dirk Dougherty
b7f4bf3604 am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:55:39 -08:00
Dirk Dougherty
0402b65327 Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 2012-12-20 12:46:00 -08:00
Dirk Dougherty
0f08867b93 Doc change: point developer landing page featured content to blog post. 
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
 2012-12-20 12:40:22 -08:00
Scott Main
d1ecaf399d am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:17:33 -08:00
Scott Main
732e2de1a0 am 0aa3df58: am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '0aa3df583f81de90078258781a95fff40237c499':
  docs: NDK r8d Release Notes
 2012-12-20 12:11:02 -08:00
Scott Main
0aa3df583f am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e':
  docs: NDK r8d Release Notes
 2012-12-20 12:09:13 -08:00
Scott Main
8afb3ba4da Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-20 12:03:53 -08:00
Scott Main
f6e5512390 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-20 12:02:29 -08:00
Dirk Dougherty
fa0f9be8c5 am 0943862c: am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit '0943862cf5025c74f5343ded76c8d6aaa0abeaa1':
  Doc change: update develop landing page.
 2012-12-20 09:42:45 -08:00
Dirk Dougherty
0943862cf5 am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit 'edafbe798e7daf18a109fa234b11fe2351c8fe27':
  Doc change: update develop landing page.
 2012-12-20 09:41:02 -08:00
Dirk Dougherty
0f0d9b32cb Merge "Doc change: update develop landing page." into jb-mr1-dev 2012-12-20 09:28:37 -08:00
Scott Main
1d25430c95 am f36ced0a: am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit 'f36ced0a8c38098eff5dc3652b35b4d527d02aab':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:23:42 -08:00
Scott Main
f36ced0a8c am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit 'a6cf72d8ce00b27f00c59ccd34b775cdaf92341e':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:21:38 -08:00
Scott Main
db49d31729 Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 2012-12-19 16:12:18 -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
Joe Malin
5f5f6c3335 am 44a0489f: am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '44a0489f590f80ee1bc73f051757e246f73e2b5f':
  Android Training: Multiple Threads
 2012-12-19 10:45:11 -08:00
Joe Malin
44a0489f59 am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '46dd710a802e016740711e40ecfac345e19a183f':
  Android Training: Multiple Threads
 2012-12-19 10:43:14 -08:00
Joe Malin
4c59230a2f am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit 'd4289c6e20c0a42deba796d02b5a9bc60c9a4e7c':
  Android Training: Multiple Threads
 2012-12-19 10:35:32 -08:00
Joe Malin
c84b3603fa am 8dd6275e: Android Training: Multiple Threads 
* commit '8dd6275e2871bea1acb20cbdd98ea0451b3d5be0':
  Android Training: Multiple Threads
 2012-12-19 10:31:39 -08:00
Elliott Hughes
cae1550e91 am a8d7b52c: am 171a9906: Merge "Update the JNI spec link, and remove a dead link." 
* commit 'a8d7b52c88ec0dea889affeaa9311b6f7ae43538':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 09:51:33 -08:00
Joe Malin
8dd6275e28 Android Training: Multiple Threads 
Change-Id: I58c472aa5ed82f6b4fb50d9bbb4e66841b9e99c3
 2012-12-19 09:47:04 -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