OSDN Git Service

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

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624

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 "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev
Geoffrey Pitsch [Tue, 12 Jul 2016 17:29:55 +0000 (17:29 +0000)]
Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev

8 years agoMerge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 17:09:31 +0000 (17:09 +0000)]
Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev

8 years agoMerge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc...
Rubin Xu [Tue, 12 Jul 2016 16:37:54 +0000 (16:37 +0000)]
Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev

8 years agoMerge "Add Group Id to PhoneAccount" into nyc-mr1-dev
Brad Ebinger [Tue, 12 Jul 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev

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

Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51

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

Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7

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

Change-Id: Idc78d3c900d6aef1ff78183bd3f187def98aed0c

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

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-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:41 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into...
Android Build Merger (Role) [Tue, 12 Jul 2016 16:11:24 +0000 (16:11 +0000)]
Merge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into nyc-mr1-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 \"App launch - Test app changes\" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:11:01 +0000 (16:11 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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 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 "also log details for neko rename events" into nyc-mr1-dev
Chris Wren [Tue, 12 Jul 2016 15:16:03 +0000 (15:16 +0000)]
Merge "also log details for neko rename events" into nyc-mr1-dev

8 years agoGuard against null object in scheduleNotifyUpdateAppWidgetLocked
Rubin Xu [Tue, 12 Jul 2016 15:05:59 +0000 (16:05 +0100)]
Guard against null object in scheduleNotifyUpdateAppWidgetLocked

Bug: 30085290
Change-Id: I4f12e1def98dff7e50b4d25a7d23e81bdbe0b7bd

8 years agoMerge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev
Mahaver Chopra [Tue, 12 Jul 2016 09:48:00 +0000 (09:48 +0000)]
Merge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev

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

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

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:19:08 +0000 (23:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie2c78f0ee8cc349517b13826856b6648bbb29461
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 agoConnectivityService dump: add apps blocked logs
Hugo Benichi [Mon, 11 Jul 2016 02:05:12 +0000 (11:05 +0900)]
ConnectivityService dump: add apps blocked logs

This patch adds NetworkInfo BLOCKED/UNBLOCKED status of apps to
ConnectivityService's dump logs.

The BLOCKED or UNBLOCKED status of an app is logged with the app uid
when the app calls getActiveNetworkInfo().

Examples:
mNetworkInfoBlockingLogs (most recent first):
  07-11 11:04:43.139 - BLOCKED 10060
  07-11 11:04:39.056 - UNBLOCKED 10061
  07-11 11:04:38.851 - BLOCKED 10061

Bug: 29981766
Change-Id: I6e2fde446702b92b0964ed894409b5d733d8f8a7

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

Change-Id: I568f07a35d75a5e8762e9c117a4d1b02e03e9cc0

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:21 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am: 2f297621a1 am: 1dee5f4dbe
am: d8c8d710b7

Change-Id: Id6f1de1dae8ee617518b9a8c656379d8dd93f0a0

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 "Disable using SIM language for Chunghwa Telecom and Far EasTone." into nyc...
Amit Mahajan [Tue, 12 Jul 2016 00:03:08 +0000 (00:03 +0000)]
Merge "Disable using SIM language for Chunghwa Telecom and Far EasTone." into nyc-mr1-dev

8 years agoMerge "Cleanup whole preloads directory" into nyc-mr1-dev
TreeHugger Robot [Mon, 11 Jul 2016 23:50:27 +0000 (23:50 +0000)]
Merge "Cleanup whole preloads directory" into nyc-mr1-dev

8 years agoMerge "Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs...
Android Build Merger (Role) [Mon, 11 Jul 2016 23:45:51 +0000 (23:45 +0000)]
Merge "Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am: 93dd99c6aa am: 92c664b13d am: e9ec18cd9f" into nyc-mr1-dev

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

Change-Id: Idff4581451ed551bd875d493715f41d6dc922a9e

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 "Don't force fstrim on OTA" into nyc-mr1-dev
Chris Tate [Mon, 11 Jul 2016 23:43:51 +0000 (23:43 +0000)]
Merge "Don't force fstrim on OTA" into nyc-mr1-dev

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

Change-Id: I6fb357788a646c427164d4b6996f2ca1c834b43f

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 \"Fix docs for DragEvent\" into nyc-dev
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:26:31 +0000 (23:26 +0000)]
Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I7acfd89bb3cd51273007d8dc7b899ae6b95c7937

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 \"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 "Set PrintDocumentInfo#mDataSize" into nyc-mr1-dev
Philip P. Moltmann [Mon, 11 Jul 2016 23:22:02 +0000 (23:22 +0000)]
Merge "Set PrintDocumentInfo#mDataSize" into nyc-mr1-dev

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:15:40 +0000 (22:15 +0000)]
Merge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am: 78125ff7cb am: 28528e3c62
am: f550894eac

Change-Id: If2ffeb50905a7e8a6205cbc643ffcbb3f0b7f44c

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 "Finalize MEP functionality." into nyc-mr1-dev
Tyler Gunn [Mon, 11 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge "Finalize MEP functionality." into nyc-mr1-dev

8 years agoMerge "Schedule backup of a package on a background thread" into nyc-mr1-dev
Fyodor Kupolov [Mon, 11 Jul 2016 21:51:01 +0000 (21:51 +0000)]
Merge "Schedule backup of a package on a background thread" into nyc-mr1-dev

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 agoCleanup whole preloads directory
Fyodor Kupolov [Mon, 11 Jul 2016 21:40:29 +0000 (14:40 -0700)]
Cleanup whole preloads directory

When leaving SUW, cleanup preloads directory, not just demo dir.

Bug: 29908713
Change-Id: Id94e6df619f5ca6585b2a0edb0f1028364431f95

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 agoThrow ActivityNotFoundException when failed to launch shortcut
Makoto Onuki [Mon, 11 Jul 2016 21:30:19 +0000 (14:30 -0700)]
Throw ActivityNotFoundException when failed to launch shortcut

Originally the code used IIntentSender, but I had to switch to calling
startActivitiesInPackage() directly, because sendIntentSender() does
not support returning errors.

Bug 30035853

Change-Id: I5d7669c96a2f1805373c71aebf45b97ac1d01ff6

8 years agoAdd Group Id to PhoneAccount
Brad Ebinger [Sat, 11 Jun 2016 00:19:42 +0000 (17:19 -0700)]
Add Group Id to PhoneAccount

Add an api to set a group Id to a PhoneAccount. This functions as
a marker that tells Telecom to replace an old registered PhoneAccount
with a newly registered PhoneAccount if their Group Id is the same. This
allows us to handle transparent PhoneAccount switching in Telecom
without losing user specified enabled settings and user calling account
defaults.

Bug: 28173788
Change-Id: I270e766347d7f817c94f86503db2cdb1f93dafa4

8 years agoMerge "Merge \\\"docs: Adding Android TV App Link docs\\\" into mnc-io-docs am: e0b68...
Android Build Merger (Role) [Mon, 11 Jul 2016 21:30:31 +0000 (21:30 +0000)]
Merge "Merge \\\"docs: Adding Android TV App Link docs\\\" into mnc-io-docs am: e0b687048f am: 68ef31fc36 am: 7579d70ca1" into nyc-mr1-dev

8 years agoMerge "Merge \\\"Docs: Gestures docs\\\" into mnc-io-docs am: b7b9aa1a51 am: 1639959f...
Android Build Merger (Role) [Mon, 11 Jul 2016 21:30:20 +0000 (21:30 +0000)]
Merge "Merge \\\"Docs: Gestures docs\\\" into mnc-io-docs am: b7b9aa1a51 am: 1639959f3b am: 58b4f0d535" into nyc-mr1-dev

8 years agoMerge "Merge \\\"docs: Updated Create custom drawer view section with new xml attribu...
Android Build Merger (Role) [Mon, 11 Jul 2016 21:30:09 +0000 (21:30 +0000)]
Merge "Merge \\\"docs: Updated Create custom drawer view section with new xml attributes.\\\" into mnc-io-docs am: 9f1952a77b am: ced99e1199 am: fe7b26e229" into nyc-mr1-dev

8 years agoMerge "Handle package broadcasts before apps do" into nyc-mr1-dev
Makoto Onuki [Mon, 11 Jul 2016 21:29:58 +0000 (21:29 +0000)]
Merge "Handle package broadcasts before apps do" into nyc-mr1-dev

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

Change-Id: I97cad288d8315489ec7be3cc53b8b6c76a732d78

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

Change-Id: Ie94c7892dc32b467642179487550bb2760f39b04

8 years agoMerge \\\"docs: Updated Create custom drawer view section with new xml attributes...
sreevanis [Mon, 11 Jul 2016 21:29:35 +0000 (21:29 +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: I043c1546216786db2310e33e707e056c307a9a7b

8 years agoMerge "Revert "Treat everyone the same."" into nyc-mr1-dev
Jeff Sharkey [Mon, 11 Jul 2016 21:23:28 +0000 (21:23 +0000)]
Merge "Revert "Treat everyone the same."" into nyc-mr1-dev

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 "Avoid throwing when 0 size layer requested" into nyc-mr1-dev
Chris Craik [Mon, 11 Jul 2016 21:18:20 +0000 (21:18 +0000)]
Merge "Avoid throwing when 0 size layer requested" into nyc-mr1-dev

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 agoDon't force fstrim on OTA
Christopher Tate [Mon, 11 Jul 2016 21:11:23 +0000 (14:11 -0700)]
Don't force fstrim on OTA

This avoids showing a (momentary) "Optimising storage" UI along the way,
which proved to be jarring.

Bug 30064543

Change-Id: Iaff0f32eea4170829d71a4f2bd270cc63d1da543

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 changes from topic 'stune' into nyc-mr1-dev
Tim Murray [Mon, 11 Jul 2016 20:29:38 +0000 (20:29 +0000)]
Merge changes from topic 'stune' into nyc-mr1-dev

* changes:
  Put bootanimation in top-app stune group.
  Sets android.ui to be in the fg stune group.

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

Change-Id: If11947a089756b7ca72f6a579d4b1cbe54535185

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

Change-Id: Ief4a9e36190f2906b4e98ceb3805b6053e7ae7e8

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

Change-Id: I450ec7534140e604e7e3b76402a85a338437f582

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

Change-Id: Ia7d5019e9b291fe7202c862daaa91983e36cd6ec

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

Change-Id: I9f84d877c40c0dfa2bd63cb3548f9439988129a4

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 "BootAnimation: Use npot textures" into nyc-mr1-dev
Geoffrey Pitsch [Mon, 11 Jul 2016 20:12:38 +0000 (20:12 +0000)]
Merge "BootAnimation: Use npot textures" into nyc-mr1-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 agoMerge "Wait until end of BootAnimation to free looping textures" into nyc-mr1-dev
Geoffrey Pitsch [Mon, 11 Jul 2016 20:11:17 +0000 (20:11 +0000)]
Merge "Wait until end of BootAnimation to free looping textures" into nyc-mr1-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:30 +0000 (19:53 +0000)]
Merge \\\"docs: work - fix app restriction string values\\\" into mnc-io-docs am: de37b1b270 am: 4b353b2a78
am: 0e6f2097d3

Change-Id: Iffdc8793dac1d6d803cc27e6b6fe04344b96b9a9

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