Commit Graph

1653 Commits

Author SHA1 Message Date
Kevin Hufnagle
b04f86acae cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185
am: f5250c5b37

* commit 'f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
2016-06-01 18:10:43 +00:00
Kevin Hufnagle
f5250c5b37 cherry-pick: docs: Added note that <application> at end of manifest.
am: d5368b8185

* commit 'd5368b81857a04879ed55be2a67f034cce4e5094':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
2016-06-01 18:02:22 +00:00
Kevin Hufnagle
d5368b8185 cherry-pick: docs: Added note that <application> at end of manifest.
After cherry picking, removed trailing whitespace at end of lines.

Bug: 28823898
Change-Id: I30d69f1877d772893965e1512455f3addb397c80
Original-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a
2016-05-31 19:41:52 -07:00
Hemal Patel
747d945b2c Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8
am: 71b5005a66

* commit '71b5005a66872c25aaf71be865246294d0888279':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b
2016-05-28 01:24:52 +00:00
Hemal Patel
71b5005a66 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs
am: 709f0df0d8

* commit '709f0df0d883ee5351d4f5688360fa76f9a84dbc':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8
2016-05-28 01:20:26 +00:00
Hemal Patel
709f0df0d8 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 2016-05-28 01:16:51 +00:00
Kevin Hufnagle
397ae7a2e6 resolve merge conflicts of 7f7eec3 to nyc-dev
Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668
2016-05-26 14:57:15 -07:00
Kevin Hufnagle
7f7eec31f8 Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs
am: f23477385e

* commit 'f23477385edbf1e8ecc8c280867fb39698da4b8d':
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.

Change-Id: I59ebda20856fd90f50968f9a341b8f87ce2bd9c1
2016-05-26 20:59:57 +00:00
Kevin Hufnagle
da90584135 Cherry pick: docs: Edited "Features Reference" section in
"<uses-feature>" page.

The "Features Reference" section now lists all hardware and software
features that apps can use on devices running Marshmallow, and some
existing features now have more descriptive examples.

Converted the tables listing hardware and software features to h4
elements and definition lists to make the page more reader-friendly,
particularly on handheld devices.

Bug: 27803596
Change-Id: I3490f5dcde6a838d69940c70e06d9cd2cb8a7bdc
2016-05-26 10:51:02 -07:00
Hemal Patel
eb95687745 Docs: Fixed an invalid initialization of ExampleProvider member in Content URI
patterns docs sample

Bug: 28679030
Change-Id: Ia8f30fa82dbbced9c177e39a61834f25d5b331b2
2016-05-25 19:11:59 -07:00
Chris Craik
a4316e962c Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29
am: 6badb0fb54

* commit '6badb0fb54a72026dfe5d04e2556637b116a9c91':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ie324dd06265e48abe229c101f638e98e906bb199
2016-05-19 18:45:25 +00:00
Chris Craik
6badb0fb54 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53
am: f7688a4f29

* commit 'f7688a4f297fcab18ffdbd0ed10405ba862e8ec9':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I7f3c0af53759216af85351d950631af81cdf1316
2016-05-19 18:35:30 +00:00
Chris Craik
f7688a4f29 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1
am: c387613d53

* commit 'c387613d53284816ebb00ebeb41633f6179fc972':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I648ee1970cae83a816e9462dcbdd2208b7c205d4
2016-05-19 18:31:33 +00:00
Chris Craik
c387613d53 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c
am: 8fc4c789f1

* commit '8fc4c789f1a356d765e98b0c3f1569fabbfb0890':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I42b9e0c852a685bd0ae1d5dd1145769b9dfd095d
2016-05-19 18:21:26 +00:00
Chris Craik
8fc4c789f1 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8
am: f6987bc94c

* commit 'f6987bc94c00fa1390aee6f665a560dcb94d7942':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ice3af646ca302dea7797a2ff65ed83da7beaaa90
2016-05-19 18:10:27 +00:00
Chris Craik
f6987bc94c Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd
am: b6f51341e8

* commit 'b6f51341e8bb34de8dfdc2694599c7090971fdf8':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I323752b6f1f51a659af0aa84e7305c75ccbf0552
2016-05-19 17:59:55 +00:00
Chris Craik
b6f51341e8 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs
am: 36785ff4bd

* commit '36785ff4bda29f8055864e081012e12077509889':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I9f50650cb3d52ba76aa61a28b9bf3aef36682d83
2016-05-19 17:49:59 +00:00
Chris Craik
36785ff4bd Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs 2016-05-19 17:22:57 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
2016-05-16 22:19:41 +00:00
Billy Lamberta
51ceb1bad1 Merge "docs: work minisite" into mnc-io-docs
am: 8f740bea13

* commit '8f740bea131ca0234fee9dce273f23c6f21ddf2f':
  docs: work minisite

Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
2016-05-16 22:12:37 +00:00
Billy Lamberta
e1277eb819 docs: work minisite
Adds minisite at docs/html/work. Adds landing page and
Android for Work specific guides. Moves docs from
training/enterprise and add redirects. Update resource
card info and add new images. Update sitemap, _book, and
add sidebar navigation menu.

bug: 27744376
Change-Id: Ib09f7fc6352dfde7a60fc674b06488c651b196e2
2016-05-16 13:36:55 -07:00
smain@google.com
e9746f7a6a Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1
am: 6c568e6322

* commit '6c568e632242e99eb255f721edcbec0223f9934d':
  Update links for all files under sdk/ that moved to studio/

Change-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc
2016-05-15 03:11:46 +00:00
smain@google.com
6c568e6322 Update links for all files under sdk/ that moved to studio/ am: 89d11705a1
am: d10e0132a1

* commit 'd10e0132a124f5a24bec436600e04b8f97720e7e':
  Update links for all files under sdk/ that moved to studio/

Change-Id: If4a364fecbbb012f5b6beb739d879b003f90e6d9
2016-05-15 03:09:06 +00:00
smain@google.com
89d11705a1 Update links for all files under sdk/ that moved to studio/
Change-Id: I624621dfd7df0f441d0b559e5a12029e5e299964
2016-05-15 02:55:23 +00:00
Kevin Hufnagle
90fa73b6d6 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008
am: e60af6b9e2

* commit 'e60af6b9e2645144cda30c5e54a1267f05ac1d0d':
  docs: App Translation API updates

Change-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb
2016-05-13 17:20:42 +00:00
Joe Fernandez
e60af6b9e2 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0
am: 70f2e39008

* commit '70f2e3900830f58cd8b4644319ba7e173c49f7c3':
  docs: App Translation API updates

Change-Id: Id1b10da621def8add8384011755a8a7061e06ff0
2016-05-13 17:17:53 +00:00
Joe Fernandez
ec6effa1b0 Merge "docs: App Translation API updates" into mnc-docs
am: 1ede811143

* commit '1ede811143d32afe8ba6ce49a19060da4a1b6092':
  docs: App Translation API updates

Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d
2016-05-13 17:11:08 +00:00
Andrew Solovay
8363a70024 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571
am: dc4cd59183

* commit 'dc4cd59183fec0d5dc5661e6015f856f66d65ce9':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed
2016-05-12 18:48:50 +00:00
Andrew Solovay
dc4cd59183 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077
am: 76f95f5571

* commit '76f95f557129a583a52b8d7c896510fc3e2e02e8':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I16fb362316afee6e6a4565184ef1c9798e1530be
2016-05-12 18:46:17 +00:00
Andrew Solovay
ad87d2beaf docs: Noted that custom permissions must be unique per-device
We'd already noted this in the "new in Android 5.0" page but we
hadn't moved this into the base "permissions" pages. Added it, with
some usage recommendations from the bug.

Also fixed some formatting while I had the files open.

See first comment for doc stage location.

bug: 18143176
Change-Id: I9cc1a8865492ebf30c7a0f7c325669ded670933e
2016-05-11 15:23:53 -07:00
Joe Fernandez
5310e2d669 docs: App Translation API updates
Includes all updates to App Translation API content/text. Also
includes "Related Resource" cards.

Bug: 27729402

Change-Id: I0385f448b7b92fe420f3b51394d9a659e7b6df81
Original-Change-Id: Ibcde400fe8b340f032d1c458c83deb828450c9a5
2016-05-06 10:30:56 -07:00
Jaewan Kim
cda3cab8dd Merge "Fix documentation for drawable resource" into mnc-docs am: 2d542c5558 am: d3eacb56b6 am: 7179b0b52f
am: 3c523f65a8

* commit '3c523f65a87f8fd0f30ea41ac205687111b218ea':
  Fix documentation for drawable resource

Change-Id: Ia726bfeb247b212fadfb07f6e241295d07f16256
2016-05-04 00:34:33 +00:00
Jaewan Kim
3c523f65a8 Merge "Fix documentation for drawable resource" into mnc-docs am: 2d542c5558 am: d3eacb56b6
am: 7179b0b52f

* commit '7179b0b52f64a5838cc367fea9407ec120b4fd2e':
  Fix documentation for drawable resource

Change-Id: Ic66e603345daf1c915939330a3f4cac52787610e
2016-05-04 00:29:25 +00:00
Jaewan Kim
5d98012000 Fix documentation for drawable resource
Change-Id: Ic7cd4dd75dc75c26184b71049589588fe658a9a3
2016-05-03 05:14:01 +00:00
Adam Lesinski
1bfe7f6c65 Add Complex XML Resources guide to docs
Bug:27101564
Change-Id: I701230a242e0ec6c4cea2808556f9b1054866612
2016-04-28 13:21:23 -07:00
Kevin Hufnagle
27076c7bfc Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am: fa8847d am: ee3411d
am: 0e5d260

* commit '0e5d260ae793a42efc974c0674a530f808d7f05a':
  docs: [Revert] Improved description of "package" attribute (manifest).

Change-Id: I336b8fa0787934813004b8c3b322a408635c6c87
2016-04-27 05:40:59 +00:00
Kevin Hufnagle
096e5a807f Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am: 190bf3b943 am: 19db30b
am: 7e8840d

* commit '7e8840dec7879e2973ebf1e09c74a482c1ee8651':
  docs: Improved description of "package" attribute (manifest).

Change-Id: I8ea2623afea04cc3f5c5b9550fc66cb42d79a5d2
2016-04-27 05:40:13 +00:00
Joe Fernandez
6c3822ef5a Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237
am: b79b808

* commit 'b79b80882c34f0c540e84c7a3a90b73c617e0635':
  docs: InfoPros, Project 02, Batch 03

Change-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247
2016-04-27 03:11:53 +00:00
Jesse Hall
4d8062e1c1 docs: Remove texture compression formats that don\'t exist am: 2112afe am: 8d949de
am: 54bf946

* commit '54bf9464697af53381af5bf8f980f3a3336b4369':
  docs: Remove texture compression formats that don't exist

Change-Id: I9b572855315a34db894dfea4ae808769890c97df
2016-04-27 03:09:25 +00:00
Kevin Hufnagle
0e5d260ae7 Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am: fa8847d
am: ee3411d

* commit 'ee3411d94bda3a091f1ba69dfcd7efa12d3e13f3':
  docs: [Revert] Improved description of "package" attribute (manifest).

Change-Id: Ia6f54070f06eace4014e62a3a20ce9befd2eccc3
2016-04-26 08:50:48 +00:00
Kevin Hufnagle
7e8840dec7 Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am: 190bf3b943
am: 19db30b

* commit '19db30bc49de27090422ad985eb69bace3aebeec':
  docs: Improved description of "package" attribute (manifest).

Change-Id: I90fa4b675592889fd9252e6bdaff24965fc48046
2016-04-26 08:50:22 +00:00
Joe Fernandez
b79b80882c Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005
am: 94e5237

* commit '94e52371b1512ec7248856bc369d52db4887cedc':
  docs: InfoPros, Project 02, Batch 03

Change-Id: I7b25fca6d54a0729881c6918b7e020ee1b182594
2016-04-26 07:52:52 +00:00
Jesse Hall
54bf946469 docs: Remove texture compression formats that don\'t exist am: 2112afe
am: 8d949de

* commit '8d949de289355c67c9279cb3770630b5da3e3672':
  docs: Remove texture compression formats that don't exist

Change-Id: I2e0c96be826709daf6c9f8f3478bb3e1a2719479
2016-04-26 07:51:37 +00:00
Kevin Hufnagle
bdc74232d1 docs: [Revert] Improved description of "package" attribute
(manifest).

Per discussion with ddougherty@, decided that this was a high-risk,
low-reward change. Have "undone" the change with the given
"Original-Change-Id" as a result.

Bug: 2735276
Change-Id: I1f6089a1319180aed7d6fdbcf182c5fbe4b49abb
Original-Change-Id: Ifa30615c1cca5f6f19e4d1d0c071e4e256b3151b
2016-04-19 18:33:12 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Kevin Hufnagle
8998fe68b1 docs: Improved description of "package" attribute (manifest).
The description of the "package" attribute for an Android
application's <manifest> element now states more clearly that the
Android package name and the Java package name(s) used in the app's
classes do not need to be the same.

Bug: 2735276
Change-Id: Ifa30615c1cca5f6f19e4d1d0c071e4e256b3151b
2016-04-15 15:00:55 -07:00
Chad Brubaker
2df5ba777a Document when usesCleartextTraffic is ignored.
In N and above when using an Android Network Security Config the
cleartext configuration from that is used and
android:usesCleartextTraffic in the manifest is ignored.

Bug:27596429
Change-Id: I50ec765cead6cfd6bbaec585723f99d72e0fd945
2016-04-12 11:07:51 -07:00
Joe Fernandez
d00f005049 Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs 2016-04-11 16:24:36 +00:00
Joe Fernandez
7adb4c8a45 docs: InfoPros, Project 02, Batch 03
- Removing API 15 and lower work-arounds

b/26490262

Change-Id: Ie8ca92bbff68ca3bc67d2b81164d970058a8a8a8
2016-04-11 09:21:03 -07:00
Jesse Hall
2112afe75c docs: Remove texture compression formats that don't exist
Bug: 27906767
Change-Id: Ifb3d7f0455a4349e76727c497d52f3d0d5fa8838
2016-04-09 21:01:39 -07:00