smain@google.com
49d7803f04
resolve merge conflicts of 946609b to nyc-dev
...
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
2016-04-26 17:25:09 -07:00
Cheryl Potter
dc8f3eb2f3
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2
...
am: 39579d7
2016-04-26 21:50:44 +00:00
smain@google.com
ed790130de
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690
...
am: 73b5cc9
2016-04-26 21:49:15 +00:00
smain@google.com
80704cffc6
change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c
...
am: 0619ef2
2016-04-26 21:47:09 +00:00
Adarsh Fernando
38b412c09d
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040
...
am: f654443
* commit 'f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
2016-04-26 21:44:35 +00:00
Adarsh Fernando
57034255d5
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc
...
am: fe47b6d
* commit 'fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
2016-04-26 21:42:02 +00:00
Adarsh Fernando
dd0d888973
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91
...
am: 8776f89
2016-04-26 21:39:34 +00:00
Cheryl Potter
946609b454
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs am: 8dbdfc4 am: 027d322
...
am: 97c36d3
2016-04-26 06:10:34 +00:00
Cheryl Potter
39579d70b3
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d
...
am: 13308fc2
2016-04-26 04:53:15 +00:00
Scott Main
73b5cc9cf3
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6
...
am: c4ec690
2016-04-26 04:51:27 +00:00
smain@google.com
0619ef243f
change Mac JDK requirement to 6 am: 611a2f4
...
am: 3b1f66c
2016-04-26 04:50:01 +00:00
Adarsh Fernando
f6544435b5
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405
...
am: 6eed040
2016-04-26 04:48:13 +00:00
Adarsh Fernando
fe47b6d645
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1
...
am: abb5afc
2016-04-26 04:46:46 +00:00
Adarsh Fernando
8776f8940a
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413
...
am: 88d1e91
2016-04-26 04:44:56 +00:00
Dake Gu
eb8d2fcb50
leanback: Fix link to changed API setTitle()
...
To match ag/952395.
Change-Id: I96cf9caa34bd560f14f7864201f3ac228cd2537d
2016-04-21 14:50:26 -07:00
Trevor Johns
59c9a93fc2
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
...
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee
2016-04-20 18:35:57 +00:00
Trevor Johns
483abe2d8b
Remove links to createAndInitializeUser() and createUser()
...
These methods in DevicePolicyManager have been removed from the
public API in NYC.
Converting @link tags to @code to avoid error during JavaDoc gen.
Change-Id: I5d481ccf65bcf83a61f43cfac8ae474656ff34c1
2016-04-19 17:01:12 -07:00
Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3
2016-04-19 02:03:59 -07:00
Alex Klyubin
a65707d3f3
Clarify how to replace cert generated by Android Keystore.
...
This updates Android Keystore developer documentation to clarify how
to replace the self-signed certificate create by Android Keystore when
it generates a new key pair. Some developers are attempting to use
KeyStore.setCertificateEntry which is the wrong method for this. The
correct method is KeyStore.setKeyEntry.
Bug: 28152878
Change-Id: I306447b7792ecad5fbb49bd691a57bedb5207003
2016-04-13 15:33:53 -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
Cheryl Potter
027d3224c0
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs
...
am: 8dbdfc4
2016-04-06 20:33:07 +00:00
Cheryl Potter
8af8d4d9e9
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs
...
am: cffbbc8
2016-04-06 20:26:12 +00:00
Cheryl Potter
8dbdfc4d3b
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs
2016-04-06 20:23:27 +00:00
Cheryl Potter
cffbbc8652
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs
2016-04-06 20:23:04 +00:00
Scott Main
b9709f6e95
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs
2016-04-06 19:43:55 +00:00
Cheryl Potter
c8513915df
docs: AVD Manager docs for AS 2.0
...
b/26907919
Change-Id: I8de2b12fa12bcac7b1113e87f35d98300a89a3f9
2016-04-06 11:27:02 -07:00
Trevor Johns
a5060ee80d
Merge branch 'mnc-mr-docs' into mnc-ub-dev
...
Large merge to reconnect automerger for docs branch to mainline.
Conflicts:
docs/html-intl/intl/es/index.jd
docs/html-intl/intl/es/preview/download.jd
docs/html-intl/intl/es/preview/index.jd
docs/html-intl/intl/ja/index.jd
docs/html-intl/intl/ja/preview/download.jd
docs/html-intl/intl/ja/preview/index.jd
docs/html-intl/intl/ko/index.jd
docs/html-intl/intl/ko/preview/download.jd
docs/html-intl/intl/ko/preview/index.jd
docs/html-intl/intl/pt-br/index.jd
docs/html-intl/intl/pt-br/preview/download.jd
docs/html-intl/intl/pt-br/preview/index.jd
docs/html-intl/intl/ru/index.jd
docs/html-intl/intl/ru/preview/download.jd
docs/html-intl/intl/ru/preview/index.jd
docs/html-intl/intl/zh-cn/index.jd
docs/html-intl/intl/zh-cn/preview/download.jd
docs/html-intl/intl/zh-cn/preview/index.jd
docs/html-intl/intl/zh-tw/index.jd
docs/html-intl/intl/zh-tw/preview/download.jd
docs/html-intl/intl/zh-tw/preview/index.jd
docs/html/guide/topics/manifest/compatible-screens-element.jd
docs/html/guide/topics/manifest/uses-feature-element.jd
docs/html/preview/download.jd
docs/html/preview/features/runtime-permissions.jd
docs/html/sdk/index.jd
docs/html/tools/revisions/studio.jd
docs/html/tools/sdk/eclipse-adt.jd
docs/html/tools/support-library/features.jd
telephony/java/android/telephony/TelephonyManager.java
Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
2016-04-05 20:32:07 -07:00
smain@google.com
611a2f4f27
change Mac JDK requirement to 6
...
Change-Id: I1b2c8cd393488430b98d618a5c4843a5d5466bac
2016-04-05 19:33:24 -07:00
Cheryl Potter
4a7f004de2
docs: URL and App Indexing API updates for AS 2.0 support
...
b/26642964
Change-Id: Iafd10786fc79aace129b151a6e26fe516bb068de
2016-04-05 19:19:55 -07:00
smain@google.com
66bbcaa4af
update Develop tab landing page with Studio 2.0 announcement.
...
Change-Id: I4b7ec7196f125995b89345817ebd183c9b3dd975
2016-04-05 18:53:45 -07:00
Adarsh Fernando
3dbc405b5e
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs
2016-04-05 20:57:08 +00:00
Adarsh Fernando
37cc54ebf1
Docs: Added Instant Run feature overview section
...
- Added notes in other docs related to IR compatibility
- Changed 65K Dex Limit -> 64K Dex Limit
Bug:24709303
Bug:27571202
Bug:27794423
Bug:26230674
Change-Id: I16f530df6169602261c6b0a049de9c53e8819c9b
2016-04-05 13:43:06 -07:00
Adarsh Fernando
b896cd1570
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
...
Bug:26986595
Change-Id: I790fc26dd1ffd689c6144a0b0aeaa5ee6ec7d916
2016-04-05 10:46:56 -07:00
Adarsh Fernando
7961413a72
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs
2016-04-05 16:58:55 +00:00
Dirk Dougherty
9577d31b10
Update studio landing page and add all-new install flow docs.
...
bug: 27850063 (update system reqs for 2.0)
bug: 27725026 (update download page for 2.0)
bug: 23908299 (clean up download and get started)
depends on CL: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
Change-Id: Id56ddec26e5701f69cd3e3ce7dc64cd28e98c8f3
2016-04-04 15:59:13 -07:00
Kevin Hufnagle
7c909cc8db
Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs
2016-04-04 18:21:49 +00:00
sreevanis
e7b8c796e6
Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs
...
am: 63f15a9
2016-04-04 16:49:22 +00:00
Joe Fernandez
5f415c27f7
Merge "Add missing </pin-set>" into mnc-mr-docs
2016-04-04 16:44:40 +00:00
Joe Fernandez
c8dcc2be4e
Merge "Fix application manifest XML" into mnc-mr-docs
2016-04-04 16:44:22 +00:00
Sreevani Sreejith
63f15a9240
Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs
2016-04-04 16:41:25 +00:00
Joe Fernandez
4ec374915b
Merge "docs: April 2016 Dashboard update" into mnc-mr-docs
2016-04-04 16:06:16 +00:00
Joe Fernandez
77f69b148f
docs: April 2016 Dashboard update
...
Change-Id: I82aa89ad0cddce18b6c2d8a913fb47986c7ede68
2016-04-04 08:49:28 -07:00
sreevanis
e2a81a2232
docs: Added new partner logos to the car brands section of auto index
...
page.
Bug:27480935
Change-Id: Ia7570954c11cc7cf1bae7328f1c9975658ed3668
2016-04-01 13:05:42 -07:00
Andrew Solovay
242f06cd67
Merge "Revert "Updates for Play" April Fool's joke." into mnc-mr-docs
2016-04-01 18:34:14 +00:00
Andrew Solovay
9b7a159613
Revert "Updates for Play" April Fool's joke.
...
Joe asked me to revert this now, so Scott can start doing his AS
updates. The reversion won't take effect on the site until the next
scheduled DAC update, probably April 5.
This reverts commit a47a9a8f11
2016-04-01 18:16:26 +00:00
Dirk Dougherty
3afd52ab58
Merge "Updates for Play." into mnc-mr-docs
2016-03-31 23:15:16 +00:00
Dirk Dougherty
a47a9a8f11
Updates for Play.
...
Change-Id: Ibc1741a06aacd833fb3a3337e7ab121eba04f3b6
2016-03-31 15:03:25 -07:00
Dan Yu
cac018ba74
Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs
2016-03-31 21:38:25 +00:00
Adarsh Fernando
44eb11a88b
Docs: Added instructions to launch instrumented tests in AS using CTL
...
Bug:24812224
Change-Id: Ieee9ea87d7e463c6c57ffa4d1f12c5b48a9cefe7
2016-03-31 13:22:08 -07:00
Kevin Hufnagle
540877194b
docs: "Result is:" paragraph now in correct position on page.
...
The "Building a Simple User Interface" page now displays a paragraph
with the text "The result looks like this:" in the correct location
(i.e. after the steps for "Create a Linear Layout").
Bug: 26778824
Change-Id: Ib2a94975bd867897ce4382da6347584d578b3d11
2016-03-31 09:28:04 -07:00
