Commit Graph

10608 Commits

Author SHA1 Message Date
Winson Chung
79804e6b94 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff
2017-04-03 18:47:49 +00:00
Winson Chung
0ed0b685b4 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
2017-04-03 18:36:26 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
2017-04-03 18:25:36 +00:00
Winson Chung
34ecbaa991 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 2017-04-03 18:23:31 +00:00
George Mount
c5045a323f Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev am: e9679db5e2
am: 834752d4b2

Change-Id: I8f60a0e8b45d6c9c0944b47d867cbb5727fafc7a
2017-04-03 18:13:28 +00:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
George Mount
834752d4b2 Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am: e9679db5e2

Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b
2017-04-03 17:57:27 +00:00
Chad Brubaker
e35d50622c Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev 2017-04-03 17:34:13 +00:00
TreeHugger Robot
e9679db5e2 Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev 2017-04-03 16:34:17 +00:00
TreeHugger Robot
5dbf82ed1f Merge "Correct unit in waitForMonitorWithTimeout JavaDoc." 2017-04-01 04:43:40 +00:00
Felipe Leme
09173fc216 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev am: 4d558930c8
am: 7de522c966

Change-Id: I938906a27bc95b7e200fe1f1211dd757641209f4
2017-04-01 02:48:10 +00:00
Felipe Leme
7de522c966 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev
am: 4d558930c8

Change-Id: I81b4396e998b375feca626e5c0bc188b5f85cb09
2017-04-01 02:39:50 +00:00
TreeHugger Robot
4d558930c8 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev 2017-04-01 02:34:03 +00:00
Karthik Ravi Shankar
3b2b8a6753 Launch 2D activities in VR mode am: 99493dbc94
am: 9a26012d62

Change-Id: Id03fea3d32229761069f2bddfcadda60897c5637
2017-04-01 00:10:12 +00:00
Winson Chung
5af42fc305 Ensuring multi-window callbacks contain new configuration and are in order
- This CL has two main changes:
  1) It modifies the activity multi-window and picture-in-picture mode
     changed callbacks to provide the configuration of the activity with
     the mode applied.
  2) It modifies the order in which the multi-window and picture-in-picture
     mode callbacks are made, to ensure that when going in and out of
     picture-in-picture: first PiP, then MW, and then the config change.
- Previously, the ordering of the two callbacks was inconsistent.  When
  calling moveActivityToPinnedStack(), we reparent the task into the pinned
  stack (triggering the picture-in-picture mode change), followed by the
  resize animation (causes configuration changes).  Inversely, when we
  expand the task to fullscreen (and not just remove it), we run the
  animation first, which resizes the task to the final size (causes
  configuration changes) then reparent after the animation completes
  (triggering the picture-in-picture mode change).

  In this CL, we ensure that for both the transition in and out of PiP, we
  defer to the bounds animation to trigger the PiP mode change.  Normal
  calls to reparent or adding a new task are unchanged.  When the PiP
  mode change is called from the animation, it provides the final target
  bounds which we use to calculate the target configuration of the activity
  for the callback.  If the bounds animation is interrupted, an update will
  also be scheduled if we change the fullscreen state we are animating to.

  To work around the issue where we are scheduling MW/PiP mode changes in
  both the animation and the configuration change, we also now keep track
  of each state internally in the ActivityRecord.

Bug: 36099777
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testConfigurationChangeOrderDuringTransition

Change-Id: I03513bc3a4d4a72c250983f22f079ce9d7a2cb40
Signed-off-by: Winson Chung <winsonc@google.com>
2017-03-31 17:04:26 -07:00
Karthik Ravi Shankar
9a26012d62 Launch 2D activities in VR mode
am: 99493dbc94

Change-Id: I33c4458ca441b8e95d45516cce2bcb7eb020ee3f
2017-03-31 23:59:22 +00:00
TreeHugger Robot
f04d039584 Merge changes from topic 'launch-2d-activities-vr' into oc-dev
* changes:
  Allow shell uid to access Vr APIs
  Add vr persistent mode enable/disable
  Launch 2D activities in VR mode
2017-03-31 23:48:22 +00:00
Dianne Hackborn
cc88ddd7ea Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d3f
am: 666fe849e3

Change-Id: I61afc96a01bc8bc5d637d65a3f9a84452babd3ed
2017-03-31 23:44:42 +00:00
Dianne Hackborn
666fe849e3 Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
am: 2d161b1d3f

Change-Id: I4aed07a3ad88f3b171e92aaa70f88bcc4da131b8
2017-03-31 23:29:01 +00:00
TreeHugger Robot
2d161b1d3f Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev 2017-03-31 23:21:11 +00:00
Chad Brubaker
0c1651f289 Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS
Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
2017-03-31 11:20:02 -07:00
Dianne Hackborn
a47223f99b Implement issue #36590595: Add ability to associated a ClipData with JobInfo
Yum!

Also needed to have a Context.revokeUriPermission() variant that is sane,
so reasonable CTS tests can be written.

Test: new ClipDataJobTest added.

Change-Id: Ia3135ea788a6e32c971bae7dab3a844d0ef4139c
2017-03-31 10:41:50 -07:00
Julia Reynolds
8e6cb82a1a Merge "Rename badge icon method" into oc-dev am: ed8d07f213
am: 52e063ee15

Change-Id: If360b1c8a5f84c0be519cc8ce7e472c23608c202
2017-03-31 16:51:51 +00:00
Julia Reynolds
52e063ee15 Merge "Rename badge icon method" into oc-dev
am: ed8d07f213

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
2017-03-31 16:41:27 +00:00
Julia Reynolds
ed8d07f213 Merge "Rename badge icon method" into oc-dev 2017-03-31 16:34:03 +00:00
Karthik Ravi Shankar
99493dbc94 Launch 2D activities in VR mode
When in VR mode, launch all activities into the virtual display ID as
provided by the Compatibility display. This includes two cases -

- New activity launches
- Existing activity in the background.

Testing Done: Tested with PlanarVirtualDisplay app and Settings,
Calculator and GestureApp with different intent flags.

Bug: 36071574
Bug: 36071445
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testVrActivityLaunch
Test: #testVrActivityReLaunch

Change-Id: Ic590a7cbd6f9b339dc83b22a8ffb1252219ef22e
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
2017-03-31 08:37:05 -07:00
Nimrod Gileadi
c895a4b870 Correct unit in waitForMonitorWithTimeout JavaDoc.
The method delegates to ActivityMonitor.waitForActivityWithTimeout,
which takes milliseconds.

Bug: 6150572
Test: JavaDoc only.
Change-Id: I5a7c7634ddc6ac45bc6e64c9f1bd568c38d0b75f
2017-03-31 13:23:32 +01:00
Anton Philippov
b55847891b Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev am: 537fd18eaf
am: 7cecad7b7b

Change-Id: I54a0c04e4d2da06ad28ed56aac038c8a88be4d90
2017-03-31 10:54:10 +00:00
Anton Philippov
7cecad7b7b Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev
am: 537fd18eaf

Change-Id: I7d83249d341d150d3cdd3aad9b784e6ef8a4b792
2017-03-31 10:49:10 +00:00
Anton Philippov
537fd18eaf Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev 2017-03-31 10:43:28 +00:00
Philip P. Moltmann
4a61ca5ef6 Merge "Rename autoFillHint to autoFillHints." into oc-dev
am: 1a098cf62b

Change-Id: I8e20dac31fac8becbdd553b436a8a38312979e50
2017-03-31 01:47:35 +00:00
TreeHugger Robot
1a098cf62b Merge "Rename autoFillHint to autoFillHints." into oc-dev 2017-03-31 01:41:45 +00:00
Chris Tate
a97c5dce75 Merge "Reschedule jobs that crash partway through" into oc-dev am: 4a0e84b454
am: 4f81ea1bf6

Change-Id: I1d7251641d7cb0472d844b6b7b42e024c288e46d
2017-03-30 23:59:58 +00:00
Chris Tate
4f81ea1bf6 Merge "Reschedule jobs that crash partway through" into oc-dev
am: 4a0e84b454

Change-Id: I4462c39784cbd93d0799edfc899d627230890afc
2017-03-30 23:55:30 +00:00
Chris Tate
4a0e84b454 Merge "Reschedule jobs that crash partway through" into oc-dev 2017-03-30 23:46:39 +00:00
Philip P. Moltmann
81192b40de Rename autoFillHint to autoFillHints.
Fixes: 35364993
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
Change-Id: I65a4c2c65563e7bbd60c4e99c8800b0b11af2300
(cherry picked from commit feb3299ed5)
2017-03-30 23:45:33 +00:00
TreeHugger Robot
1507baaf8e Merge "Revert "Another buggy app is already targeting O."" 2017-03-30 23:27:38 +00:00
Philip P. Moltmann
4f656ce246 Merge "Rename autoFillHint to autoFillHints." 2017-03-30 22:22:21 +00:00
Felipe Leme
25bf787ffb Created an HtmlInfo object on ViewStructure.
The ViewStructure typically represents a View, but it it can also be a virtual
view; in particular, WebView uses virtual views to represent HTML elements.

Although most of the properties of the HTML element maps to properties of
Android Views, some properties (such as 'name' and 'id' on <INPUT> fields)
don't, and those are crucial for autofilling web pages.

Rather than trying to artificially map these properties, it's better to create
a generic representation, for the following reasons:

1. Web standards move in a different velocity than Android APIs
2. Android APIs cannot be changed easily. Deprecated APIs continue to work,
   and new added APIs don't work in older versions
3. The data used for autofill is opaque to the Framework - it's only relevant
   to the node producers (like WebView) and consumers (Autofill services).

Also removed the setIdEntry() that was used for the same purpose.

Fixes: 36696757
Bug: 36718508
Test: VirtualContainerActivityTest with new checks pass

Change-Id: Ia626bd1f640b0b5861e81a5915504b95029874c9
2017-03-30 14:24:05 -07:00
Jeff Sharkey
be630119c9 Revert "Another buggy app is already targeting O."
This reverts commit 4498e03d2b.

Reason for revert: b/36612878 is fixed for realz

Change-Id: I5b7e78e52165d51631ca0a39cce3a7a05090ae0f
2017-03-30 21:21:13 +00:00
Christopher Tate
2c86398857 Merge "API refactor: context.startForegroundService()" into oc-dev
am: 60e0c19505

Change-Id: Id1a027f181ae6cf8e4040b0c8f705504026c34a6
2017-03-30 21:06:55 +00:00
George Mount
fe0ad1c290 Allow committing allowing state loss on detached FragmentManager.
Bug 36702993

Instead of throwing an exception during commitAllowStateLoss()
or commitNowAllowingStateLoss(), silently drop the transaction
when the FragmentManager is detached.

Test: I7093457c2b4936b95ab086dbe947571f0b525f63
Change-Id: I77641b69f2573fc895a27ec9da63c2d2ab6d7a4e
2017-03-30 13:03:59 -07:00
Christopher Tate
08992ac57e API refactor: context.startForegroundService()
Rather than require an a-priori Notification be supplied in order to
start a service directly into the foreground state, we adopt a two-stage
compound operation for undertaking ongoing service work even from a
background execution state.  Context#startForegroundService() is not
subject to background restrictions, with the requirement that the
service formally enter the foreground state via startForeground() within
5 seconds.  If the service does not do so, it is stopped by the OS and
the app is blamed with a service ANR.

We also introduce a new flavor of PendingIntent that starts a service
into this two-stage "promises to call startForeground()" sequence, so
that deferred and second-party launches can take advantage of it.

Bug 36130212
Test: CTS

Change-Id: I96d6b23fcfc27d8fa606827b7d48a093611b2345
(cherry picked from commit 79047c62b5)
2017-03-30 18:31:24 +00:00
Chris Tate
a94c58642f Merge "API refactor: context.startForegroundService()" 2017-03-30 18:24:53 +00:00
Maurice Lam
7c61bd0fbc Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev
am: 257047b24b

Change-Id: I2c2efe34719c14cd3fc3ff55f91917a2141218d3
2017-03-30 18:11:07 +00:00
Maurice Lam
257047b24b Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev 2017-03-30 18:04:24 +00:00
Evan Rosky
2c449964f8 Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" into oc-dev
am: f114667f2d

Change-Id: I75deead3b2767d19f25378c4f34ca31c87027cae
2017-03-30 17:00:27 +00:00
Evan Rosky
f114667f2d Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" into oc-dev 2017-03-30 16:46:27 +00:00
George Mount
be99bf2cd4 Merge "Fix getting wrong instance when restoring non-config" into oc-dev
am: 8386603230

Change-Id: I7ee0bb17c62ec2a40c4f2e168f88296b7bc86989
2017-03-30 16:33:35 +00:00
Julia Reynolds
612beb2f2f Rename badge icon method
Test: make
Change-Id: Ic7f7dc3319ba4ffa67e1e02acd1828ca46975baf
2017-03-30 11:42:35 -04:00