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

118246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
8f8a614534 am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '294d5f790a564ac5f21d3dcfd1054abe544505a5':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 07:25:04 -08:00
Ricardo Cervera
294d5f790a am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:19:30 +00:00
Ricardo Cervera
1d2a4e7b9f Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 2014-01-16 01:26:14 +00:00
quddusc
bf6d079783 am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit '2f1c2e32301018f800e0200c2d7ec01f990e0050':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-15 16:38:46 -08:00
quddusc
2f1c2e3230 am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit '3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-16 00:36:27 +00:00
quddusc
3126ce6e09 Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 2014-01-16 00:32:21 +00:00
Ricardo Cervera
04666c9180 am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '96f6ce38e383c0a2d416678bdfce41426e3f6b45':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-15 16:24:18 -08:00
Ricardo Cervera
96f6ce38e3 am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:20:55 +00:00
Ricardo Cervera
291fb4b5ff Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 2014-01-16 00:19:08 +00:00
Dirk Dougherty
7be6af670e am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit 'd7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-15 16:14:13 -08:00
Dirk Dougherty
dd8def1e15 am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit '5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-15 16:14:07 -08:00
Dirk Dougherty
d7a50a6282 am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit '57801123c16a160d03dd265ca2f193b51e876186':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:10:38 +00:00
Dirk Dougherty
5f26f2c9d2 am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit '6ec44a882b87fffb37e9dbafe8c5535f16faf349':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-16 00:10:34 +00:00
Dirk Dougherty
57801123c1 Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 2014-01-16 00:08:53 +00:00
Dirk Dougherty
6ec44a882b Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 2014-01-16 00:07:35 +00:00
Wink Saville
469881381b am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit '5775697029760ca886a287ef2c3119d5097ded56':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-15 15:57:10 -08:00
Wink Saville
5775697029 am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit 'a6aa3199bdb676e349c28b861a04c34a4ec136e0':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-15 15:49:14 -08:00
Wink Saville
a6aa3199bd Merge "Fixed mistaken reference to "LTE". Bug 7637224" 2014-01-15 23:44:54 +00:00
quddusc
f649035383 am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 
* commit '77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
 2014-01-15 15:40:55 -08:00
quddusc
dba65d6fb5 am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda 
* commit '57edc17c398b3b438e1a3264219a6fa7f444341a':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
 2014-01-15 15:40:50 -08:00
quddusc
77916b9ae1 am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 
* commit 'bf43ef272ad386ad89d115ab8be1b706ae29034e':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
 2014-01-15 23:37:08 +00:00
quddusc
57edc17c39 am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda 
* commit '563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
 2014-01-15 23:37:04 +00:00
quddusc
bf43ef272a Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 2014-01-15 23:34:50 +00:00
Ricardo Cervera
b96c0ab4fb docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 
HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html

Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9
 2014-01-15 15:16:30 -08:00
quddusc
563daeeaf1 cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda 
Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8
 2014-01-15 14:18:38 -08:00
Ricardo Cervera
d400ba6efb docs: Fixed typos in audio-focus.jd. Bug: 12528498 
HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html

Change-Id: I2198e4e27661b374d7c812bc7f26658073feae20
 2014-01-15 13:50:43 -08:00
Ricardo Cervera
4f216e1db9 am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 
* commit 'c919f4f47787245ddda32d0e41e7bae0facd0ee8':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
 2014-01-15 13:11:13 -08:00
Ricardo Cervera
c919f4f477 am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 
* commit 'bab2235ae89e37452e9be8a8b6d2581fe59e0162':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
 2014-01-15 21:07:21 +00:00
Ricardo Cervera
bab2235ae8 Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 2014-01-15 21:03:54 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 11:41:30 -08:00
Jeff Hao
9a5005a3bf am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit 'f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 11:38:01 -08:00
Jeff Hao
f6730d2684 Merge "Add sample profiling interface to startMethodTracing." 2014-01-15 19:34:39 +00:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing. 
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
 2014-01-15 11:27:24 -08:00
Ricardo Cervera
980edc3ca1 docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954 
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
 2014-01-15 11:25:10 -08:00
quddusc
e8ae214c31 am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 10:00:53 -08:00
quddusc
f401117315 am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit '31573d45933886237dd6414978486b79a4dd4f9f':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 17:57:27 +00:00
quddusc
31573d4593 Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 2014-01-15 17:55:22 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Scott Main
f12b3fd617 Doc change: add Drive API feature page. 
fix link text on several pages

Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
 2014-01-14 18:47:34 -08:00
quddusc
e8df6f4d53 docs: Fixed typo in InstrumentationTestRunner page. 
Bug: 11386360

Change-Id: I7626fe6fe1a22e223a8929ed3e5178c8df8966c9
 2014-01-14 12:47:34 -08:00
quddusc
65e3350cd2 am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit '916277e415e6c8186b79dfe929114d36f80d9ee0':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 12:35:29 -08:00
quddusc
9bc3bde793 am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 
* commit '5e5c9833f533bb55964c7e981feacf191b63f09f':
  docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
 2014-01-14 12:35:24 -08:00
quddusc
9714cbdf4a am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit '21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 12:35:18 -08:00
quddusc
bcc83d0196 am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 
* commit '7c865524048695f5dc471e6a357a142cf60495a7':
  docs: Fixed typo in IAB training doc. Bug: 10807741
 2014-01-14 12:35:14 -08:00
quddusc
e53c32a0aa am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit 'c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 12:35:08 -08:00
quddusc
916277e415 am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit 'e7eb5996c2cca421eb7d28325918db18044fe4f7':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 20:32:08 +00:00
quddusc
5e5c9833f5 am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 
* commit 'cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
  docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
 2014-01-14 20:32:04 +00:00
quddusc
21627274a0 am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit 'cc29a17056e4ae656182bf2fb36536b25ab4fcae':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 20:32:00 +00:00