Commit Graph

62001 Commits

Author SHA1 Message Date
Adam Powell
dd8490c291 Merge \\\"Fix layout issue after insets changed\\\" into nyc-dev am: 119f1715b3 am: 242a44395e
am: 9a327642df

Change-Id: I064c05ce3f4347ddfc41dceebccb2d8bdc5a845e
2016-06-24 23:39:12 +00:00
Adam Powell
9a327642df Merge \\"Fix layout issue after insets changed\\" into nyc-dev am: 119f1715b3
am: 242a44395e

Change-Id: Iab3e11ed6346ed538f3206faa32d15e6e227efef
2016-06-24 23:33:11 +00:00
Adam Powell
242a44395e Merge \"Fix layout issue after insets changed\" into nyc-dev
am: 119f1715b3

Change-Id: I3dc13e068c258a74acee79e6ab6a75b569c891e8
2016-06-24 23:28:37 +00:00
TreeHugger Robot
119f1715b3 Merge "Fix layout issue after insets changed" into nyc-dev 2016-06-24 23:21:29 +00:00
Robert Carr
9b23b04d60 Merge \\\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\\" into nyc-dev am: 8afc1f70f0 am: be87ca9efa
am: e1eba6c1b7

Change-Id: I43a029fe125c8959bc1490fa76841b48a2bced2f
2016-06-24 22:59:53 +00:00
Robert Carr
e1eba6c1b7 Merge \\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\" into nyc-dev am: 8afc1f70f0
am: be87ca9efa

Change-Id: I1d06d427c3679d83d55038f999b75c26d5c8ecc6
2016-06-24 22:54:53 +00:00
Robert Carr
be87ca9efa Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am: 8afc1f70f0

Change-Id: Ifcc58b9c6a4bdaf3df0dc49ac963bdc7e32aa409
2016-06-24 22:50:45 +00:00
TreeHugger Robot
8afc1f70f0 Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev 2016-06-24 22:43:32 +00:00
Yorke Lee
3d2667d676 Merge \\\"Update documentation for View.startDragAndDrop\\\" into nyc-dev am: c63710ea48 am: c9bbca5682
am: 33b289ae3f

Change-Id: Id61a08be190c5d1b61392f5ceea646d7507a8c79
2016-06-24 22:29:03 +00:00
Yorke Lee
33b289ae3f Merge \\"Update documentation for View.startDragAndDrop\\" into nyc-dev am: c63710ea48
am: c9bbca5682

Change-Id: I064b85f0a567978a67ed72a963aea63be9200457
2016-06-24 22:22:02 +00:00
Yorke Lee
c9bbca5682 Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am: c63710ea48

Change-Id: I47ee9fa89edc5495616393a1c352677c8b990030
2016-06-24 22:18:22 +00:00
Adam Lesinski
3d26f768a2 Merge \\"Update DisplayMetrics when resizing\\" into nyc-mr1-dev am: 038084e61c
am: 89aea239cd

Change-Id: I9cc73d39e690d30c736b705235bb93e92bd029a6
2016-06-24 22:15:56 +00:00
Adam Lesinski
89aea239cd Merge \"Update DisplayMetrics when resizing\" into nyc-mr1-dev
am: 038084e61c

Change-Id: I82318bbd8dbf03ab4bc01533b8c5650306cff0aa
2016-06-24 22:11:14 +00:00
Yorke Lee
c63710ea48 Merge "Update documentation for View.startDragAndDrop" into nyc-dev 2016-06-24 22:10:47 +00:00
TreeHugger Robot
038084e61c Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev 2016-06-24 22:04:15 +00:00
Android Build Merger (Role)
9dca3a0060 Merge "Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956 am: 312933e043" 2016-06-24 21:48:20 +00:00
Makoto Onuki
a9d2a39bb1 Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956
am: 312933e043

Change-Id: I26419c323a33bf26f2dea4666e07c64a4e7d6254
2016-06-24 21:47:54 +00:00
Adam Powell
76fdbb72c9 Fix layout issue after insets changed
Fix a regression where a change in insets would forceLayout on the
view hierarchy but not run the measure/layout as a result. This would
cause layout requests to become stalled until a window-level relayout
event.

Bug 29634368

Change-Id: Ia3f32f5891c8b32c06c13f95ebd0572233572b04
2016-06-24 14:47:06 -07:00
TreeHugger Robot
57a289865b Merge "Make getTransition a @TestApi for CTS tests." 2016-06-24 21:46:58 +00:00
Makoto Onuki
312933e043 Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev
am: 1af9a58956

Change-Id: Id878608aec49985228e129de9736b751c9ae8567
2016-06-24 21:42:54 +00:00
Robert Carr
489c39d2db PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.
When we want the WindowManager to clip our requested width/height
to the display frame, we need to pass DISPLAY_CLIP_VERTICAL/HORIZONTAL.
It seems this behavior was unintentionally applied without this flag
in previous releases.

Bug: 29602363
Change-Id: Ib98060e36efde0dbaabb59a758da5374035dbb62
2016-06-24 14:07:20 -07:00
Adam Lesinski
8e8d23214a Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
2016-06-24 13:13:19 -07:00
Makoto Onuki
b08790c3b2 Shortcut: Only "main" activities can have shortcuts.
- Don't publish shortcuts when their target activities are not main.
- Only scan manifest shortcuts for main activities.
- When an app is updated, remove shortcuts that no longer belong to
valid main activities.

- Also re-publish manifest shortcuts after 'clear data'
- Also listen to PACKAGE_CHANGED and disable/re-publish shortcuts
properly.

Bug 29355786
Bug 29582255
Bug 29601844

Change-Id: I6c701ce669cf30a227bc2af4aa01de467ef73e3a
2016-06-24 13:07:17 -07:00
George Mount
f239f99113 Make getTransition a @TestApi for CTS tests.
Bug 29570647

Change-Id: I85b2b215fbad2ca72e67b17a29cc9b122ae5945e
2016-06-24 11:53:42 -07:00
Doris Liu
91fcf575f1 Merge \\"Fix NPE for checking for whether animators should play together\\" into nyc-mr1-dev am: 7f9c189f06
am: b53c9c1658

Change-Id: Ia8b14a4e79c60e3c83f12ab07160ff2d36247088
2016-06-24 17:58:08 +00:00
Doris Liu
b53c9c1658 Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
am: 7f9c189f06

Change-Id: I3ea0e652dd39dfffe279b4c2c0bb19d362eb91af
2016-06-24 17:53:06 +00:00
Doris Liu
7f9c189f06 Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev 2016-06-24 17:47:44 +00:00
Amith Yamasani
2e33e0df3c Merge \\"Resetting some settings on starting a new demo session\\" into nyc-mr1-dev am: bb1fb395ca
am: 5c451c08bc

Change-Id: I7e44f3ec7c29d0e1adfd5e4baff1cbfba7368bcc
2016-06-24 16:42:47 +00:00
Suprabh Shukla
5c451c08bc Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am: bb1fb395ca

Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
2016-06-24 16:36:55 +00:00
Amith Yamasani
bb1fb395ca Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev 2016-06-24 16:08:16 +00:00
Jorim Jaggi
584093c4bf Merge \"Merge \\"Fix WallpaperInfo API review\\" into nyc-mr1-dev am: e3f410cd59\" into nyc-mr1-dev-plus-aosp
am: 17fedfbdc7

Change-Id: I2eb0781e704ebe1ec9f198a332fe162136af3897
2016-06-24 01:38:10 +00:00
Jorim Jaggi
5cd3e8396d Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
am: e3f410cd59

Change-Id: Id4486196793d8cc82ee6b4a230bf357785a7842f
2016-06-24 01:32:49 +00:00
TreeHugger Robot
e3f410cd59 Merge "Fix WallpaperInfo API review" into nyc-mr1-dev 2016-06-24 01:24:01 +00:00
Dmitri Plotnikov
abcc4392e9 Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8
am: 89858c58af

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9
2016-06-24 00:37:57 +00:00
Suprabh Shukla
6472501f2e Resetting some settings on starting a new demo session
Muting ringer and media volume and turning off the flashlight
before starting a new session. Also, resetting the configuration of any
new demo user to the configuration of user 0 on the device. Moved
RetailDemoModeService and RetailDemoModeServiceInternal to more
appropriate new packages

Bug: 29519612
Change-Id: Ib65f89ce61afab2d2f1b2dd0c761f5d35a466181
2016-06-23 17:36:19 -07:00
Dmitri Plotnikov
89858c58af Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8 Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev 2016-06-24 00:23:13 +00:00
Doris Liu
c470466d7c Fix NPE for checking for whether animators should play together
BUG: 29586505
Change-Id: Ic2a67d51d2ac8d5bfb11ed7773c7c7e413cc28c7
2016-06-24 00:01:39 +00:00
Jorim Jaggi
d136ba1664 Fix WallpaperInfo API review
Change-Id: I395b9617038450e6fa7a2f25bb55d6ae5f761015
Fixes: 29514598
2016-06-23 16:25:52 -07:00
Scott Main
b9d2791a65 Merge \"Merge \\\"fix bad contrast in table links by switching to normal table cells instead of headings.\\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28\" into nyc-mr1-dev-plus-aosp
am: 10aee22fa1

Change-Id: I5b17cb4187ceece4adc7284534b151ec1fee8003
2016-06-23 22:19:42 +00:00
Fyodor Kupolov
1d84a7ffef Merge \"Merge \\"Print names of observers causing timeout\\" into nyc-mr1-dev am: 38d7897690\" into nyc-mr1-dev-plus-aosp
am: a5b7b96500

Change-Id: I04decfb9d3988e5080ab3ff5c88032836dd1306a
2016-06-23 22:11:49 +00:00
Scott Main
afd1e8e259 Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
am: 8c9bd9cb28

Change-Id: I557f9300ab69486a26f30bed5a244baee43319e7
2016-06-23 22:10:29 +00:00
smain@google.com
b8516f1029 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I68b578ac0bb343dff66bcbc5bd5c652c93e9864f
2016-06-23 22:06:07 +00:00
smain@google.com
8c9bd9cb28 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74
2016-06-23 22:05:07 +00:00
Fyodor Kupolov
7ccd3241e0 Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
am: 38d7897690

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb
2016-06-23 21:58:36 +00:00
Scott Main
fd0eeb0379 Merge "fix bad contrast in table links by switching to normal table cells instead of headings." into nyc-dev 2016-06-23 21:57:52 +00:00
Fyodor Kupolov
38d7897690 Merge "Print names of observers causing timeout" into nyc-mr1-dev 2016-06-23 21:49:05 +00:00
Chong Zhang
b31d51b199 Merge \\"Do not send unhandled system config changes to app\\" into nyc-mr1-dev am: 568507abf5
am: fac7476990

Change-Id: I49a971425f294ab8301fb2514a4d8f7a6f5634f0
2016-06-23 21:48:37 +00:00
Chong Zhang
fac7476990 Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
am: 568507abf5

Change-Id: I4a711464f49c44f329e51d781dbe0eb4886d9c98
2016-06-23 21:41:12 +00:00
Chong Zhang
568507abf5 Merge "Do not send unhandled system config changes to app" into nyc-mr1-dev 2016-06-23 21:33:55 +00:00