OSDN Git Service

android-x86/frameworks-base.git
8 years agoFix docs for View.DRAG_FLAG_GLOBAL
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:08:52 +0000 (00:08 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL
am: 9a44eaec53

Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50

8 years agoFix docs for View.DRAG_FLAG_GLOBAL
Vladislav Kaznacheev [Tue, 12 Jul 2016 22:24:48 +0000 (15:24 -0700)]
Fix docs for View.DRAG_FLAG_GLOBAL

Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177

8 years agoMerge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\"...
Sudheer Shanka [Tue, 12 Jul 2016 19:59:12 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e am: cbe258aa27  -s ours
am: 5b28589127

Change-Id: Id67b945304514fb291021ad30835ecb8f04e0cfb

8 years agoMerge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:59:08 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 am: 1bb51deaf4  -s ours
am: 5441a248f4

Change-Id: I2441f27ef71cd55f302821f429995414c997c222

8 years agoMerge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:52:48 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e
am: cbe258aa27  -s ours

Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4

8 years agoMerge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:52:44 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88
am: 1bb51deaf4  -s ours

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61

8 years agoMerge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:47:49 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3
am: a730e5977e

Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae

8 years agoMerge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:47:44 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c
am: e8458d8f88

Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836

8 years agoMerge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:42:40 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b
am: 322e70cef3

Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220

8 years agoMerge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:42:38 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48
am: 008d66e49c

Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca

8 years agoMerge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:34:39 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours
am: 6ae7a5f72b

Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb

8 years agoMerge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:34:38 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours
am: 7975dd5b48

Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0

8 years agoMerge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9
am: 76c9d70756  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68

8 years agoMerge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e
am: fd0757f195  -s ours

Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329

8 years agoMerge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf
am: cb7e0643c9

Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42

8 years agoMerge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev...
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16

8 years agoMerge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am: d327d73edf

Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1

8 years agoMerge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96

8 years agoMerge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev

8 years agoMerge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev

8 years agoMerge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:18 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am: 4c8d924d4c

Change-Id: I8d8fca3aae027c6130590fae763fdba2a9f207b1

8 years agoMerge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev

8 years agoMerge \"Include new constant for encryption status in the getter\'s javadoc\" into...
Amith Yamasani [Tue, 12 Jul 2016 17:47:05 +0000 (17:47 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7

8 years agoMerge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
Amith Yamasani [Tue, 12 Jul 2016 17:40:12 +0000 (17:40 +0000)]
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 12 Jul 2016 16:27:20 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: a2e1bb8c3e  -s ours

Change-Id: I9cc0d048ec0185cdb7e4a69f6d75640fc22390ab

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 12 Jul 2016 16:27:16 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 84c67fa304  -s ours

Change-Id: Iab40dd880d5a6c97614b4958747e4e7d2010c6ed

8 years agoMerge \"docs: July 2016 Dashboard update\" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:27:12 +0000 (16:27 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am: ba64d0ec2e

Change-Id: I23be5d435997ae2097dd7978f8a151b2d6074f97

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "docs: July 2016 Dashboard update" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev

8 years agoMerge \"App launch - Test app changes\" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:09:18 +0000 (16:09 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c

8 years agodocs: July 2016 Dashboard update
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update

Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717

8 years agoMerge "App launch - Test app changes" into nyc-dev
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev

8 years agoMerge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" am: ee4c8fb9eb
Hugo Benichi [Tue, 12 Jul 2016 13:20:56 +0000 (13:20 +0000)]
Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" am: ee4c8fb9eb
am: e82b43f77e

Change-Id: I20a3426002ebe6f4db9de7edf7c4072d0a27dbdc

8 years agoMerge \"Fix unsafe concurrent access in LegacyTypeTracker\"
Hugo Benichi [Tue, 12 Jul 2016 13:15:41 +0000 (13:15 +0000)]
Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am: ee4c8fb9eb

Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06

8 years agoMerge "Fix unsafe concurrent access in LegacyTypeTracker"
Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker"

8 years agoFix unsafe concurrent access in LegacyTypeTracker
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker

This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().

Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.

This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).

This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.

Bug: 29030387

(cherry picked from commit 78caa25870391f676e1edbd448b5ff3e12a99a1e)

Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 06:21:45 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 06:04:28 +0000 (23:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I59f3cb6bc56b5bb55e32ea870b875ab30c8bd28d
Auto-generated-cl: translation import

8 years agoDO NOT MERGE: Reduce shell power over user management.
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.

Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3

8 years agoDO NOT MERGE: Add pm operation to set user restrictions.
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.

Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df

8 years agoMerge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am: b039c753f3...
Bert McMeen [Tue, 12 Jul 2016 00:56:36 +0000 (00:56 +0000)]
Merge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am: b039c753f3 am: 40df51ce20
am: 3ed7666f03

Change-Id: I63cb2c22bc88bdbe657ccde673435a32cbe2e895

8 years agoMerge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am: b039c753f3
Bert McMeen [Tue, 12 Jul 2016 00:50:19 +0000 (00:50 +0000)]
Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am: b039c753f3
am: 40df51ce20

Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97

8 years agoMerge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
am: b039c753f3

Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1

8 years agoMerge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs

8 years agoMerge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am: 2f297621a1 am...
Bert McMeen [Tue, 12 Jul 2016 00:29:22 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am: 2f297621a1 am: 1dee5f4dbe
am: d8c8d710b7

Change-Id: I6087417af1d91756b44028ef8529cfacbe606869

8 years agoMerge \\"Docs: Information on OTA updates\\" into mnc-io-docs am: 2f297621a1
Bert McMeen [Tue, 12 Jul 2016 00:24:17 +0000 (00:24 +0000)]
Merge \\"Docs: Information on OTA updates\\" into mnc-io-docs am: 2f297621a1
am: 1dee5f4dbe

Change-Id: Ie1685c1393e740fb7d44ef8dbb714ed408eb4319

8 years agoDocs: Release Notes for Dev Preview 2
Bert McMeen [Fri, 24 Jun 2016 21:55:12 +0000 (14:55 -0700)]
Docs: Release Notes for Dev Preview 2

Bug: 29419006
Change-Id: I24f9aa03db1150ab303fa222009f888e0e4cb01d

8 years agoMerge \"Docs: Information on OTA updates\" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:18:48 +0000 (00:18 +0000)]
Merge \"Docs: Information on OTA updates\" into mnc-io-docs
am: 2f297621a1

Change-Id: I766877a188e5878001da9ffe91d2f09f49e8f3ee

8 years agoMerge "Docs: Information on OTA updates" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:14:47 +0000 (00:14 +0000)]
Merge "Docs: Information on OTA updates" into mnc-io-docs

8 years agoMerge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am...
Hemal Patel [Mon, 11 Jul 2016 23:49:53 +0000 (23:49 +0000)]
Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am: 93dd99c6aa am: 92c664b13d
am: e9ec18cd9f

Change-Id: I992e04521f93e709c6420c36ae424d37871ad2eb

8 years agodocs: Removed self-referencing links on Apps and Games pages.
Kevin Hufnagle [Mon, 11 Jul 2016 23:48:35 +0000 (16:48 -0700)]
docs: Removed self-referencing links on Apps and Games pages.

The "Distribute > Stories > Apps" and "Distribute > Stories > Games"
pages on DAC included cards that linked to the current page (in
other words, they were circular/self-referencing links).

Removed the metadata from the apps.html and games.html pages
accordingly.

Bug: 29881467
Change-Id: I2b6555ee565500e978ba3c4edef4d93b0bf9a239

8 years agoDocs: Information on OTA updates
Bert McMeen [Wed, 22 Jun 2016 00:01:31 +0000 (17:01 -0700)]
Docs: Information on OTA updates

Bug: 29545156
Change-Id: I557205fe9c1990d0dbfc020e20f610dae80bbcc5

8 years agoMerge \\\"Docs: Replaced fill_parent with match_parent\\\" into mnc-io-docs am: 1b72b...
Hemal Patel [Mon, 11 Jul 2016 23:36:47 +0000 (23:36 +0000)]
Merge \\\"Docs: Replaced fill_parent with match_parent\\\" into mnc-io-docs am: 1b72b7955d am: 202bfb4fc7
am: 79a3f25ce4

Change-Id: Ibac609fc851552c9930b11d74bc89c79f8ce26e8

8 years agoMerge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd9...
Hemal Patel [Mon, 11 Jul 2016 23:32:21 +0000 (23:32 +0000)]
Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd99c6aa
am: 92c664b13d

Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2

8 years agoMerge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am: 1b72b7955d
Hemal Patel [Mon, 11 Jul 2016 23:26:09 +0000 (23:26 +0000)]
Merge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am: 1b72b7955d
am: 202bfb4fc7

Change-Id: Ie5faab93a9c417f6191bb0855dd3ad9326f0c955

8 years agoMerge \"Fix docs for DragEvent\" into nyc-dev
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:26:05 +0000 (23:26 +0000)]
Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I33c231d19065a5acc26472d4c3f175351d2a6d10

8 years agoMerge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:25:59 +0000 (23:25 +0000)]
Merge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
am: 93dd99c6aa

Change-Id: I28de4c355c23d96ab52a945bfd26567063f25212

8 years agoMerge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:22:47 +0000 (23:22 +0000)]
Merge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs

8 years agoMerge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:21:01 +0000 (23:21 +0000)]
Merge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
am: 1b72b7955d

Change-Id: I8fec574e1501e84f69d9e53b02b0a7537bd3dc16

8 years agoMerge "Fix docs for DragEvent" into nyc-dev
TreeHugger Robot [Mon, 11 Jul 2016 23:17:40 +0000 (23:17 +0000)]
Merge "Fix docs for DragEvent" into nyc-dev

8 years agoMerge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:16:51 +0000 (23:16 +0000)]
Merge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs

8 years agoDocs: Replaced fill_parent with match_parent
Hemal Patel [Fri, 24 Jun 2016 00:11:15 +0000 (17:11 -0700)]
Docs: Replaced fill_parent with match_parent

The value fill_parent is deprecated in API Level 8 and replaced
with match_parent.

Bug: 19432266
Change-Id: Ie91b4de25f1b12ec93c52531785303d683b18d24

8 years agoMerge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am: 78125...
Andrew Solovay [Mon, 11 Jul 2016 22:08:56 +0000 (22:08 +0000)]
Merge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am: 78125ff7cb am: 28528e3c62
am: f550894eac

Change-Id: I201f56304c9dadda2163b37bb40d6e64006ed98e

8 years agoInclude new constant for encryption status in the getter's javadoc
Amith Yamasani [Mon, 11 Jul 2016 21:41:01 +0000 (14:41 -0700)]
Include new constant for encryption status in the getter's javadoc

Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.

Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719

8 years agoDocs: Changed Blank Activity to Basic Activity
Hemal Patel [Fri, 1 Jul 2016 20:33:14 +0000 (13:33 -0700)]
Docs: Changed Blank Activity to Basic Activity

As per Android Studio's latest version, Blank Activity is renamed to
Basic Activity. Hence, fixed step 6 to reflect the change.

Bug: 28177899
Change-Id: I824d60f936975645cd9116e8443771b68e132af9

8 years agoMerge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am: 78125ff7cb
Andrew Solovay [Mon, 11 Jul 2016 21:58:47 +0000 (21:58 +0000)]
Merge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am: 78125ff7cb
am: 28528e3c62

Change-Id: Ie9a21623f1491983aab4cfc624818bb3b8720185

8 years agoMerge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
Andrew Solovay [Mon, 11 Jul 2016 21:48:06 +0000 (21:48 +0000)]
Merge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
am: 78125ff7cb

Change-Id: Id68f9e49225f59e8cb94bcd7ab3905790dc2d223

8 years agoMerge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs
Andrew Solovay [Mon, 11 Jul 2016 21:40:26 +0000 (21:40 +0000)]
Merge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs

8 years agoMerge \\\"docs: Adding Android TV App Link docs\\\" into mnc-io-docs am: e0b687048f...
Daniel Yu [Mon, 11 Jul 2016 21:34:59 +0000 (21:34 +0000)]
Merge \\\"docs: Adding Android TV App Link docs\\\" into mnc-io-docs am: e0b687048f am: 68ef31fc36
am: 7579d70ca1

Change-Id: I44055a254be6be3cb938ef1c73108036b0ab79a7

8 years agoMerge \\\"Docs: Gestures docs\\\" into mnc-io-docs am: b7b9aa1a51 am: 1639959f3b
Bert McMeen [Mon, 11 Jul 2016 21:22:49 +0000 (21:22 +0000)]
Merge \\\"Docs: Gestures docs\\\" into mnc-io-docs am: b7b9aa1a51 am: 1639959f3b
am: 58b4f0d535

Change-Id: Ia3f0a3bfc04c045b35067ba2b6eecb8236618115

8 years agoMerge \\\"docs: Updated Create custom drawer view section with new xml attributes...
sreevanis [Mon, 11 Jul 2016 21:22:45 +0000 (21:22 +0000)]
Merge \\\"docs: Updated Create custom drawer view section with new xml attributes.\\\" into mnc-io-docs am: 9f1952a77b am: ced99e1199
am: fe7b26e229

Change-Id: I6770943c61c79023b1894db8d0923af26ea9edb9

8 years agoMerge \\"docs: Adding Android TV App Link docs\\" into mnc-io-docs am: e0b687048f
Dan Yu [Mon, 11 Jul 2016 21:20:57 +0000 (21:20 +0000)]
Merge \\"docs: Adding Android TV App Link docs\\" into mnc-io-docs am: e0b687048f
am: 68ef31fc36

Change-Id: I29f43f45d3412baf252af2b11d3cf4ec18025838

8 years agoMerge \"docs: Adding Android TV App Link docs\" into mnc-io-docs
Daniel Yu [Mon, 11 Jul 2016 21:16:07 +0000 (21:16 +0000)]
Merge \"docs: Adding Android TV App Link docs\" into mnc-io-docs
am: e0b687048f

Change-Id: If4741e27d7e6c37af8382012d8c596a077aae5f5

8 years agoMerge \\"Docs: Gestures docs\\" into mnc-io-docs am: b7b9aa1a51
Bert McMeen [Mon, 11 Jul 2016 21:15:05 +0000 (21:15 +0000)]
Merge \\"Docs: Gestures docs\\" into mnc-io-docs am: b7b9aa1a51
am: 1639959f3b

Change-Id: I2e0bd8898404178d11986795e0d402875d03c5bf

8 years agoMerge \\"docs: Updated Create custom drawer view section with new xml attributes...
Bert McMeen [Mon, 11 Jul 2016 21:15:02 +0000 (21:15 +0000)]
Merge \\"docs: Updated Create custom drawer view section with new xml attributes.\\" into mnc-io-docs am: 9f1952a77b
am: ced99e1199

Change-Id: Ieba52265148d0f453757aded27118cd8a9dd5c34

8 years agoMerge "docs: Adding Android TV App Link docs" into mnc-io-docs
Dan Yu [Mon, 11 Jul 2016 21:11:03 +0000 (21:11 +0000)]
Merge "docs: Adding Android TV App Link docs" into mnc-io-docs

8 years agoMerge \"Docs: Gestures docs\" into mnc-io-docs
Bert McMeen [Mon, 11 Jul 2016 21:07:39 +0000 (21:07 +0000)]
Merge \"Docs: Gestures docs\" into mnc-io-docs
am: b7b9aa1a51

Change-Id: Ic509201ae767b921ed523123ab3cd4ab3aa338ee

8 years agoMerge \"docs: Updated Create custom drawer view section with new xml attributes....
sreevanis [Mon, 11 Jul 2016 21:07:37 +0000 (21:07 +0000)]
Merge \"docs: Updated Create custom drawer view section with new xml attributes.\" into mnc-io-docs
am: 9f1952a77b

Change-Id: Ied1d1112ef47428795113ed86d1ed9b1bf5b30d0

8 years agoMerge "Docs: Gestures docs" into mnc-io-docs
Bert McMeen [Mon, 11 Jul 2016 21:01:42 +0000 (21:01 +0000)]
Merge "Docs: Gestures docs" into mnc-io-docs

8 years agoMerge "docs: Updated Create custom drawer view section with new xml attributes."...
Bert McMeen [Mon, 11 Jul 2016 20:59:03 +0000 (20:59 +0000)]
Merge "docs: Updated Create custom drawer view section with new xml attributes." into mnc-io-docs

8 years agoFix docs for DragEvent
Vladislav Kaznacheev [Mon, 11 Jul 2016 20:52:22 +0000 (13:52 -0700)]
Fix docs for DragEvent

Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1

8 years agoMerge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:20:39 +0000 (20:20 +0000)]
Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: Ifb20f4b32ec6a6972a5ee1f832d91e1c169bb543

8 years agoMerge \"docs: Fixed logic for determining image sample size\" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:20:31 +0000 (20:20 +0000)]
Merge \"docs: Fixed logic for determining image sample size\" into nyc-dev
am: 025ad10a9b

Change-Id: I702b5854378636490c819d26b5d6cf5325b9c076

8 years agoMerge \"docs: fix syntax error in \"Saving Files\" document\" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:20:26 +0000 (20:20 +0000)]
Merge \"docs: fix syntax error in \"Saving Files\" document\" into nyc-dev
am: 58be01168a

Change-Id: I84f2fb1765b6797c9e8bb5d149f5d00c87e77c42

8 years agoMerge \"docs: Updated link to UI Automator reference in \"Testing UI\" doc\" into...
Mark Lu [Mon, 11 Jul 2016 20:20:21 +0000 (20:20 +0000)]
Merge \"docs: Updated link to UI Automator reference in \"Testing UI\" doc\" into nyc-dev
am: 9c0b602beb

Change-Id: If0ba003bca5c37aa46ab2033edf952b6a76603ad

8 years agoMerge \"docs: remove out-of-date performance info\" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:20:17 +0000 (20:20 +0000)]
Merge \"docs: remove out-of-date performance info\" into nyc-dev
am: 62f199ed9f

Change-Id: Ic65fa736b9711f6c8b9f335a09dd23f3a97a4eec

8 years agoMerge "docs: fixed broken link in UsbManager javadocs" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:46 +0000 (20:13 +0000)]
Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev

8 years agoMerge "docs: Fixed logic for determining image sample size" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Fixed logic for determining image sample size" into nyc-dev

8 years agoMerge "docs: fix syntax error in "Saving Files" document" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:02 +0000 (20:13 +0000)]
Merge "docs: fix syntax error in "Saving Files" document" into nyc-dev

8 years agoMerge "docs: Updated link to UI Automator reference in "Testing UI" doc" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:59 +0000 (20:12 +0000)]
Merge "docs: Updated link to UI Automator reference in "Testing UI" doc" into nyc-dev

8 years agoMerge "docs: remove out-of-date performance info" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:32 +0000 (20:12 +0000)]
Merge "docs: remove out-of-date performance info" into nyc-dev

8 years agodocs: Adding Android TV App Link docs
Daniel Yu [Tue, 28 Jun 2016 16:54:43 +0000 (09:54 -0700)]
docs: Adding Android TV App Link docs

Adding docs for app links for ATV channel apps in
updated Channel Data topic. Adding screenshots and
diagram of app link card.

Bug: 23574268
Change-Id: I00ae953e1ec44352eaedb070c8ffd9bd02b13d7d

8 years agoMerge \\\"docs: work - fix app restriction string values\\\" into mnc-io-docs am...
Billy Lamberta [Mon, 11 Jul 2016 19:53:55 +0000 (19:53 +0000)]
Merge \\\"docs: work - fix app restriction string values\\\" into mnc-io-docs am: de37b1b270 am: 4b353b2a78
am: 0e6f2097d3

Change-Id: I96039d0f23c1f1da6d210fc411c679f16a42063f

8 years agoMerge \\"docs: work - fix app restriction string values\\" into mnc-io-docs am: de37b...
Billy Lamberta [Mon, 11 Jul 2016 19:43:56 +0000 (19:43 +0000)]
Merge \\"docs: work - fix app restriction string values\\" into mnc-io-docs am: de37b1b270
am: 4b353b2a78

Change-Id: I003422f613a5fe459c1ddf8f9453663f3145a8db

8 years agoAdded new partner logos to Auto index page. am: 94b61a29f5 am: 9c513f47c8
sreevanis [Mon, 11 Jul 2016 19:43:56 +0000 (19:43 +0000)]
Added new partner logos to Auto index page. am: 94b61a29f5 am: 9c513f47c8
am: b222c3127d

Change-Id: I8b2ce8062a021a621244cbd9c4b80f10a8f82160

8 years agodocs: Fixing badly formatted {@code} strings
Andrew Solovay [Mon, 11 Jul 2016 18:46:18 +0000 (11:46 -0700)]
docs: Fixing badly formatted {@code} strings

{@code} blocks in .jd files automatically escape special characters
(like <>&) in the contents, which is bad if the contents were
*already* escaped--it turns (e.g.) "&lt; foo &gt;"" into
"&amp;lt; foo &amp;gt;". Fixing it where I find it, by replacing
{@code} tags with old-fashioned <code></code>.

See first comment for doc stage location.

bug: 30038013
Change-Id: Ic502096dc69fb7b43f58a34c3f92fd3a41f033f6

8 years agoMerge \"docs: work - fix app restriction string values\" into mnc-io-docs
Billy Lamberta [Mon, 11 Jul 2016 19:12:42 +0000 (19:12 +0000)]
Merge \"docs: work - fix app restriction string values\" into mnc-io-docs
am: de37b1b270

Change-Id: Ib99f87a7e4226462a936f87610e968562e3b0da6

8 years agoAdded new partner logos to Auto index page. am: 94b61a29f5
sreevanis [Mon, 11 Jul 2016 19:06:51 +0000 (19:06 +0000)]
Added new partner logos to Auto index page. am: 94b61a29f5
am: 9c513f47c8

Change-Id: I3b218a0b80fb426ac3d567e7c87a6186529c4986

8 years agoMerge "docs: work - fix app restriction string values" into mnc-io-docs
Billy Lamberta [Mon, 11 Jul 2016 18:21:25 +0000 (18:21 +0000)]
Merge "docs: work - fix app restriction string values" into mnc-io-docs