OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Add test doubleTapAndDragToSelect_multiLine"
Sara Kato [Tue, 9 Aug 2016 08:26:19 +0000 (08:26 +0000)]
Merge "Add test doubleTapAndDragToSelect_multiLine"

8 years agoAdd test doubleTapAndDragToSelect_multiLine
Sara Kato [Tue, 9 Aug 2016 05:40:45 +0000 (14:40 +0900)]
Add test doubleTapAndDragToSelect_multiLine

Bug: 30687230
Change-Id: I260c641544f69768f0b8f6cf10d51724e7a7b3c3

8 years agoMerge "Kill service before trying to cancel notifications."
TreeHugger Robot [Tue, 9 Aug 2016 01:31:28 +0000 (01:31 +0000)]
Merge "Kill service before trying to cancel notifications."

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1...
Christopher Tate [Tue, 9 Aug 2016 00:56:44 +0000 (00:56 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev am: 0b26adbb8b am: c32929ab1a
am: 0c4497e7be

Change-Id: Ifb94e4471267b3c89ec591a45b8b091227713458

8 years agoHandle empty/unspecified crop properly in wallpaper restore am: dd7110db2b am: 2ba9127494
Christopher Tate [Tue, 9 Aug 2016 00:56:39 +0000 (00:56 +0000)]
Handle empty/unspecified crop properly in wallpaper restore am: dd7110db2b am: 2ba9127494
am: fbee390c97

Change-Id: I497c9254951537b118d6fee81725f303bd37c7a1

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f...
Christopher Tate [Tue, 9 Aug 2016 00:51:21 +0000 (00:51 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f am: dacbfeaa4c
am: ecab26e47f

Change-Id: I2889aa0312049527e816927bf2fee61214891275

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1...
Christopher Tate [Tue, 9 Aug 2016 00:51:16 +0000 (00:51 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev am: 0b26adbb8b
am: c32929ab1a

Change-Id: I5713bd059a0fa6c5ed49cd5523082263bf17e19b

8 years agoMark wallpaper as backupInForeground="true" am: 8f4c82691a am: 641bd536e3
Christopher Tate [Tue, 9 Aug 2016 00:51:15 +0000 (00:51 +0000)]
Mark wallpaper as backupInForeground="true" am: 8f4c82691a am: 641bd536e3
am: 62bf877344

Change-Id: I1ffc489ef889bd48f1949e810d22ad36973db358

8 years agoHandle empty/unspecified crop properly in wallpaper restore am: dd7110db2b
Christopher Tate [Tue, 9 Aug 2016 00:51:08 +0000 (00:51 +0000)]
Handle empty/unspecified crop properly in wallpaper restore am: dd7110db2b
am: 2ba9127494

Change-Id: I7644603b3ff7dcbd0c9b43cc170da19172949d15

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f
Christopher Tate [Tue, 9 Aug 2016 00:43:33 +0000 (00:43 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f
am: dacbfeaa4c

Change-Id: Icfd874132ee26287e7d1b3e8e40ec9e1897a19a1

8 years agoMark wallpaper as backupInForeground="true" am: 8f4c82691a
Christopher Tate [Tue, 9 Aug 2016 00:43:29 +0000 (00:43 +0000)]
Mark wallpaper as backupInForeground="true" am: 8f4c82691a
am: 641bd536e3

Change-Id: I3b2ceb7646a3332998782bf8bffff34e2c98191e

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
Christopher Tate [Tue, 9 Aug 2016 00:43:18 +0000 (00:43 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
am: 0b26adbb8b

Change-Id: Ic7b8e2dc5bf39553b1036fad8e871b5fdb51c74f

8 years agoHandle empty/unspecified crop properly in wallpaper restore
Christopher Tate [Tue, 9 Aug 2016 00:43:16 +0000 (00:43 +0000)]
Handle empty/unspecified crop properly in wallpaper restore
am: dd7110db2b

Change-Id: I501a5e30a1b204436e722d363709d3d35d430d91

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
Christopher Tate [Tue, 9 Aug 2016 00:37:12 +0000 (00:37 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
am: d5b0b9bb1f

Change-Id: I7c12efa23f81cad90cad9735c54c80fbdd4641dd

8 years agoMark wallpaper as backupInForeground="true"
Christopher Tate [Tue, 9 Aug 2016 00:37:10 +0000 (00:37 +0000)]
Mark wallpaper as backupInForeground="true"
am: 8f4c82691a

Change-Id: Idf7e60a44496584075a8f8f7b7958278f65439e3

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
TreeHugger Robot [Tue, 9 Aug 2016 00:34:07 +0000 (00:34 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
TreeHugger Robot [Tue, 9 Aug 2016 00:24:04 +0000 (00:24 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Kevin Hufnagle [Tue, 9 Aug 2016 00:22:56 +0000 (00:22 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev am: 0402936230 am: b5f0030c36
am: af31bcc7b9

Change-Id: I14a1d3b335202f63d22bc4c7b4025c7f089f0c25

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:29 +0000 (00:20 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8 am: 70f8ca8dff am: 3ded4c5774
am: 75f0d1e2ff

Change-Id: I178a33e258cc643c8d42798fdda8f5fe08375d61

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:22 +0000 (00:20 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev am: fc9f55873a am: 7c2d0c77a6
am: a183521170

Change-Id: I13dfd1b4095cf49f346231fc801868488e77abba

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16...
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:18 +0000 (00:20 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16dcf am: bbedca69e5
am: 8c1a8c7d31

Change-Id: I3af6c4523ed335aac3bb942205e93aa7c1ae4065

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149...
Chris Craik [Tue, 9 Aug 2016 00:20:15 +0000 (00:20 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149 am: bbc56855bd
am: e3a9f9b4e6

Change-Id: Iafc3a73f73b2d9a1e76b6a819632cfbeb504c209

8 years agoPrevent EndLayerOps when Begin was rejected am: 3c53ec51ef am: 152f76ee50
Chris Craik [Tue, 9 Aug 2016 00:20:12 +0000 (00:20 +0000)]
Prevent EndLayerOps when Begin was rejected am: 3c53ec51ef am: 152f76ee50
am: 674965822b

Change-Id: Icfa8cb2ad7c97fdbbf37f01abe7b5a22f6b33cfd

8 years agoKill service before trying to cancel notifications.
Felipe Leme [Mon, 8 Aug 2016 22:39:13 +0000 (15:39 -0700)]
Kill service before trying to cancel notifications.

BUG: 30639703
Change-Id: Ib564371797e31e1dde37416efdb89641fb3024b1

8 years agoMerge "Fix build breakage caused by incomplete impl"
Evan Rosky [Tue, 9 Aug 2016 00:12:48 +0000 (00:12 +0000)]
Merge "Fix build breakage caused by incomplete impl"

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Kevin Hufnagle [Tue, 9 Aug 2016 00:10:14 +0000 (00:10 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev am: 0402936230
am: b5f0030c36

Change-Id: I23aeb14b55c0fcf45dbdea404f48ddc11eaa65f0

8 years agoFix build breakage caused by incomplete impl
Evan Rosky [Tue, 9 Aug 2016 00:10:04 +0000 (17:10 -0700)]
Fix build breakage caused by incomplete impl

Change-Id: I32a8e0e5cb5209133e00dbc0589bc8b87f46260b

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:25 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8 am: 70f8ca8dff
am: 3ded4c5774

Change-Id: Id365a643e1ce22e82b090158cdc5456a1a3ae4ab

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:16 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev am: fc9f55873a
am: 7c2d0c77a6

Change-Id: I68a73741db3c9c425588eea690aba788e0118fbf

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16dcf
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:08 +0000 (00:07 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16dcf
am: bbedca69e5

Change-Id: I5ca865bfe0c5c9302a930c91d770255bda224914

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:03 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8 am: 71b45d25df
am: 409ea2217a

Change-Id: I0b78fb840a88c9aa5791b242477de76970ae3ae5

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149
Chris Craik [Tue, 9 Aug 2016 00:06:59 +0000 (00:06 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149
am: bbc56855bd

Change-Id: I849382d12a565727f77240eda247e1e98ca3892c

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 5d9f0520cb
Kevin Hufnagle [Tue, 9 Aug 2016 00:06:54 +0000 (00:06 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 5d9f0520cb
am: 7e49a5f570

Change-Id: Ia9bce511a13caa754464e4e902d3664930c1ea80

8 years agoPrevent EndLayerOps when Begin was rejected am: 3c53ec51ef
Chris Craik [Tue, 9 Aug 2016 00:06:51 +0000 (00:06 +0000)]
Prevent EndLayerOps when Begin was rejected am: 3c53ec51ef
am: 152f76ee50

Change-Id: Id942f3b0495a4e3c9eb7aa6d8647987e72ddb77a

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:44 +0000 (23:57 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev
am: 0402936230

Change-Id: Idb74051cc189752d2262ed0d49a483199a30c674

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:42 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
am: 70f8ca8dff

Change-Id: I8259ec45647b0ac035255ca8e3539fd4d1fe96c5

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:34 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev
am: fc9f55873a

Change-Id: Ifeca3dd4f1a3bfb9f77639c4ee02e0115888bedf

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:31 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
am: 7a13b16dcf

Change-Id: I484b8dba5b6dee2a15aa9dfad09b300761b1766e

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:28 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
am: 71b45d25df

Change-Id: I61828e5c4c0ca5386bba0789fadb1a927d29b2ec

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:26 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
am: 5d9f0520cb

Change-Id: I1a3de5fd2c50fc8071db932aaac697b6611c069d

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:57:24 +0000 (23:57 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
am: a9bef43149

Change-Id: Ie5049628f5e2f6f1e5baec0db92be30d3b1e2855

8 years agoPrevent EndLayerOps when Begin was rejected
Chris Craik [Mon, 8 Aug 2016 23:57:22 +0000 (23:57 +0000)]
Prevent EndLayerOps when Begin was rejected
am: 3c53ec51ef

Change-Id: I075b68a1b7bdee4cbebd734748dd485ff6cd67b3

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:29 +0000 (23:49 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:18 +0000 (23:49 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:52 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: I48f91ef763f6591e16751d9ae8fd9d86be277111

8 years agodocs: Revised "Optimizing Content for the Assistant" page.
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:50 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Ie85273ed977c06e9b82a77d66a7333e9eca86e10

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d

8 years agodocs: Revised "Optimizing Content for the Assistant" page.
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:12 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Iee3f043360bfd8df55265481843e165d1ffc832c

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:44:07 +0000 (23:44 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02...
Makoto Onuki [Mon, 8 Aug 2016 23:34:34 +0000 (23:34 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02 am: 4684672789
am: 6402d133ee

Change-Id: I7b96ce652d619ffc0ec4ed9d88c673dfa6dc8f85

8 years agoShortcutManager improve app udpate check am: 64183d5188 am: bb5db91bf3
Makoto Onuki [Mon, 8 Aug 2016 23:34:30 +0000 (23:34 +0000)]
ShortcutManager improve app udpate check am: 64183d5188 am: bb5db91bf3
am: ce186d4722

Change-Id: Ia3818e54bba40b95c7feaa02d3948bdeae1dfe8e

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am...
Mark Lu [Mon, 8 Aug 2016 23:34:26 +0000 (23:34 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am: 66847abba6 am: ee0c57417b
am: 406bde4222

Change-Id: I2739b17cf4cc231cbdd0031e270a7e97fd7bad0e

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:34:23 +0000 (23:34 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am: 6cb5152e9f am: fb5ae0abff
am: 308c517a56

Change-Id: I8e3d5bc5aba23c85bfff1e150c247c1eea0d6be8

8 years agoFix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0...
Jim Miller [Mon, 8 Aug 2016 23:34:19 +0000 (23:34 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0 am: b08d7677d7
am: 32fd23837b

Change-Id: Id4ed58cc08ee3c7bbe9dc0a87a9e31c107d8a839

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1...
Mark Lu [Mon, 8 Aug 2016 23:27:37 +0000 (23:27 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848 am: 325399bfb9 am: 6fadcab88a
am: da17c53e68

Change-Id: Iecf64ae58c398d2d95a49ae0332b3620fb729a0f

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02
Makoto Onuki [Mon, 8 Aug 2016 23:27:36 +0000 (23:27 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02
am: 4684672789

Change-Id: I02d89a8eb5e626d7e6ec2933e178ea52e0a68109

8 years agoShortcutManager improve app udpate check am: 64183d5188
Makoto Onuki [Mon, 8 Aug 2016 23:27:33 +0000 (23:27 +0000)]
ShortcutManager improve app udpate check am: 64183d5188
am: bb5db91bf3

Change-Id: I3c8f413dffece083824e5959b5bd167a0a78d2c9

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0...
Mark Lu [Mon, 8 Aug 2016 23:27:33 +0000 (23:27 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0 am: 3e3e19d3c8
am: e38cdf6360

Change-Id: I7e899b43eb74373ba893304c9d9e3617aa57da8a

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31 am: 9bc4d36796
Winson Chung [Mon, 8 Aug 2016 23:27:30 +0000 (23:27 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31 am: 9bc4d36796
am: 0b4aa2ab40

Change-Id: I546a6f6950c9a1c3392f216b39bd35ae2cdf4e7d

8 years agoReverting ag/1288123 am: 08deff0a67 am: 5ce0a4fb0f
Winson [Mon, 8 Aug 2016 23:27:26 +0000 (23:27 +0000)]
Reverting ag/1288123 am: 08deff0a67 am: 5ce0a4fb0f
am: 8ac2f28c31

Change-Id: If23888a4bd762115891f8cae2e62dd487dabcfd7

8 years agoMerge "Define low latency output stream (formerly primary)"
Glenn Kasten [Mon, 8 Aug 2016 23:22:18 +0000 (23:22 +0000)]
Merge "Define low latency output stream (formerly primary)"

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am...
Mark Lu [Mon, 8 Aug 2016 23:21:01 +0000 (23:21 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am: 66847abba6
am: ee0c57417b

Change-Id: I7692ef0a4053cf8220e9b5ec11004b2162f2148c

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:20:58 +0000 (23:20 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am: 6cb5152e9f
am: fb5ae0abff

Change-Id: Icfc434168cb3aae52f234b67f0dff087dee3a41b

8 years agoFix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0
Jim Miller [Mon, 8 Aug 2016 23:20:54 +0000 (23:20 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0
am: b08d7677d7

Change-Id: Id5ad561221cfcb6999ec9cea560b4654ff8696ab

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
Makoto Onuki [Mon, 8 Aug 2016 23:20:45 +0000 (23:20 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
am: 369c6ebf02

Change-Id: I58aa77cec332d449ec763681e871a79af27e4597

8 years agoShortcutManager improve app udpate check
Makoto Onuki [Mon, 8 Aug 2016 23:20:44 +0000 (23:20 +0000)]
ShortcutManager improve app udpate check
am: 64183d5188

Change-Id: I0d5325d861ad52b186f2c7c9c106f485200fb826

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am...
Mark Lu [Mon, 8 Aug 2016 23:16:48 +0000 (23:16 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am: cd94572f82
am: 22ea9f236d

Change-Id: Idfece60ef3049c71f92f77df8fc360f352315f70

8 years agoHandle empty/unspecified crop properly in wallpaper restore
Christopher Tate [Mon, 8 Aug 2016 20:09:02 +0000 (13:09 -0700)]
Handle empty/unspecified crop properly in wallpaper restore

Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.

Bug 30521402
Bug 30274136

Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
Mark Lu [Mon, 8 Aug 2016 23:12:13 +0000 (23:12 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
am: 66847abba6

Change-Id: If061ef027bb10d651e1b90294b1cdd116fe7b05b

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3

8 years agoFix bug where foreground activity fails to cancel auth/enrollment
Jim Miller [Mon, 8 Aug 2016 23:12:03 +0000 (23:12 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment
am: 37979c9db0

Change-Id: I486f40d728e2b4bd359c617f31a9032efc6e022b

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1...
Mark Lu [Mon, 8 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848 am: 325399bfb9
am: 6fadcab88a

Change-Id: Ie0448301e7dc6b0abf3ffe54faea827fe350a944

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0
Mark Lu [Mon, 8 Aug 2016 23:07:43 +0000 (23:07 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0
am: 3e3e19d3c8

Change-Id: I19a77e2c8e9998ab02b58a1444c5a12b8ea33b43

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31
Winson Chung [Mon, 8 Aug 2016 23:07:38 +0000 (23:07 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31
am: 9bc4d36796

Change-Id: I89db474b4dc0953291a403a6f35f667f5bbab23b

8 years agoReverting ag/1288123 am: 08deff0a67
Winson [Mon, 8 Aug 2016 23:07:35 +0000 (23:07 +0000)]
Reverting ag/1288123 am: 08deff0a67
am: 5ce0a4fb0f

Change-Id: I5ee92797463b32c5f32d109b0ad354498893fd46

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
Mark Lu [Mon, 8 Aug 2016 23:01:49 +0000 (23:01 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
am: cd94572f82

Change-Id: I8bbc9ca66de15b5d2f6be7cde962721d7db78f68

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 23:01:42 +0000 (23:01 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
Mark Lu [Mon, 8 Aug 2016 23:00:15 +0000 (23:00 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
am: 325399bfb9

Change-Id: I5105164ff30ea9a285e4e22325ef5c2baa433eeb

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41
Mark Lu [Mon, 8 Aug 2016 23:00:12 +0000 (23:00 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
am: 9bc63b9bf0

Change-Id: I59a010b5d4d2859ed64cf1ef0684b92ebb9d60d6

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 23:00:10 +0000 (23:00 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev
am: d983386c31

Change-Id: Idd7551d5e95ad542edcc2c6c310163ca6c20d74c

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be
Mark Lu [Mon, 8 Aug 2016 23:00:09 +0000 (23:00 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibc12639849de4edcbcfdaa1c0f543d6f2eb868f8

8 years agoReverting ag/1288123
Winson [Mon, 8 Aug 2016 23:00:07 +0000 (23:00 +0000)]
Reverting ag/1288123
am: 08deff0a67

Change-Id: I13bdc80c790dc1563f6839a98d6dbfce283a2baa

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1...
Mark Lu [Mon, 8 Aug 2016 22:56:20 +0000 (22:56 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848 am: 65a4e23b66
am: c69d130d00

Change-Id: I712fd1223976ba3b1f74b61489efd110252edcd9

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: f434456ba5
Mark Lu [Mon, 8 Aug 2016 22:56:15 +0000 (22:56 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: f434456ba5
am: 82a7343653

Change-Id: I112c1d2944cf6f1feeb2abd93514c59ee143f08c

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
TreeHugger Robot [Mon, 8 Aug 2016 22:55:04 +0000 (22:55 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
Mark Lu [Mon, 8 Aug 2016 22:49:16 +0000 (22:49 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
am: 65a4e23b66

Change-Id: I75c1808758a767eb7028d312b0542f2175a55a51

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be
Mark Lu [Mon, 8 Aug 2016 22:49:14 +0000 (22:49 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibdc351bc38832d8e0f02332be8aa1802e6c3ae65

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41
Mark Lu [Mon, 8 Aug 2016 22:49:12 +0000 (22:49 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
am: f434456ba5

Change-Id: I5dec6b6fb20c741d92a840cf6291d0b33ac46d5a

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:49:11 +0000 (22:49 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Ief38c0b6b1b61e8fcc060224c298fb3a4711cc94

8 years agodocs: add info to SharedPreferences.Editor.putString
Mark Lu [Mon, 8 Aug 2016 22:49:08 +0000 (22:49 +0000)]
docs: add info to SharedPreferences.Editor.putString
am: fb48521f41

Change-Id: I948c8091a70180e29a601d6cba40d7fb0cf2d76a

8 years agodocs: fixed generics in data binding code samples
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am: b1b5efd3be

Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:36:19 +0000 (22:36 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Id2540d8e557f2793d3e00a667c26b4efef49a3fc

8 years agodocs: add info to SharedPreferences.Editor.putString
Mark Lu [Mon, 8 Aug 2016 22:36:09 +0000 (22:36 +0000)]
docs: add info to SharedPreferences.Editor.putString
am: fb48521f41

Change-Id: Icf8a1a92e8f18bcc63b52842ea75b00610feac9d

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 22:33:58 +0000 (22:33 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev

8 years agoMerge "Added mouse wheel support for notifications"
TreeHugger Robot [Mon, 8 Aug 2016 22:33:05 +0000 (22:33 +0000)]
Merge "Added mouse wheel support for notifications"

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev

8 years agoMerge "Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev...
John Reck [Mon, 8 Aug 2016 22:25:49 +0000 (22:25 +0000)]
Merge "Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc5b0 am: 4ea119f3b9" into nyc-mr1-dev-plus-aosp
am: 91928649fe

Change-Id: Ib76e97bd976a3cb0194c2da52ac2c0a6241d96a1

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc...
John Reck [Mon, 8 Aug 2016 22:25:46 +0000 (22:25 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc5b0 am: 4ea119f3b9
am: 05f123c144

Change-Id: I821f4567613b8a5f55bf0d0451784a42cb25b56c

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077 am: 936166fd5b...
John Reck [Mon, 8 Aug 2016 22:25:36 +0000 (22:25 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077 am: 936166fd5b" into nyc-mr1-dev-plus-aosp
am: 76f5fac23c

Change-Id: Id98bfdb5173f8514372f90a0ed6f2b699cc40b0b