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

73 Commits

Author SHA1 Message Date
Florian Salbrechter
067902ce7b Fix bug in IntentService and Service example code. 
Use Thread.sleep instead of Object.wait which simplifies the example.
Also there is a tiny chance, that wait will be called with 0, which
blocks forever.

Change-Id: I4cf90a33089a64bdf802620350f76af08f15f721
(cherry picked from commit 77d8857ed58503669e0659989c02fb7f1ca936b4)
 2016-02-16 17:37:36 +00:00
Neil Fuller
71fbb81b14 Fix @code escapes 
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
 2015-12-02 14:24:11 +00:00
Felipe Leme
3f24edf0dd Fixed typos. 
Change-Id: I13f2a0cd9b5e41a6af27fbbc6f33ecc0241b3c29
 2015-11-18 15:30:00 -08:00
Robert Schaub
0b403ebd6a am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 
* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
 2015-07-13 23:58:03 +00:00
Robert Schaub
db304a92a1 docs: Removed parenthetic phrase that made explanation unnecessarily confusing 
Bug: 10641790

Change-Id: I07cce015174edc43464d116364d47d191ee27fd4
 2015-07-07 11:29:33 -07:00
Luan Nguyen
838a29a659 am c1b4b058: am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit 'c1b4b0580ccdbccee25f4bc97e94530e4982e1f7':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 15:29:47 +00:00
Luan Nguyen
fdad629fc0 am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit '6859a9f09049d1dc760b98a6cbb278b591de63a6':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 14:51:30 +00:00
Luan Nguyen
1afb2d5335 docs: Pare down the adb guide and remove sections that are duplicated 
in the tools list.

bug: 12879186
Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
 2015-06-22 17:00:02 -07:00
Andrew Solovay
4fbdbbe8f1 am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs 
* commit 'c15736b95d61033f03b1446371315bfa46252aaf':
  docs: Minor formatting cleanup.
 2015-04-30 03:14:13 +00:00
Andrew Solovay
5fb97fe9ba docs: Minor formatting cleanup. 
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.

Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
 2015-04-29 14:37:22 -07:00
Luan Nguyen
916e076a8c am 83b96e02: am d9eb3881: am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '83b96e02a4bc8b0e9f5308b441609411ee347baf':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:56:47 +00:00
Luan Nguyen
f46471e304 docs: Remove deprecated Fitness information from this doc. 
Guides have been moved to developers.google.com/fit

bug: 19387145
Change-Id: I6d14d2e643e68d923e135555e0b3c78060e22b8e
 2015-03-02 14:26:47 -08:00
Ricardo Cervera
f76ea8e4f9 am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 automerge: cca3d44 
* commit 'c2d950521919f35c75d60013276fb422789151a2':
  docs: Fix broken link in Common Intents
 2015-01-13 20:33:19 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents. 
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
 2014-12-12 14:55:18 +00:00
Ricardo Cervera
0d18b091eb Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 2014-11-18 23:16:22 +00:00
Ricardo Cervera
c3b2a00371 docs: Add link to "Voice search in your app" video. 
Bug: 18407660

Change-Id: I9062c708b64586116e5af4df5d83b73988189e8a
 2014-11-18 10:02:15 -08:00
smain@google.com
9adc33a658 fix code type and mention api level 21 exception for bindService() 
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
 2014-11-12 09:38:00 -08:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Scott Rowe
87b1d0d099 docs: update location of sample apps 
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
 2014-10-17 10:46:04 -07:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
Ricardo Cervera
dbcfc8efdb am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'a18075e82b603762382232816c0d74abcc7e46e7':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 23:49:06 +00:00
Ricardo Cervera
692bb81c12 am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '6d30f576146725ee81b8cb753584985a2758b566':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 23:48:48 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Ricardo Cervera
e5d7411744 am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:44:53 +00: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
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Ricardo Cervera
20ae7b7cb6 am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'cce5036cb00c7e25f1d226c6405e6231f5913444':
  docs: Removing radio from music intents
 2014-08-18 19:49:12 +00:00
Scott Rowe
e3ffc7e209 docs: update reference to FragmentRetainInstance 
Change-Id: I45cf1404a39f81b822716cef061d1463cfff84ca
 2014-08-12 15:20:15 -07:00
smain@google.com
aa1ecf5cdf html cleanup. delete quickviews 
Change-Id: Ifd71ca32848982919f37f8927acd8b66b0cf4438
 2014-06-13 17:47:15 -07:00
smain@google.com
9b99a971f6 am b06efc72: am aa1ecf5c: html cleanup. delete quickviews 
* commit 'b06efc724cdf571342f5d1ebc9ff075624d4aebd':
  html cleanup. delete quickviews
 2014-06-14 01:17:43 +00:00
David Friedman
a8ac8d0bb5 am c1d8b0c4: am 689eb9e9: am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs 
* commit 'c1d8b0c4e904b7aaeb0897fd008f5525cb731dd0':
  Fixed typos. "describe"-->"describes"; "allow"-->"allows"
 2014-06-04 03:16:27 +00:00
David Friedman
6a67b2beb2 Fixed typos. "describe"-->"describes"; "allow"-->"allows" 
Change-Id: I7910b39dcd6c2bb2f8a68ac02f3ff305dd195874
 2014-05-30 14:34:33 -07:00
Dirk Dougherty
9a6672beb1 resolved conflices for merge of 93ccd1a2 to master 
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
 2014-05-14 14:50:13 -07:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -07:00
Scott Main
3b23c019cf am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'b5342f965b19a053b093f554930893b91c2e763e':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-07 00:00:20 +00:00
Scott Main
f1bc39b8ae fix code error. 
The data type was wrong, but it's actually not needed.

Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
 2014-05-06 16:34:30 -07:00
Ricardo Cervera
92f4a3465e am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'fa711a33be265d1fcd08efd850085615ec66dd89':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:03:14 +00:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -07:00
Scott Main
0ba2de8530 am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:24:53 +00:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Scott Main
83b6e4b937 am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 21:27:47 +00:00
Scott Main
8ad4275640 update intent examples for maps 
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
 2014-02-19 18:08:33 -08:00
Scott Main
22ad5f2139 update common intents guide to add calendar and alarms. 
Change-Id: I515c6c982104f37b04ef0eddfd0ba8a99e619077
 2014-01-17 16:41:16 -08: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
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
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