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

6219 Commits

Author SHA1 Message Date
quddusc
5020a8736f Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 2014-01-22 04:07:18 +00:00
quddusc
1dff746b02 cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da 
Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
 2014-01-21 18:53:57 -08:00
Scott Main
4dc4e848fb am 52288441: am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typo 
* commit '52288441428d68337e01def025e540bc8ed968f6':
  fix code typo
 2014-01-22 02:03:05 +00:00
Scott Main
69edcce783 am d9d41f2d: am fbdcf317: fix code typo 
* commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9':
  fix code typo
 2014-01-21 17:52:05 -08:00
Scott Main
d9d41f2db2 am fbdcf317: fix code typo 
* commit 'fbdcf317fa751dc7d629b5c38688369ea2acf0ad':
  fix code typo
 2014-01-22 01:49:36 +00:00
Scott Main
fbdcf317fa fix code typo 
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
 2014-01-21 10:12:07 -08:00
Igor Murashkin
51522d907d camera2: Add missing javadoc images 
Change-Id: Icc662dd63ba0a3e48b5f94dfb65479abcfacd047
 2014-01-17 15:19:54 -08:00
Joe Fernandez
a7eda49a82 am 2d7ca0c4: am 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit '2d7ca0c435e9acdff274d2a7817879ec44f61b45':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-17 01:06:39 +00:00
Joe Fernandez
acc96b79e7 am 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit '0a53d549f38c735cf3cc1eacf401bbf906785b26':
  Fixing bugs in MediaPlayer docs
 2014-01-17 01:06:34 +00:00
Marco Nelissen
a6a7f2ffc4 Update doc wrt to android:debuggable and CheckJNI 
Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28
 2014-01-16 15:45:47 -08:00
Joe Fernandez
12382d13ff am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit 'fcab250de89352613e3dd8fe6efa180c0a7df4d0':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-16 14:52:56 -08:00
Joe Fernandez
75a09a752a am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit '94149cfb3409244fa2d91ee87c0b4d531447110a':
  Fixing bugs in MediaPlayer docs
 2014-01-16 14:52:51 -08:00
Joe Fernandez
fcab250de8 am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit '16fe3737457ac844da09cd062e23abedbcc1f3e8':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-16 22:49:46 +00:00
Joe Fernandez
94149cfb34 am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit 'acf2b906b34d7c1d16ecb039390f656784c6d034':
  Fixing bugs in MediaPlayer docs
 2014-01-16 22:49:42 +00:00
Joe Fernandez
16fe373745 Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 2014-01-16 22:46:56 +00:00
Joe Fernandez
acf2b906b3 Merge "Fixing bugs in MediaPlayer docs" into klp-docs 2014-01-16 22:46:17 +00:00
quddusc
0574dc53b2 am 7d86d6b5: am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '7d86d6b5a7a680b243fb99aadf338a0e55ddbdd8':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 16:17:57 +00:00
quddusc
c2cc299998 am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '7e8a997fdf8acb90d81d57e1563a8d9f858464bd':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 08:08:24 -08:00
quddusc
7e8a997fdf am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '62729b15a91525cef4dd27226099c245d38e6495':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 16:05:54 +00:00
quddusc
62729b15a9 Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 2014-01-16 16:03:06 +00:00
Ricardo Cervera
f12fa01220 am 72e2c2a0: am bb6c94f9: am 8f8a6145: 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 '72e2c2a0b4df1d48e19b055d353094000c021c22':
  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:33:34 +00:00
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
Ricardo Cervera
f5749ac4ef am b5466418: am 7984122e: am 04666c91: 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- 
* commit 'b5466418d1313c59801a4acafa17b86ee4950f50':
  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:34:05 +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
Dirk Dougherty
2c5dc97a7b am e913f18c: am 26f9d980: am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit 'e913f18c5a7088ef69e5f87f75938d3cea2fd337':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:23:24 +00:00
Dirk Dougherty
39b41f32b4 am 061dc1b6: am b888739d: am dd8def1e: 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 '061dc1b6fbc2a56a987f093403855a370e705833':
  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:23:19 +00: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
quddusc
cf27731826 am 9fa2cf62: am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 
* commit '9fa2cf62155d128dc6594662ffa57f13beffcaf9':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
 2014-01-15 23:52:33 +00:00
quddusc
a8c8aa9f0f am e0ed54cc: am 18ae7b08: am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda 
* commit 'e0ed54cc53363a4fe16dc50f08a88d7f22fc68b1':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
 2014-01-15 23:52:27 +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
8caf1e6b31 am 0f38580f: am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 
* commit '0f38580febcf9f2d71f7c1067cb00fe3b3f4476a':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
 2014-01-15 21:21:00 +00: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