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

6113 Commits

Author SHA1 Message Date
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00
Scott Main
9e36f58899 Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 2013-12-17 21:54:48 +00:00
Dirk Dougherty
4ffa6a4ae9 am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'd994602f99827adc589946453ab58551e31f878e':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 13:45:32 -08:00
Dirk Dougherty
d994602f99 am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit '731ba04536a07582904b4bf64a9eed896cb93bc5':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:37:19 +00:00
Dirk Dougherty
731ba04536 Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 2013-12-17 21:34:58 +00:00
Scott Main
ef3b704d6e am c797221f: am 64d14b5c: am 37826fa9: am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of s 
* commit 'c797221f4400c19e9080a1037744094e1bc15801':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:32:12 +00:00
Scott Main
37826fa9a9 am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above 
* commit '4e73847ab0d2278c314f67496b896d4de8c7abdb':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 13:21:36 -08:00
Scott Main
4e73847ab0 am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perf 
* commit '5cdadb48d0e696352c21794861ba533214b06318':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:19:42 +00:00
Scott Main
5cdadb48d0 initial shuffle of the API guide nav to add introduction 
* revise to the Compatibility doc, put it in Intro
* put Permissions in Intro
* put App Fundamentals in Intro
* move Manifest docs to the top of side nav tree
* move App Resources above UI
Will perform another fix to the Best Practices section
later to deprecate some docs there and point to Training instead

Change-Id: I88a8f94167ba15e97eb3bbbc08fd82dd82498e4b
 2013-12-17 13:14:17 -08:00
Dirk Dougherty
d6fb69933d Doc change: update list of tablets supported in Google Play for Education. 
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
 2013-12-17 12:46:40 -08:00
Scott Main
c594e9d904 am 1ba5915d: am a759b3d2: am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit '1ba5915dd09675485d55536301fdd7d80a305504':
  add new training course for Interaction and Engagement
 2013-12-17 02:53:54 +00:00
Scott Main
3fca61f073 am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit '75b8b3e008589c0a02c27d5baa6b3314a020f505':
  add new training course for Interaction and Engagement
 2013-12-16 18:45:00 -08:00
Scott Main
75b8b3e008 am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit 'ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
  add new training course for Interaction and Engagement
 2013-12-17 02:06:05 +00:00
Scott Main
ed4b7faa4c Merge "add new training course for Interaction and Engagement" into klp-docs 2013-12-17 02:03:40 +00:00
Trevor Johns
1dd7fb187d am b8928b05: am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
  Docs: Clean up HCE dev guide
 2013-12-16 23:27:57 +00:00
Scott Main
e0e8eb3b92 am 6b4cc772: am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '6b4cc77248a9e093d5111636680a0c7f39428677':
  fix typo bug: 12174614
 2013-12-16 23:27:51 +00:00
Trevor Johns
ed8d921a2e am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide
 2013-12-16 14:59:19 -08:00
Trevor Johns
eec6617866 am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide
 2013-12-16 22:56:38 +00:00
Trevor Johns
73c1681b2f Merge "Docs: Clean up HCE dev guide" into klp-docs 2013-12-16 22:43:48 +00:00
Trevor Johns
7643785aa8 Docs: Clean up HCE dev guide 
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.

Issue: 11991294

Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
 2013-12-16 14:37:26 -08:00
Igor Murashkin
d83adf00ae Merge "camera2: Add support for embedding images into javadoc" 2013-12-16 21:41:02 +00:00
Scott Main
9a1d3d50cf am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614
 2013-12-16 13:31:45 -08:00
Scott Main
316473915d am c53b7aad: fix typo bug: 12174614 
* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614
 2013-12-16 21:29:18 +00:00
Scott Main
c53b7aad50 fix typo 
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
 2013-12-16 13:22:08 -08:00
Scott Main
8142898da2 add new training course for Interaction and Engagement 
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
 2013-12-16 13:18:24 -08:00
Igor Murashkin
7a9b30e9e3 camera2: Add support for embedding images into javadoc 
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family

Bug: 12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
 2013-12-16 11:43:49 -08:00
Katie McCormick
d9a32847e5 am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
  Doc update: clarify version of flags.
 2013-12-16 18:39:25 +00:00
Katie McCormick
1e609ac45d am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
  Doc update: clarify version of flags.
 2013-12-16 10:29:57 -08:00
Katie McCormick
4e6c540827 am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
  Doc update: clarify version of flags.
 2013-12-16 18:28:00 +00:00
Katie McCormick
c8b93fd972 Merge "Doc update: clarify version of flags." into klp-docs 2013-12-16 18:25:12 +00:00
Scott Main
d13afd69c0 update storage doc for secondary external storage in KK 
and add some new sample code
and remove documentation for APIs below level 8
and add information about permission changes in KK
bug: 11907502

Change-Id: Id41c532fc2b05e59ab2cdf2b2a4ce368f7c2dba1
 2013-12-13 16:42:42 -08:00
Katie McCormick
8b8194b500 Doc update: clarify version of flags. 
Fixes:

b/11999080

Change-Id: I0eda86d5162caab6809ff780387091544530dc32
 2013-12-12 14:48:39 -08:00
Katie McCormick
5b46455cbc am 9a72ebdf: am b1738b3a: am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new". 
* commit '9a72ebdfb6b69b0fcb4189758fc84d748240d94b':
  Doc update: removed the word "new".
 2013-12-12 02:35:01 +00:00
Katie McCormick
7162b92007 am 861f8d85: am a58967a9: Doc update: removed the word "new". 
* commit '861f8d8503bf1c384b3fc39531b2ea6db563ebb3':
  Doc update: removed the word "new".
 2013-12-11 18:25:56 -08:00
Katie McCormick
861f8d8503 am a58967a9: Doc update: removed the word "new". 
* commit 'a58967a9899e691a28fc8e277115838e2b0d0f67':
  Doc update: removed the word "new".
 2013-12-12 02:23:04 +00:00
Katie McCormick
a58967a989 Doc update: removed the word "new". 
Change-Id: I8764d94e0f924feeae21a0230dc4f50eacf7754a
 2013-12-11 18:17:28 -08:00
Katie McCormick
5719ee1a0c Doc update: update console instructions per new UI. 
Change-Id: I7b29e5c54914f0b2bff12d5025aae0d584821890
 2013-12-11 18:02:54 -08:00
Dirk Dougherty
71cd5fd73f am 0bef299c: am b319cde4: am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 
* commit '0bef299c766a51d29a5e7e818d42eefc2dc278b1':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
 2013-12-12 00:13:27 +00:00
Dirk Dougherty
312165a843 am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 
* commit 'f93cc02f70d06060ad487fec868e565129c9282c':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
 2013-12-11 16:00:13 -08:00
Dirk Dougherty
f93cc02f70 am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 
* commit 'c6da523207d3ddf7b9da98fcb5e461f286eb7aa4':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
 2013-12-11 23:41:11 +00:00
Dirk Dougherty
c6da523207 Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 2013-12-11 23:38:20 +00:00
Dirk Dougherty
103c212691 Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3. 
Change-Id: I9592f5364afd3c24ab047bb938bdaf6e8bf3b922
 2013-12-11 15:35:30 -08:00
Scott Main
2515e6a42f am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit '5f41b262a5edb9f2ffb44fff77dc75d5cabec2ba':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 22:27:19 +00:00
Scott Main
f70d7b9ace am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'cf5ed42f0b5f2b3787da39d19e9716d6b244b9b5':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-10 17:04:57 -08:00
Scott Main
cf5ed42f0b am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 01:00:46 +00:00
Scott Main
df75bdcc55 rewrite intent guide and add doc with intents supported by platform apps 
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
 2013-12-10 15:53:37 -08:00
Joe Fernandez
1290d8e64f am c13b4e25: am 507e635d: am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit 'c13b4e25310034cc1e8da359edf1ee24d7429e9d':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 16:45:34 +00:00
Scott Main
c9cd738e10 am e26fe49d: am 113b40cc: am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit 'e26fe49de16ec148c02460865c26fca50cc8974c':
  NDK release notes for r9c for review
 2013-12-10 16:38:09 +00:00
Joe Fernandez
5f69844919 am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit '3270172fcabd8d280daa55eb5ba50439b1c88b20':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 08:33:18 -08:00
Scott Main
a09588d7d6 am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit '99d663aafa09496bcce1aa46ed928ee01532d0d6':
  NDK release notes for r9c for review
 2013-12-10 08:29:29 -08:00