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

7338 Commits

Author SHA1 Message Date
Quddus Chong
9893c6420d am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 
* commit 'f42fdfd9c36ab0ecc3ed32f5f8db554e58f78dcf':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
 2014-08-21 23:12:49 +00:00
Quddus Chong
f42fdfd9c3 am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 
* commit '152cc5845737a92daec57c8934b74e6b01071266':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
 2014-08-21 23:01:54 +00:00
Quddus Chong
152cc58457 Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 2014-08-21 22:55:15 +00:00
Ricardo Cervera
c1da9cbff5 am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:31:31 +00:00
Rich Slogar
e415ebc634 am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:31:27 +00:00
Ricardo Cervera
e4be898654 am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:31:03 +00:00
Ricardo Cervera
9e6b3e7dd8 am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit '63da186fef8add43bcd0c347eec86946b67350c3':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:30:57 +00:00
Quddus Chong
70c2b06155 docs: Added additional documentation for specifying OAuth scopes. 
bug: 12650251

Change-Id: I8905ed63208aff82d0c0caf1b3503831f121b09e
 2014-08-21 09:59:30 -07:00
Ricardo Cervera
2c374e643d am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '82957e38b2d38ea41fdf930d722157287eab0590':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 15:31:34 +00:00
Ricardo Cervera
82957e38b2 Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 2014-08-21 15:22:11 +00:00
Rich Slogar
d309de3d06 am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit '7bf7b77923cda854fb46bb40473282ae10e1dea4':
  Docs: Fixed typo 'Fore'
 2014-08-21 00:57:30 +00:00
Rich Slogar
7bf7b77923 Merge "Docs: Fixed typo 'Fore'" into klp-modular-docs 2014-08-21 00:16:54 +00:00
Ricardo Cervera
0d65bf25c8 am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit '262b41478d77bdebb78acccf795c14e9c097773e':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-20 23:50:07 +00:00
Ricardo Cervera
63da186fef am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit 'c58078085a3fb30947d7982536ebe0a06cdf4b62':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-20 23:50:03 +00:00
Rich Slogar
5c80662fab Docs: Fixed typo 'Fore' 
Change-Id: I67cacf2ca11be27f9352cd8bddb1f9e6ff8a65c6
 2014-08-20 16:29:02 -07:00
Ricardo Cervera
f01f8e8500 docs: Fixed typo in intents page. Bug: 16949177 
Change-Id: Ie3ae033932134058008dd17124f1bbd43e24a65d
 2014-08-20 15:57:44 -07:00
Ricardo Cervera
c58078085a docs: Fixed typo in Wear training class. Bug: 16709202 
Change-Id: I4649546f2ebe2dba7266a3260d0aa4388a2a7fe1
 2014-08-20 15:51:17 -07:00
Ricardo Cervera
262b41478d Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 2014-08-20 21:47:20 +00:00
Ricardo Cervera
f246b0c4e9 docs: Fixed bug in declaring layout page. Bug: 16815916 
Change-Id: I8990488f45e7a09c948f5be006457205665b84a1
 2014-08-20 16:03:47 -07:00
Andrew Solovay
eb60d0f193 am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:19:37 +00:00
Andrew Solovay
94174ff788 am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:08:17 +00:00
Ricardo Cervera
cce5036cb0 am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
  docs: Removing radio from music intents
 2014-08-18 19:38:16 +00:00
Ricardo Cervera
88a1f40c5d am fb1f5bde: docs: Removing radio from music intents 
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents
 2014-08-18 19:28:02 +00:00
Ricardo Cervera
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Ricardo Cervera
f960409f3b am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit '72ca94ee29c71541b7628c44f44ef5cddff9a6e9':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:49:18 +00:00
Ricardo Cervera
72ca94ee29 am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'd0842384cb9d6a19f129434457c88de64f2b0b06':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:40:01 +00:00
Ricardo Cervera
d0842384cb docs: Updated links for Android Studio 0.8.6 
Change-Id: Ic01263930b94232445704c03854414bd07ca4c33
 2014-08-18 09:03:59 -07:00
Andrew Solovay
8319455afc Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 2014-08-16 04:01:11 +00:00
Andrew Solovay
7f09366b6a docs: Documented new fields returned by getSkuDetails(). 
Per bug b/9221265, documented new price_amount_micros and
price_currency_code fields.

Doc is staged to:

http://asolovay.mtv:9265/google/play/billing/billing_reference.html#getSkuDetails

bug: 9221265
Change-Id: I06798692b3329e5e0d1fe3aaf215d9c97f2363c0
 2014-08-13 17:38:47 -07:00
kmccormick
7b708ec317 am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:43:20 +00:00
kmccormick
919176239f am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '37bdcbbba2db31f0efb8aa900ba7ce81a710e08c':
  Doc Change: remove obsolete links.
 2014-08-13 17:09:15 +00:00
kmccormick
37bdcbbba2 am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit 'bcdbe1a0fcb9c24cdc4ee402f29f279ef2b9e7fa':
  Doc Change: remove obsolete links.
 2014-08-13 17:05:01 +00:00
kmccormick
a0197180e7 Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
71f8f1d81f Doc Change: Remove obsolete sample link. 
Fix for:

b/16685592

Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
 2014-08-12 18:08:58 -07:00
kmccormick
cb62407d7a Doc Change: remove obsolete links. 
Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
 2014-08-12 17:52:27 -07:00
Quddus Chong
eb4d136e5a am a5365ed9: am ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs 
* commit 'a5365ed9dd080529609078c0b262e775ba3b460e':
  docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
 2014-08-12 22:46:41 +00:00
Quddus Chong
a5365ed9dd am ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs 
* commit 'ac605c8488a3092c1451ac29cad35ff2ff9f7f98':
  docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
 2014-08-12 22:42:19 +00:00
Quddus Chong
ac605c8488 Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs 2014-08-12 20:55:12 +00:00
Quddus Chong
20dad64d03 docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support. 
Change-Id: Ib759f6a187a8a1298d01f8485a8e05e5d9b67e27
 2014-08-12 15:08:05 -07:00
Robert Ly
ecae7cb04f am 378b2558: am 41e836a6: Merge "docs: update dashboard" into klp-modular-docs 
* commit '378b25584f3ddeb242dfc3c9c161512a897cc0d8':
  docs: update dashboard
 2014-08-12 19:52:21 +00:00
Robert Ly
378b25584f am 41e836a6: Merge "docs: update dashboard" into klp-modular-docs 
* commit '41e836a644b1fa767fdcce629bbb4753e0f5ecd6':
  docs: update dashboard
 2014-08-12 19:45:28 +00:00
Robert Ly
41e836a644 Merge "docs: update dashboard" into klp-modular-docs 2014-08-12 19:21:04 +00:00
Robert Ly
ba5c49dcde docs: update dashboard 
Change-Id: I3a11a4ffbd9e5544c598bdebacd67e236305602f
 2014-08-12 12:26:37 -07:00
Ricardo Cervera
18718444b9 am 97dbb136: am 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs 
* commit '97dbb136473b18a6d7171577ef2a7136819b4a18':
  docs: Fixed minor issue with Studio shortcuts
 2014-08-11 15:22:03 +00:00
Ricardo Cervera
97dbb13647 am 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs 
* commit '6bb49e4ae629e3740cd3a623fcc115f895f3188c':
  docs: Fixed minor issue with Studio shortcuts
 2014-08-11 15:17:27 +00:00
Ricardo Cervera
6bb49e4ae6 Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs 2014-08-08 20:34:05 +00:00
Ricardo Cervera
0495f1ef71 docs: Fixed minor issue with Studio shortcuts 
See https://code.google.com/p/android/issues/detail?id=74316
Updated keymap for new files and added note on choosing keymaps.

Change-Id: I3c1e1a8ab0f344040ea2627734f7d5959c842799
 2014-08-08 09:31:13 -07:00
Ricardo Cervera
e5f852e0b0 am eab9412b: am 46baa5ff: Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs 
* commit 'eab9412b1b3fdbf74dee5b05e861707dce628661':
  docs: Release notes for ADT 23.0.3
 2014-08-07 23:22:44 +00:00
Ricardo Cervera
eab9412b1b am 46baa5ff: Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs 
* commit '46baa5ff7dadad76fc5503a7c2be6d22eb00da57':
  docs: Release notes for ADT 23.0.3
 2014-08-07 23:17:16 +00:00