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

2565 Commits

Author SHA1 Message Date
Andrew Solovay
7818f205e5 am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f99a16c943a4366bdfdba19534457f9e45538f7d':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:19:15 +00:00
Andrew Solovay
f2ff12ba00 Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 2015-04-02 19:25:25 +00:00
Andrew Solovay
3e3af5247f am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo. 
* commit '79c587eda40f3af622f9d1b81aa5a81682e985e4':
  docs: Fixed a typo.
 2015-04-01 18:32:46 +00:00
Andrew Solovay
d0609d1cb4 docs: Fixed formatting in android:documentLaunchMode syntax section 
Also fixed the line breaks in android:configChanges so the syntax
code box doesn't need a horizontal scroll bar.

See first comment for doc stage location.

bug: 19935160
Change-Id: I1ec34473e743a9f0c921f771cfb47129c47f9014
 2015-03-31 21:02:44 -07:00
Andrew Solovay
b2255d4f10 docs: Fixed a typo. 
See first comment for doc stage location.

bug: 19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0
 2015-03-31 20:13:57 -07:00
Andrew Solovay
6bb34ef538 am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '93ffb8633751c398b79ac894f741a0b745b3fc3d':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:49:05 +00:00
Andrew Solovay
164dd96eec am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '118915706ea9f52e503bc82bf616da438eaad65e':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:49:00 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Brian Carlstrom
88dde1db44 am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit 'd8507e3aa4c8b05f753cd9541014c391891c1f75':
  Update vmSafeMode documentation
 2015-03-17 19:44:55 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
Andrew Solovay
a83fd76089 docs: Fixed typo (spurious quotation mark). 
See first comment for stage location.

bug: 18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1
 2015-03-13 13:52:04 -07:00
Andrew Solovay
a8b5b2512f docs: Fixed broken image link, and broke long lines in code samples 
While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.

See first comment for doc stage location.

bug: 19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2
 2015-03-13 12:46:37 -07:00
Luan Nguyen
83b96e02a4 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 'd9eb3881f452ecb4b77062eb6505a3d7601d0a8c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:50:45 +00:00
Luan Nguyen
0d756f7d56 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 '217a435665880076abb71085e9d76aec4ff83b6d':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:13:39 +00:00
Luan Nguyen
42bb44dbf5 Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 2015-03-13 17:42:15 +00:00
Craig Mautner
e8ef4af3df am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '5be1afedd8f2289ba047473b242cd0535a4493fe':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:53:51 +00:00
Craig Mautner
98560bdf87 am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:29:21 +00:00
Craig Mautner
60a907e60c Correct docs to specify leading slash in paths. 
The guide documentation for the manifest data element contains a
grammar that implies leading slashes are not required for the path
part of a URI string. Also the path documentation does not mention
the need for a leading slash.

Grammar from documentation:
<scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]
                        ^
                        |
Included "/" -----------+

All internal usages of path, pathPrefix, and pathPattern, have a /
starting out the string and these attributes don't work without that
/.

This change updates the grammar and the documentation for the path
attributes.

Fixes bug 19540035

Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb
 2015-03-10 15:52:35 -07:00
Brian Carlstrom
f4e73a94d8 Update vmSafeMode documentation 
Bug: 2267583
Bug: 2553512
Bug: 12457423
Bug: 19664166
Change-Id: I6036c041176ead60deb745e1c4d27fe4addd47bd
 2015-03-09 14:28:20 -07:00
Glenn Kasten
f507759eea am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit 'e442d914b8a91b0893e59bca1aa75619ee59129d':
  Fix USB typos
 2015-03-09 17:01:26 +00:00
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