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

2728 Commits

Author SHA1 Message Date
Luan Nguyen
b14aec1b95 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
automerge: 946bf2d

* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:13:35 +00:00
Narayan Kamath
6f609928cf am c7e48719: Merge "Remove references to persist.sys.language/country." automerge: 8be3724 
automerge: 00e821a

* commit '00e821a8608efdc19041bdda1e832d3d4b3c29e2':
  Remove references to persist.sys.language/country.
 2015-02-12 19:36:35 +00:00
Luan Nguyen
fe5e7e92a1 Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 2015-02-12 17:11:28 +00:00
Narayan Kamath
00e821a860 am c7e48719: Merge "Remove references to persist.sys.language/country." 
automerge: 8be3724

* commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972':
  Remove references to persist.sys.language/country.
 2015-02-12 16:41:41 +00:00
Narayan Kamath
b61db8229a Remove references to persist.sys.language/country. 
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.

bug: 17691569

Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
 2015-02-12 13:16:55 +00:00
Luan Nguyen
e4b5387d62 docs: Fix issue with onCreate() method declaration in file backup section 
bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
 2015-02-11 11:38:41 -08:00
Luan Nguyen
891718acd5 docs: Fix notification api guide issues (7461154, 12765600) 
bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
 2015-02-10 12:05:50 -08:00
Ricardo Cervera
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 20:06:53 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
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
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24: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
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
c2d9505219 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 
automerge: cca3d44

* commit 'cca3d44b700db945e23ad357b031d7f6397e18b9':
  docs: Fix broken link in Common Intents
 2015-01-13 17:01:48 +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
Joe Fernandez
597da2488a am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
automerge: b1c7f02

* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
  docs: Checklist for TV Apps
 2015-01-07 10:19:59 +00:00
Joe Fernandez
b1c7f0215b am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
  docs: Checklist for TV Apps
 2015-01-07 10:17:13 +00: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
5d1a4cf68b am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
automerge: d35c1d3

* commit 'd35c1d3f47102a836d97121cb5c7f921f5022edf':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:38:43 +00:00
Scott Rowe
d35c1d3f47 am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'dfc950b40d7d24c08dc56ffec5327f8da11960e7':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:35:34 +00: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
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
Nick Chalko
7508ef5d1a docs: Fix typo, use --> user 
Change-Id: Idfadf09b6c1711f6294e155176a2a713f8a8f616
 2014-12-04 22:23:30 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +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
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:05:40 +00:00
Scott Rowe
7863922116 am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-24 18:05:11 +00: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
Elliott Hughes
6973a63e96 am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:27:29 +00:00
Elliott Hughes
1fe7d496db 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
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
 2014-11-19 16:18:45 -08:00
Ricardo Cervera
23dac82dd3 am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'de71dd5cb47509011099f08ae872de5f2c945775':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:19:28 +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
be0737cdff am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'e9e96e7f0e372459372b31b138124d0760ed2689':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 18:09:54 +00: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
c1c58b9a96 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
automerge: aa3be67

* commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:29:59 +00:00
Scott Rowe
4c3a07ba05 docs: b/18119632 isGame, b/18119595 banner 
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
 2014-10-31 09:51:27 -07:00
David Friedman
5decda261a am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-30 23:43:31 +00: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
91934b63ee am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a 
automerge: cf6a28f

* commit 'cf6a28f813749f9ce1934e9054b53a19d0e30b39':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:42:19 +00:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00