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

2476 Commits

Author SHA1 Message Date
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +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
Scott Rowe
188a8774c9 resolved conflicts for merge of ea0137ef to lmp-mr1-dev 
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
 2015-01-06 19:30:11 -08:00
Scott Rowe
aa7c1f6845 am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:21:38 +00:00
Scott Rowe
7515d188dd docs: Checklist for TV Apps 
Change-Id: I93b57161b3e519164dab551068411f686d772596
 2015-01-05 17:50:59 -08:00
Scott Rowe
e2b44f86b9 docs: Making TV Apps Searchable - new training 
Change-Id: I188c14789c9ba36a35d0c2d07b349ac301837a48
 2014-12-19 15:15:04 -08:00
Nick Chalko
7508ef5d1a docs: Fix typo, use --> user 
Change-Id: Idfadf09b6c1711f6294e155176a2a713f8a8f616
 2014-12-04 22:23:30 +00:00
Eino-Ville Talvala
08a125562c Revert "Camera: Add new capability flags as system features as well" 
This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
 2014-12-03 11:12:39 -08:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Eino-Ville Talvala
6aee1d2ba5 Camera: Add new capability flags as system features as well 
Also add all the L and L MR1 new system features to the uses-feature documentation.

Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
 2014-11-20 15:52:40 -08:00
Elliott Hughes
6c43e6b54d Fix and be more explicit about plurals best practices. 
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565

(cherry picked from commit 1fe7d496db1ddc73289e6aae11f4dd4a970141d5)

Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
 2014-11-19 16:38:39 -08: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
Scott Rowe
3632637b4a docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 
Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-07 16:05:13 -08:00
Ricardo Cervera
92f6a74708 docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
 2014-11-05 08:55:51 -08:00
Scott Rowe
4c3a07ba05 docs: b/18119632 isGame, b/18119595 banner 
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
 2014-10-31 09:51:27 -07:00
David Friedman
0fa6edced7 Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
 2014-10-28 16:38:11 -07:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
Scott Rowe
87b1d0d099 docs: update location of sample apps 
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
 2014-10-17 10:46:04 -07:00
Natalie Masse
1e5bb86126 Link and typo fixed 
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
 2014-10-17 13:50:24 +01:00
Dirk Dougherty
2b86948e46 Doc change: Add Lollipop to platform versions table. 
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
 2014-10-17 02:16:58 -07:00
Scott Rowe
dd88668392 docs: Notifications changes for L 
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
 2014-10-16 23:48:25 -07:00
Joe Fernandez
321e7645c3 Merge "docs: Recents screen for tasks and activities" into lmp-dev 2014-10-17 05:40:43 +00:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
Joe Fernandez
d664dc93f4 Merge "Android 5.0 changes to IME switching" into lmp-dev 2014-10-17 05:01:04 +00:00
David Friedman
e802d5432e Android 5.0 changes to IME switching 
Change-Id: I158736ee36706889a5277f02a652162194289514
 2014-10-16 21:52:53 -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
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00
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