Commit Graph

68121 Commits

Author SHA1 Message Date
Philip P. Moltmann
127c9715b4 Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am: b6ee468b3e\" into nyc-mr1-dev-plus-aosp
am: 1134308842

Change-Id: I80459fe11f37ad937c5855d296a81b2d002370d2
2016-06-27 18:28:25 +00:00
Philip P. Moltmann
e6f1ddce89 Merge \"Do not remove handlers for loaders.\" into nyc-mr1-dev
am: b6ee468b3e

Change-Id: I5ad61204c45191fb60819bae717d5a3b6cc7947c
2016-06-27 18:23:11 +00:00
Philip P. Moltmann
b6ee468b3e Merge "Do not remove handlers for loaders." into nyc-mr1-dev 2016-06-27 18:12:12 +00:00
Phil Weaver
4192eac03a Merge "Behave if the same view gets a11y focus twice." 2016-06-27 17:42:56 +00:00
John Reck
25fb14537c Merge \\\"Add missing null checks\\\" into nyc-dev am: 02e391585d am: 0fc8707e2d
am: bffa989d28

Change-Id: If6fbfc645fefeaec6b82d97f82a7f50a1a0fee35
2016-06-27 17:17:19 +00:00
John Reck
bffa989d28 Merge \\"Add missing null checks\\" into nyc-dev am: 02e391585d
am: 0fc8707e2d

Change-Id: I9b8122c0a67be36b00cae06ce543a9de7aca8d40
2016-06-27 17:12:05 +00:00
John Reck
0fc8707e2d Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d
2016-06-27 17:06:24 +00:00
John Reck
474659ccc4 Add missing null checks
Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8
2016-06-27 07:56:37 -07:00
Nicolas Prévot
56d8d05e8a Merge "Show policy transparency screen if adding an account is not allowed." 2016-06-27 14:45:35 +00:00
Ricky Wai
604582b6a3 Hide superfluous \\'Android system\\' header in Quite mode dialog am: 7f1ca4fe67
am: 1481cd53bf

Change-Id: Ic62f9dcf3d36865c9f584e34231c8bdb6b3801b3
2016-06-27 14:31:19 +00:00
Ricky Wai
1481cd53bf Hide superfluous \'Android system\' header in Quite mode dialog
am: 7f1ca4fe67

Change-Id: If290b51864e27f08a604b6cae103450305e90299
2016-06-27 14:27:17 +00:00
Ricky Wai
7f1ca4fe67 Hide superfluous 'Android system' header in Quite mode dialog
Bug: 28390642
Change-Id: Ief678e35a0d9e4a37f4499c307ceb928e179cac8
2016-06-27 14:05:01 +00:00
Nicolas Prevot
709a63d9c0 Show policy transparency screen if adding an account is not allowed.
If DISALLOW_MODIFY_ACCOUNTS has been set by a profile/device owner,
or account management is disabled:
When an app tries to add an account, show the policy transparency screen.

BUG:26762383
Change-Id: I721220c37c74493020f5a1be1f15731e9863a1de
2016-06-27 14:10:38 +01:00
Dan Sandler
6ebc3e5c15 Cats are not, technically, tasty treats. am: 27a9fcc618 am: fadfc8e5e5
am: b6d9598690

Change-Id: I47523b80a8d2502012dea265fe09855db4c1bc35
2016-06-26 23:07:23 +00:00
Dan Sandler
b6d9598690 Cats are not, technically, tasty treats. am: 27a9fcc618
am: fadfc8e5e5

Change-Id: Id974d6c8f76e4f94f2ad1c88383f4a43060fe859
2016-06-26 23:03:39 +00:00
Dan Sandler
fadfc8e5e5 Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d
2016-06-26 22:56:01 +00:00
Dan Sandler
1b2ed4394c Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I6ffdf66c9ef70052b7ba5ac5d926b32eae633fde
2016-06-26 22:55:59 +00:00
Dan Sandler
27a9fcc618 Cats are not, technically, tasty treats.
Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
2016-06-26 15:00:11 +00:00
Phil Weaver
da4692774c Behave if the same view gets a11y focus twice.
In some corner cases, ViewRootImpl#setAccessibilityFocus
can be called twice for the same view. Make sure we're
actually changing views before clearing accessibility focus
to avoid inconsistent state.

Bug: 29637593
Change-Id: I5dc6f05bdeaec55c352417bfca92c11bd03c3c10
2016-06-24 18:35:34 -07:00
Adam Lesinski
c038c55f62 Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I1b0b6711a3ad8c9fd29bbb967d59d59326fa7d25
2016-06-24 23:42:34 +00:00
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
TreeHugger Robot
34ccbe035a Merge "Update DisplayMetrics when resizing" into nyc-dev 2016-06-24 23:35:13 +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
c43c9e052e Merge \"Fix layout issue after insets changed\" into nyc-dev
am: 119f1715b3

Change-Id: I343dc8ad193ad83a8c0628c104836bd392cd07d5
2016-06-24 23:28:57 +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
Robert Carr
c6413cc919 Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am: 8afc1f70f0

Change-Id: Iabd270da70c540b9da38a72895adc6904bbb41cd
2016-06-24 22:50:39 +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
d1d3950d94 Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am: c63710ea48

Change-Id: Iebdb99f1032fbda52686df9dc02e740b61b7e7eb
2016-06-24 22:21:19 +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
ac3e0e590a 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
(cherry picked from commit 8e8d23214a)
2016-06-24 22:11:27 +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
Evan Rosky
854036d55b Merge "Add option to disable lockscreen by default" 2016-06-24 21:36:39 +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
Philip P. Moltmann
00c3659eca Do not remove handlers for loaders.
In rare situations we might trigger a force-load if the handler	is
stopped.

Change-Id: I103744654805dcbe0744b09b5be9da1f505817d3
Fixes: 29581798
2016-06-24 20:13:41 +00: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