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

2593 Commits

Author SHA1 Message Date
Glenn Kasten
4c0b23453c am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '8f9ae2323e747dfbc09b48c6e29edcffaca4d0c7':
  Fix USB typos
 2015-03-06 16:38:48 +00:00
Glenn Kasten
5afdc97f2e Fix USB typos 
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)
 2015-03-06 16:15:15 +00:00
Joe Fernandez
0c53910308 am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 
* commit 'aa1d21379020440f173b58a9edf32381a999f7bf':
  docs: Add Android 5.1 to the uses-sdk manifest docs
 2015-03-03 01:32:41 +00:00
Joe Fernandez
2c25106ab4 docs: Add Android 5.1 to the uses-sdk manifest docs 
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
 2015-03-02 16:43:14 -08: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
Andrew Solovay
3999d0fdd7 am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit '2557fb070a54a65277c320f20cedde828febb1e2':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 17:11:11 +00:00
Andrew Solovay
7391b0a177 am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:09:33 +00:00
Andrew Solovay
d3cd0948c8 docs: New doc for creating an AfW Work Policy Controller 
See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
 2015-02-24 23:31:41 -08:00
Rich Slogar
925be07b26 am 87ea3f79: am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs 
* commit '87ea3f796cd8c7edff41bbfc7660e837a4366333':
  docs: mipmap link updates
 2015-02-19 19:32:52 +00:00
Rich Slogar
7319ea278c am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs 
* commit 'cc883a1ff3d46ffc3cb59915d6d292f91bd984a2':
  docs: mipmap link updates
 2015-02-19 19:12:48 +00:00
Rich Slogar
0f44b94d5d docs: mipmap link updates 
Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
 2015-02-19 10:48:37 -08:00
Rich Slogar
e9d86f5853 am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989 
* commit '9f807e7ef2793e02b592afa33d73633bb9343c4c':
  docs: site mipmap folder updates
 2015-02-18 00:32:32 +00:00
Rich Slogar
502f303c61 am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs 
automerge: 797c989

* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
  docs: site mipmap folder updates
 2015-02-18 00:13:07 +00:00
Oliver Woodman
6a71e814a3 am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d 
automerge: 1289d52

* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
  Update ExoPlayer developer guide.
 2015-02-17 22:47:16 +00:00
Oliver Woodman
2a6bf82e26 am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs 
automerge: a40eb5d

* commit 'a40eb5db455ebb225a7ff0afa244256079d8cf20':
  Update ExoPlayer developer guide.
 2015-02-17 22:27:16 +00:00
Rich Slogar
40132ee15a Merge "docs: site mipmap folder updates" into lmp-docs 2015-02-17 22:08:42 +00:00
Oliver Woodman
a2e9e27f4c Update ExoPlayer developer guide. 
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.

Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
 2015-02-17 20:47:17 +00:00
Rich Slogar
69223702e4 docs: site mipmap folder updates 
b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
 2015-02-17 12:34:35 -08:00
Luan Nguyen
4317ab134b am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '86391a2f63d60513279481e02c7234367cbced85':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:33:24 +00:00
Luan Nguyen
968db3619a am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:33:18 +00:00
Luan Nguyen
71cf2b6d53 am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
automerge: e0306bb

* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:15:09 +00:00
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
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
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
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
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
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
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