118375 Commits

Author SHA1 Message Date
Scott Main
3bcdbd6b2d am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match
* commit '6fda5415e07564b2e8ff000db5635e31d1e6f357':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
2013-12-18 18:25:34 +00:00
Scott Main
6fda5415e0 am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, c
* commit '709dca4474549772dccabc2f8cd214798f965a39':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
2013-12-18 18:22:05 +00:00
Narayan Kamath
52ba48a850 am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit 'f08b83beeef66b603dd3df1140e35f8e3f94d344':
  Remove unused field from MediaMuxer
2013-12-18 18:20:42 +00:00
Narayan Kamath
f08b83beee am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
  Remove unused field from MediaMuxer
2013-12-18 18:18:04 +00:00
Scott Main
709dca4474 am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify sectio
* commit 'fb214e6b108e84f7f55bee378c5c539a723b0569':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
2013-12-18 10:17:33 -08:00
Narayan Kamath
4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
2013-12-18 10:14:45 -08:00
Scott Main
fb214e6b10 am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, p
* commit '3032999bf35cd6a0f1643faacf08370ab69d979c':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
2013-12-18 18:14:12 +00:00
Scott Main
3032999bf3 Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification" into klp-docs 2013-12-18 18:11:50 +00:00
Narayan Kamath
be8fbb8fb6 Merge "Remove unused field from MediaMuxer" 2013-12-18 18:08:58 +00:00
Scott Main
326ed257b1 Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite)
clarifications about different external directories,
information about required permissions,
intent resolution technique to match other docs,
clarify section headings, plus other code clarification

Change-Id: I62e3692a53bcd724676c74dc2c98eb72bcf58e1e
2013-12-18 09:58:15 -08:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
2013-12-18 17:58:11 +00:00
Narayan Kamath
f11dd63e0c MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
2013-12-18 16:58:36 +00:00
Narayan Kamath
d1cec98ec5 am 04d02d97: am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
  Don't pseudolocalize untranslatable strings.
2013-12-18 13:05:44 +00:00
Narayan Kamath
04d02d9731 am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '39d7630234127327d71a773dd563067989da4211':
  Don't pseudolocalize untranslatable strings.
2013-12-18 13:02:39 +00:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
2013-12-18 00:50:59 +00:00
Scott Main
74e9e69826 am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '7d1f8e6570b8137dbe1e9007bb8496a0f6c3cb53':
  fix typos bug: 11693951 bug: 12118617
2013-12-18 00:48:03 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
2013-12-18 00:41:23 +00:00
Scott Main
5dcb75e67b Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 2013-12-18 00:38:30 +00:00
Scott Main
84b8cbdafe am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '2259116450f25ae75d8d142a2bf15f3d5db35bd6':
  fix sidenav links to use toroot variable
2013-12-17 23:12:13 +00:00
Scott Main
2259116450 am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '007ae376d7672a456213e7f5475de4a910594cb2':
  fix sidenav links to use toroot variable
2013-12-17 23:08:37 +00:00
Scott Main
007ae376d7 am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '8c95a149b516595e22fa7b6479d7bc02750531c2':
  fix sidenav links to use toroot variable
2013-12-17 15:06:31 -08:00
Scott Main
8c95a149b5 am 5b50239c: fix sidenav links to use toroot variable
* commit '5b50239c33176e0b321d2ee32a589e0583767e02':
  fix sidenav links to use toroot variable
2013-12-17 23:03:49 +00:00
Scott Main
5b50239c33 fix sidenav links to use toroot variable
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
2013-12-17 14:59:05 -08:00
Scott Main
6652ef463d am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: 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-d
* commit 'dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
  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
2013-12-17 22:06:38 +00:00
Scott Main
dd55de3ddc am 9767f9e2: am 7df86ef4: am 9e36f588: 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
* commit '9767f9e2120609ada992e558ba16608aafa96811':
  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
2013-12-17 22:03:16 +00:00
Scott Main
9767f9e212 am 7df86ef4: am 9e36f588: 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
* commit '7df86ef441835aedf24477f61e12cf78c5a86244':
  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
2013-12-17 14:00:45 -08:00
Scott Main
7df86ef441 am 9e36f588: 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
* commit '9e36f588993e02210f02d9b7c0600a842d67bbdb':
  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
2013-12-17 21:57:46 +00:00
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
fe4a997be7 am bfc22ba2: am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit 'bfc22ba251ae5eba7ce68d5a8281042519c187a0':
  Doc change: update list of tablets supported in Google Play for Education.
2013-12-17 21:53:09 +00:00
Dirk Dougherty
bfc22ba251 am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '4ffa6a4ae930f724d2e16e85110892db9bb6280e':
  Doc change: update list of tablets supported in Google Play for Education.
2013-12-17 21:50:46 +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
c797221f44 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 side nav tree
* commit '64d14b5cd9c548b313da1a9b211c3ea02deb753d':
  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:29:00 +00:00
Scott Main
64d14b5cd9 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 side nav tree * move App Re
* commit '37826fa9a973463d5698cbdaa4c844c981804459':
  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:25:57 +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
Greg Hackmann
69ad42a3cf am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '1877f7dc58d28146bd1907352cb46dbc95302cbb':
  Add /dev/rtc backend to SystemClock
2013-12-17 20:08:26 +00:00
Greg Hackmann
f1bdbdd1be resolved conflicts for merge of 08579921 to klp-modular-dev
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
2013-12-17 11:56:22 -08:00
Greg Hackmann
552eba80ef am 153ec6ca: am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '153ec6cae7db2053c71541af8973244f0dbf6d4a':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
2013-12-17 18:22:24 +00:00
Greg Hackmann
1877f7dc58 am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '0b64fa7e4b51f1ec96abf49abdc84e2a4c1b4294':
  Add /dev/rtc backend to SystemClock
2013-12-17 18:19:09 +00:00
Greg Hackmann
0857992140 am 060ae1db: am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '060ae1db7bba39cb8171f4267b5de9538f1ab440':
  Add timerfd backend to AlarmManagerService
2013-12-17 18:19:04 +00:00
Greg Hackmann
153ec6cae7 am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '3545433d052769417dcdd70bc59fbf31f9925ba4':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
2013-12-17 18:18:58 +00:00
Greg Hackmann
0b64fa7e4b am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit 'c978799c4a7cc8339d560bb47a029861230fa2a6':
  Add /dev/rtc backend to SystemClock
2013-12-17 10:15:37 -08:00