Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
264,783 Commits 3 Branches 0 Tags
6402be9575e6e209e03eab455bb50cbbe0bd2e9e
Commit Graph

13758 Commits

Author SHA1 Message Date
Bert McMeen
e2a3cac750 Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 
am: feb0b87230

* commit 'feb0b87230c28b2303da217c07177f00b52e87d0':
  docs: Refinements for testing

Change-Id: Ieecec450459bcb175979a3ef3ddccb6161a598e2
 2016-05-26 23:09:40 +00:00
sreevanis
cfc48ccbfa Updated link to material design page. am: ff05383baf 
am: ee44b14cd4

* commit 'ee44b14cd44bf0576859bd0c9519ab0e61e063f8':
  Updated link to material design page.

Change-Id: Iaf4bc31d8541e75d3840e6c6f5aa5f667e0baf42
 2016-05-26 23:09:34 +00:00
Bert McMeen
feb0b87230 Merge "docs: Refinements for testing" into mnc-io-docs 
am: 9da0730d66

* commit '9da0730d66b36b11a93e147857f62e641ac76276':
  docs: Refinements for testing

Change-Id: I981bf909a77f680854064e5a45e9fad0aef07425
 2016-05-26 22:49:04 +00:00
Bert McMeen
9da0730d66 Merge "docs: Refinements for testing" into mnc-io-docs 2016-05-26 22:43:56 +00:00
Bert McMeen
6cb2cf7151 docs: Refinements for testing 
Bug: 28964312
Change-Id: Ie98b74860659046199f8ee920d1cd4899a9c7ce6
 2016-05-26 15:32:22 -07:00
sreevanis
ee44b14cd4 Updated link to material design page. 
am: ff05383baf

* commit 'ff05383baf0027dbb04cfa588a80f5d8806bf8aa':
  Updated link to material design page.

Change-Id: Ic56e38ad1b18c324577586a979364c8e1d0edf3a
 2016-05-26 22:21:29 +00:00
sreevanis
ff05383baf Updated link to material design page. 
Bug:28983647
Change-Id: Ic4ca199ca71d3cbfc3ffde477b423aebbf626ac1
 2016-05-26 15:06:13 -07: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
f23477385e Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs 2016-05-26 20:55:56 +00:00
Eric Schmidt
28bdf2907a Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 
am: 400aed3556

* commit '400aed3556d837e746252e1be03dd1ac54a383e5':
  docs: Removing CLI steps in getting started docs

Change-Id: Id585f59925373bda46a34c9bd6811603ea5ee66a
 2016-05-26 19:35:13 +00:00
Eric Schmidt
400aed3556 Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs 
am: 8e08dbe8f8

* commit '8e08dbe8f825e2de9cd79bf155a255543efb4c6c':
  docs: Removing CLI steps in getting started docs

Change-Id: If7ce2cdf3f9b27dd8f7ab36a83fe38d26a70e7ca
 2016-05-26 19:30:14 +00:00
Eric Schmidt
8e08dbe8f8 Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs 2016-05-26 19:26:32 +00:00
Eric Schmidt
18e457900b docs: Removing CLI steps in getting started docs 
Bug: 22875456
Bug: 21026809
Change-Id: I8f4fcca73c779407aac0b96299c60f8d6adae214
 2016-05-26 18:50:51 +00:00
smain@google.com
5d3ca78d3f add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 
am: e1bd7e15c5

* commit 'e1bd7e15c5958769025ba5c8bbf0d18d8e9bfb20':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I9a5f32d1828970a96dea0a31e62e1b80f564fed4
 2016-05-26 18:05:08 +00:00
smain@google.com
e1bd7e15c5 add redirect for Espresso Test Recorder doc that will soon be on TAC site. 
am: 8f60544180

* commit '8f60544180374beaab837bc0f3225e54d0d368a5':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I55f32372b245d136519e55e8dd79796f58a6231f
 2016-05-26 17:59:11 +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
smain@google.com
8f60544180 add redirect for Espresso Test Recorder doc that will soon be on TAC site. 
Change-Id: Ied13eedb15940b4a52562beffc9ea7652a0c4c76
 2016-05-26 10:33:07 -07:00
Yi Kong
03a1314f2e Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 2016-05-26 08:54:57 +00:00
Dirk Dougherty
a283dabdf5 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
  Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
 2016-05-26 05:44:29 +00:00
Dirk Dougherty
1cf99365cb Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a 
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
 2016-05-26 05:35:46 +00:00
Dirk Dougherty
a7c0788467 Merge "Remove spurious url reference." into mnc-mr-docs 
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
  Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
 2016-05-26 05:17:01 +00:00
Dirk Dougherty
1ed701493a Merge "Remove spurious url reference." into mnc-mr-docs 2016-05-26 05:03:25 +00:00
Chad Brubaker
86bceb87ca Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 
am: 11b56641e5

* commit '11b56641e5e466f5ca14bd118e819c3f04820d38':
  Track changes to network security config manifest configuration

Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
 2016-05-26 04:47:44 +00:00
Joe Fernandez
68fb46153f Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
 2016-05-26 04:47:34 +00:00
Chad Brubaker
11b56641e5 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
 2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
 2016-05-26 04:37:09 +00:00
Android Build Merger (Role)
ce99e3c571 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9 Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
  Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
 2016-05-26 04:26:11 +00:00
Chad Brubaker
c0f99aebdc Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 2016-05-26 04:09:40 +00:00
Dirk Dougherty
3930b5091e Remove spurious url reference. 
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
 2016-05-25 20:29:59 -07:00
Trevor Johns
5513b6776e docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e 
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
  docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
 2016-05-26 02:19:23 +00:00
Trevor Johns
46c1d5a5d2 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 
am: c8c2abed0e

* commit 'c8c2abed0e7418d7e0fb0ef73a0c363cec011b95':
  docs: Fix broken link in Volley training

Change-Id: I916717fca33fc1466cd1c022c6a4f5f931d00ebe
 2016-05-26 01:59:17 +00:00
Joe Fernandez
e8a0b488dc docs: Remove Advertising ID page and redirect to GMS reference docs 
b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
 2016-05-25 18:36:12 -07:00
Trevor Johns
c8c2abed0e docs: Fix broken link in Volley training am: 05dd9d2c29 
am: 346114e346

* commit '346114e3467cc06b2a90467a00288f6944dd969b':
  docs: Fix broken link in Volley training

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
 2016-05-26 01:32:43 +00:00
Trevor Johns
346114e346 docs: Fix broken link in Volley training 
am: 05dd9d2c29

* commit '05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
  docs: Fix broken link in Volley training

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
 2016-05-26 01:18:44 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training 
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
 2016-05-25 16:13:21 -07:00
Amanda Kassay
29b04437b1 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe 
am: a475ff360c

* commit 'a475ff360c9457ecbef6af97ca7228dc9cd5c139':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
 2016-05-25 21:50:13 +00:00
Eric Schmidt
31e070a1b3 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c 
am: 3c2709c6b7

* commit '3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55
 2016-05-25 21:50:00 +00:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
 2016-05-25 21:35:54 +00:00
Eric Schmidt
3c2709c6b7 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 
am: 5548a7c59c

* commit '5548a7c59cf6a41095c72189fee7e522b5cab8f1':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
 2016-05-25 21:35:43 +00:00
Android Build Merger (Role)
cb3ae33cfe Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 2016-05-25 21:28:20 +00:00
Amanda Kassay
4be59f0ae3 Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
am: c68d8768c8

* commit 'c68d8768c84dd045d3db3f685a95963eb315be8c':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I40fa99170770712c4d844eab0d1e3d6fa9373d90
 2016-05-25 21:28:01 +00:00
Eric Schmidt
5548a7c59c Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 2016-05-25 21:27:35 +00:00
Amanda Kassay
c68d8768c8 Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
This reverts commit 85b7df2697.

Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
 2016-05-25 17:14:08 -04:00
Chad Brubaker
56f2f91793 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 
am: d1df52a46b

* commit 'd1df52a46beb5babd0d9f3257b2ade53c9c763cf':
  Fix incorrect cleartext attribute

Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
 2016-05-25 18:36:47 +00:00
Alex Klyubin
d1df52a46b Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 
am: 56f32483b0

* commit '56f32483b04723bf750e51badcfec3203c352d32':
  Fix incorrect cleartext attribute

Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
 2016-05-25 18:24:31 +00:00
Chad Brubaker
56f32483b0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 
am: f2e0a719d0

* commit 'f2e0a719d00c4a7c6865f6784efc9b3f88421136':
  Fix incorrect cleartext attribute

Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
 2016-05-25 18:16:03 +00:00
Alex Klyubin
f2e0a719d0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 2016-05-25 18:04:54 +00:00