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

2439 Commits

Author SHA1 Message Date
Nick Kralevich
0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
 2014-10-14 08:38:05 -07:00
Eric Gilmore
e77fe60760 Docs: adding closing bracket to un-break javadoc tokens. 
Bug: 17186958

Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
 2014-10-09 10:17:59 -07: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
Newton Allen
8f8a11b7fa Fix some documentation typos. 
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03ee5fddc5987c19fc36b0bb79e19572f)
 2014-09-30 02:52:26 +00:00
Scott Rowe
3215da25dd am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '14f413be3c7701750b996b90c95471e8cf04ae96':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:20:15 +00:00
Scott Rowe
14f413be3c am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:13:02 +00:00
Scott Rowe
0ccf80c31d Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 2014-09-03 23:52:13 +00:00
Joe Fernandez
14a5d2bd4d am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 
* commit 'a1a3c8a126032596b722d9faa74c616a4a8974e7':
  docs: Fix bug with Accessibility Services dev guide
 2014-09-03 23:36:30 +00:00
Joe Fernandez
a1a3c8a126 am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 
* commit '9de229527e710a90b03a415a9b752cc6e2a11592':
  docs: Fix bug with Accessibility Services dev guide
 2014-09-03 23:29:46 +00:00
Joe Fernandez
ab833be68e Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 2014-09-03 23:12:20 +00:00
Joe Fernandez
5632984369 docs: Fix bug with Accessibility Services dev guide 
b/11448573

Change-Id: I778c26f86c4a2cb3ebef9f3e75b5d544269486dc
 2014-08-29 16:44:18 -07:00
Scott Rowe
0ae64a84af am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '4d50fde5754b2f4a8350b79b42812100183175a4':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 21:33:11 +00:00
Scott Rowe
4d50fde575 am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '6208e7b56080956ffc48ade8d0b0f038b901cb23':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 21:17:08 +00:00
Scott Rowe
1014b9aa49 Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 2014-08-29 20:52:54 +00:00
Tim Murray
29d35997a3 am cb16b55b: am 2a866f07: Update RenderScript docs. 
* commit 'cb16b55b5ed9e4388b36e457226c96962004dd6c':
  Update RenderScript docs.
 2014-08-26 17:51:21 +00:00
Tim Murray
2a866f075d Update RenderScript docs. 
android.renderscript is *not* deprecated at all and continues to
be under heavy development.

Change-Id: Ia5fcfbe89d30e92b97439c2864fd67de32b81fa4
(cherry picked from commit 0a02f29ad12845cfbda95c463c12d583f668ba63)
 2014-08-25 22:36:17 +00:00
Tim Murray
1df3f99d2d Merge "Update RenderScript docs." into lmp-dev 2014-08-25 22:35:58 +00:00
Tim Murray
e87234f3ba Update RenderScript docs. 
android.renderscript is *not* deprecated at all and continues to
be under heavy development.

Change-Id: Ia5fcfbe89d30e92b97439c2864fd67de32b81fa4
 2014-08-25 11:08:24 -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
866ae385dd am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit 'e4be8986544a45a2560003f004b72528c691acef':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:44:40 +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
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
82957e38b2 Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 2014-08-21 15:22:11 +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
f246b0c4e9 docs: Fixed bug in declaring layout page. Bug: 16815916 
Change-Id: I8990488f45e7a09c948f5be006457205665b84a1
 2014-08-20 16:03:47 -07: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
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
bdb05bde0f docs: remove references to resource browser; point to SDK instead 
Change-Id: I773ede3fbf9fa3e7d728aee9b049343663d84012
 2014-08-12 16:01:48 -07:00
Scott Rowe
64f54c6502 docs: b/15790433 updated for xxhdpi and xxxhdpi 
Change-Id: I49be7a0313d9aa5ff6c7dd0ca2ffb7802dc567e5
 2014-08-08 14:06:22 -07:00
Scott Rowe
fc66190344 am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-24 16:22:15 +00:00
Scott Rowe
162493b5e3 am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '3bb44fecbb9643e68a52d19b9c90809c77367b3e':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-23 21:06:36 +00:00
Scott Rowe
72c80d308a cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e
 2014-07-23 20:49:45 +00:00
David Friedman
42dbe80914 am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +00:00
David Friedman
170b09535d Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 2014-07-22 16:13:36 +00:00
David Friedman
2fe7d87074 am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:55:55 +00:00
David Friedman
86efa014fc Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body. 
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
 2014-07-22 00:22:00 -07:00
Andrew Solovay
30aa5924f0 am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:47:13 +00:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
David Friedman
119716f404 am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:43:19 +00:00
Andrew Solovay
8e4ff7fee7 DO NOT MERGE 
cherrypick from klp-modular-dev docs: Noted how singleTop affects "up" navigation. Change-Id: 4d06d970526b58ddaf8db89858615217fa88772b

Docs are staged to:

http://asolovay.mtv:9411/training/implementing-navigation/ancestral.html#NavigateUp
http://asolovay.mtv:9411/guide/topics/manifest/activity-element.html#lmode

bug: 14527411
Change-Id: Ia414f2206339fc33739c8244f14140dd2e5d1607
(cherry picked from commit 4d06d970526b58ddaf8db89858615217fa88772b)
 2014-07-22 18:16:39 +00:00
Andrew Solovay
6f4d821003 am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '30aa5924f0a372a10c7245a16ee460359826ab9c':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:53:30 +00:00
David Friedman
d3161450fb Minor typos, consistency things, one grammatical error. 
Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c
 2014-07-18 02:28:54 -07:00
David Friedman
00510833be am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '119716f40466018e789d86b3005b6c839de85b8c':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:49:57 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
226faa0fe1 am 52f0b574: am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '52f0b5740e97777658859edb8489bc3f4e6c0b16':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:35:54 +00:00